2
0
stany.ferer 3 сар өмнө
parent
commit
4e511f9faa

+ 2 - 3
core/class/serverLog.class.php

@@ -48,14 +48,13 @@ class serverLog {
 
 
     private static function detectApacheLog(string $str): bool {
     private static function detectApacheLog(string $str): bool {
         return preg_match(
         return preg_match(
-            '/^\[?(?<date>[A-Za-z]{3} [A-Za-z]{3} \d{2} [\d:.]+ \d{4})\]? \[(?<type>[^\]]+)\] \[pid (?<pid>\d+):tid (?<tid>\d+)\] \[client (?<client>[^\]]+)\] (?<msg>.+?)(?:, referer: (?<referer>.+))?$/',
+            '/^\[(?<date>[A-Za-z]{3} [A-Za-z]{3} \d{2} [\d:.]+ \d{4})\] \[(?<type>[^\]]+)\] \[pid (?<pid>\d+):tid (?<tid>\d+)\] \[client (?<client>[^\]]+)\] (?<msg>.*?)(?:, referer: (?<referer>.+))?$/',
             $str
             $str
         ) === 1;
         ) === 1;
     }
     }
 
 
     public static function printColoredApacheLog(string $line) {
     public static function printColoredApacheLog(string $line) {
-        $regex = '/^\[?(?<date>[A-Za-z]{3} [A-Za-z]{3} \d{2} [\d:.]+ \d{4})\]? \[(?<type>[^\]]+)\] \[pid (?<pid>\d+):tid (?<tid>\d+)\] \[client (?<client>[^\]]+)\] (?<msg>.+?)(?:, referer: (?<referer>.+))?$/';
-
+        $regex = '/^\[(?<date>[A-Za-z]{3} [A-Za-z]{3} \d{2} [\d:.]+ \d{4})\] \[(?<type>[^\]]+)\] \[pid (?<pid>\d+):tid (?<tid>\d+)\] \[client (?<client>[^\]]+)\] (?<msg>.*?)(?:, referer: (?<referer>.+))?$/';
         if (preg_match($regex, $line, $matches)) {
         if (preg_match($regex, $line, $matches)) {
             echo '<div class="notice">'
             echo '<div class="notice">'
                 . '<span style="color:#4FC3F7;">[' . htmlspecialchars($matches['date']) . ']</span> '
                 . '<span style="color:#4FC3F7;">[' . htmlspecialchars($matches['date']) . ']</span> '