Merge pull request #13 from LostInIgnorance/master

Changed to reflect YYYY.MM.DD

3 files changed, 9 insertions, 9 deletions

diff --git a/config/havp/antivirus.php b/config/havp/antivirus.php
index b4988817..0d8cda1d 100644
--- a/config/havp/antivirus.php
+++ b/config/havp/antivirus.php
@@ -70,7 +70,7 @@ function get_avdb_info()
 
                     # datetime
                     $dt = explode(" ", $s[1]);
-                    $s[1] = strftime("%d.%m.%Y", strtotime("{$dt[0]} {$dt[1]} {$dt[2]}"));
+                    $s[1] = strftime("%Y.%m.%d", strtotime("{$dt[0]} {$dt[1]} {$dt[2]}"));
                     if ($s[0] == 'ClamAV-VDB')
                         $r .= "<tr class='listr'><td $stl>{$fname}</td><td $stl>{$s[1]}</td><td $stl align='right'>$fsize</td><td $stl align='right'>{$s[2]}</td><td $stl align='right'>{$s[3]}</td><td $stl>{$s[7]}</td></tr>";
                 }
diff --git a/config/havp/havp.inc b/config/havp/havp.inc
index 2d79a4ce..5b420d21 100644
--- a/config/havp/havp.inc
+++ b/config/havp/havp.inc
@@ -173,7 +173,7 @@ define('F_AVSETLOG',          'avsetlog');
 define('F_TEMPLATEPATH',      'templatepath');    # internal var
 # file scanner [HVFORM_FSCAN]
 define('F_SCANFILEPATH',      'scanfilepath');
-# ïîêà íåïîíÿòíî ÷òî ýòî è ÷òî ñ íèì äåëàòü
+# ���� ��������� ��� ��� � ��� � ��� ������
 define('F_DISABLEXFORWARD',   'disablexforward'); # + forwarded ip
 define('F_FORWARDEDIP',       'forwardedip');
 
@@ -915,8 +915,8 @@ function havp_config_freshclam()
     $conf[] = "Checks $chks";
 
     $conf[] = "# notification";
-    $conf[] = "OnUpdateExecute  date \"+%d-%m-%Y %H:%M:%S Antivirus update success\" > " . HVDEF_FRESHCLAM_STATUS_FILE;
-    $conf[] = "OnErrorExecute   date \"+%d-%m-%Y %H:%M:%S Antivirus update error\" > "   . HVDEF_FRESHCLAM_STATUS_FILE;
+    $conf[] = "OnUpdateExecute  date \"+%Y.%m.%d %H:%M:%S Antivirus update success\" > " . HVDEF_FRESHCLAM_STATUS_FILE;
+    $conf[] = "OnErrorExecute   date \"+%Y.%m.%d %H:%M:%S Antivirus update error\" > "   . HVDEF_FRESHCLAM_STATUS_FILE;
 
     $conf[] = "Debug  " . (HV_DEBUG === 'true' ? "yes" : "no");
 
@@ -1270,15 +1270,15 @@ $f = HVDEF_UPD_STATUS_FILE;
 $u = HVDEF_FRESHCLAM_STATUS_FILE;
 return <<<EOD
 #!/bin/sh
-date +"%d.%m.%Y %H:%M:%S Antivirus update started."  > $f
-date +"%d.%m.%Y %H:%M:%S Antivirus database already is updated." > $u
+date +"%Y.%m.%d %H:%M:%S Antivirus update started."  > $f
+date +"%Y.%m.%d %H:%M:%S Antivirus database already is updated." > $u
 /usr/local/bin/freshclam
 wait
 cat $u >> $f
 /usr/local/bin/sigtool --unpack-current daily.cvd
 /usr/local/bin/sigtool --unpack-current main.cvd
 wait
-date +"%d.%m.%Y %H:%M:%S Antivirus update end." >> $f
+date +"%Y.%m.%d %H:%M:%S Antivirus update end." >> $f
 EOD;
 
 }
@@ -1526,7 +1526,7 @@ function start_antivirus_scanner($filename)
         file_put_contents(HVDEF_CLAMSCAN_LOG, $cont);
 
         mwexec_bg("$param");
-        exec("date +\"%d.%m.%Y %H:%M:%S Starting scan file '$filename'.\" > " . HVDEF_CLAMSCAN_LOG);
+        exec("date +\"%Y.%m.%d %H:%M:%S Starting scan file '$filename'.\" > " . HVDEF_CLAMSCAN_LOG);
     }
     else log_error("Antivirus: Can't starting file scanner. File '$filename' not exists.");
 }
diff --git a/config/widget-antivirus/antivirus_status.widget.php b/config/widget-antivirus/antivirus_status.widget.php
index fee10ea8..a908d7b8 100644
--- a/config/widget-antivirus/antivirus_status.widget.php
+++ b/config/widget-antivirus/antivirus_status.widget.php
@@ -57,7 +57,7 @@ function havp_avdb_info($filename)
 
             # datetime
             $dt = explode(" ", $s[1]);
-            $s[1] = strftime("%m.%d.%Y", strtotime("{$dt[0]} {$dt[1]} {$dt[2]}"));
+            $s[1] = strftime("%Y.%m.%d", strtotime("{$dt[0]} {$dt[1]} {$dt[2]}"));
             if ($s[0] == 'ClamAV-VDB')
                 $r .= "<tr class='listr'><td>{$filename}</td><td $stl>{$s[1]}</td><td $stl>{$s[2]}</td><td $stl>{$s[7]}</td></tr>";
         }