Add date/time variables for export db/files filename since strftime() is deprecated

Author: dleffler

framework/modules/file/controllers/fileController.php

@@ -991,8 +991,12 @@ public function export_eql_process() {
 //        	echo gt('You must choose at least one table to export.');
 //        } else { // All good
         	$filename = str_replace(
-        		array('__DOMAIN__','__DB__'),
-        		array(str_replace('.','_',HOSTNAME),DB_NAME),
+        		array('__DOMAIN__','__DB__','__DATETIME__','__DATE__','__TIME__'),
+        		array(str_replace('.','_',HOSTNAME),
+                    DB_NAME,date(strftime_to_date_format(DISPLAY_DATETIME_FORMAT), time()),
+                    DB_NAME,date(strftime_to_date_format(DISPLAY_DATE_FORMAT), time()),
+                    DB_NAME,date(strftime_to_date_format(DISPLAY_TIME_FORMAT), time()),
+                ),
                 $this->params['filename']);
             if (empty($filename)) {
                 $filename = 'database_' . date(strftime_to_date_format(DISPLAY_DATETIME_FORMAT), time());
@@ -1219,8 +1223,12 @@ public function export_files_process() {
         unlink($fname . '.tar');  // remove intermediary .tar file
 
         $filename = str_replace(
-            array('__DOMAIN__','__DB__'),
-            array(str_replace('.','_',HOSTNAME),DB_NAME),
+            array('__DOMAIN__','__DB__','__DATETIME__','__DATE__','__TIME__'),
+            array(str_replace('.','_',HOSTNAME),
+                  DB_NAME,date(strftime_to_date_format(DISPLAY_DATETIME_FORMAT), time()),
+                  DB_NAME,date(strftime_to_date_format(DISPLAY_DATE_FORMAT), time()),
+                  DB_NAME,date(strftime_to_date_format(DISPLAY_TIME_FORMAT), time()),
+              ),
             $this->params['filename']);
         if (empty($filename)) {
             $filename = 'files_' . date(strftime_to_date_format(DISPLAY_DATETIME_FORMAT), time());

framework/modules/file/views/file/export_eql.bootstrap4.tpl

@@ -103,7 +103,7 @@
 			</tr>
 			<tr>
 				<td colspan="5">
-					<div style="border-top: 1px solid #CCC;">{'Use __DOMAIN__ for this website\'s domain name, __DB__ for the site\'s database name and any strftime options for time specification. The EQL extension will be added for you. Any other text will be preserved.'|gettext}<br /></div>
+                    <div style="border-top: 1px solid #CCC;">{'Use __DOMAIN__ for this website\'s domain name, __DB__ for the site\'s database name, and __DATETIME__, __DATE__, or __TIME__. The EQL extension will be added for you. Any other text will be preserved.'|gettext}<br /></div>
 				</td>
 			</tr>
 			<tr>

framework/modules/file/views/file/export_eql.tpl

@@ -103,7 +103,7 @@
 			</tr>
 			<tr>
 				<td colspan="5">
-					<div style="border-top: 1px solid #CCC;">{'Use __DOMAIN__ for this website\'s domain name, __DB__ for the site\'s database name and any strftime options for time specification. The EQL extension will be added for you. Any other text will be preserved.'|gettext}<br /></div>
+					<div style="border-top: 1px solid #CCC;">{'Use __DOMAIN__ for this website\'s domain name, __DB__ for the site\'s database name, and __DATETIME__, __DATE__, or __TIME__. The EQL extension will be added for you. Any other text will be preserved.'|gettext}<br /></div>
 				</td>
 			</tr>
 			<tr>

framework/modules/file/views/file/export_files.tpl

@@ -39,7 +39,7 @@
 				</td>
 			</tr>
 				<td>
-					<div style="border-top: 1px solid #CCC;">{'Use __DOMAIN__ for this website\'s domain name and any strftime options for time specification. The extension will be added for you. Any other text will be preserved.'|gettext}<br /></div>
+                    <div style="border-top: 1px solid #CCC;">{'Use __DOMAIN__ for this website\'s domain name, __DB__ for the site\'s database name, and __DATETIME__, __DATE__, or __TIME__. The EQL extension will be added for you. Any other text will be preserved.'|gettext}<br /></div>
 				</td>
 			</tr>
 			<tr>