grunt install from branch dev commit 65d6f14

potsky · May 27, 2015 · 22f448c · 22f448c · syrakozz · May 27, 2015
1 parent a546e5e
commit 22f448c
Show file tree

Hide file tree

Showing 32 changed files with 90 additions and 46 deletions.
diff --git a/cfg/apache.config.php b/cfg/apache.config.php
@@ -1,5 +1,5 @@
 <?php
-/*! pimpmylog - 1.7.8 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
+/*! pimpmylog - 1.7.9 - 10b502eaf17be208850be61febb044c2fdb86207*/
 /*
  * pimpmylog
  * http://pimpmylog.com

diff --git a/cfg/apache.paths.php b/cfg/apache.paths.php
@@ -1,5 +1,5 @@
 <?php
-/*! pimpmylog - 1.7.8 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
+/*! pimpmylog - 1.7.9 - 10b502eaf17be208850be61febb044c2fdb86207*/
 /*
  * pimpmylog
  * http://pimpmylog.com

diff --git a/cfg/config.example.php b/cfg/config.example.php
@@ -1,5 +1,5 @@
 <?php
-/*! pimpmylog - 1.7.8 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
+/*! pimpmylog - 1.7.9 - 10b502eaf17be208850be61febb044c2fdb86207*/
 /*
  * pimpmylog
  * http://pimpmylog.com

diff --git a/cfg/iis.config.php b/cfg/iis.config.php
@@ -1,5 +1,5 @@
 <?php
-/*! pimpmylog - 1.7.8 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
+/*! pimpmylog - 1.7.9 - 10b502eaf17be208850be61febb044c2fdb86207*/
 /*
  * pimpmylog
  * http://pimpmylog.com

diff --git a/cfg/iis.paths.php b/cfg/iis.paths.php
@@ -1,5 +1,5 @@
 <?php
-/*! pimpmylog - 1.7.8 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
+/*! pimpmylog - 1.7.9 - 10b502eaf17be208850be61febb044c2fdb86207*/
 /*
  * pimpmylog
  * http://pimpmylog.com

diff --git a/cfg/nginx.config.php b/cfg/nginx.config.php
@@ -1,5 +1,5 @@
 <?php
-/*! pimpmylog - 1.7.8 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
+/*! pimpmylog - 1.7.9 - 10b502eaf17be208850be61febb044c2fdb86207*/
 /*
  * pimpmylog
  * http://pimpmylog.com

diff --git a/cfg/nginx.paths.php b/cfg/nginx.paths.php
@@ -1,5 +1,5 @@
 <?php
-/*! pimpmylog - 1.7.8 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
+/*! pimpmylog - 1.7.9 - 10b502eaf17be208850be61febb044c2fdb86207*/
 /*
  * pimpmylog
  * http://pimpmylog.com

diff --git a/cfg/php.config.php b/cfg/php.config.php
@@ -1,5 +1,5 @@
 <?php
-/*! pimpmylog - 1.7.8 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
+/*! pimpmylog - 1.7.9 - 10b502eaf17be208850be61febb044c2fdb86207*/
 /*
  * pimpmylog
  * http://pimpmylog.com

diff --git a/cfg/php.paths.php b/cfg/php.paths.php
@@ -1,5 +1,5 @@
 <?php
-/*! pimpmylog - 1.7.8 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
+/*! pimpmylog - 1.7.9 - 10b502eaf17be208850be61febb044c2fdb86207*/
 /*
  * pimpmylog
  * http://pimpmylog.com

diff --git a/cfg/pimpmylog.config.php b/cfg/pimpmylog.config.php
@@ -1,5 +1,5 @@
 <?php
-/*! pimpmylog - 1.7.8 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
+/*! pimpmylog - 1.7.9 - 10b502eaf17be208850be61febb044c2fdb86207*/
 /*
  * pimpmylog
  * http://pimpmylog.com

diff --git a/cfg/softwares.inc.php b/cfg/softwares.inc.php
@@ -1,5 +1,5 @@
 <?php
-/*! pimpmylog - 1.7.8 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
+/*! pimpmylog - 1.7.9 - 10b502eaf17be208850be61febb044c2fdb86207*/
 /*
  * pimpmylog
  * http://pimpmylog.com

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name"        : "potsky/pimp-my-log",
     "description" : "Log viewer for your web server",
-    "version"     : "1.7.8",
+    "version"     : "1.7.9",
     "license"     : "GPL-3.0+",
     "type"        : "project",
     "homepage"    : "http://pimpmylog.com",

diff --git a/css/config.inc.css b/css/config.inc.css
@@ -1,4 +1,4 @@
-/*! pimpmylog - 1.7.8 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
+/*! pimpmylog - 1.7.9 - 10b502eaf17be208850be61febb044c2fdb86207*/
 /*
  * pimpmylog
  * http://pimpmylog.com

diff --git a/inc/classes/LogParser.php b/inc/classes/LogParser.php
@@ -356,49 +356,87 @@ public static function parseLine( $regex , $match , $log , $types , $tz = NULL )
 
             $type = ( isset ( $types[ $token ] ) ) ? $types[ $token ] : 'txt';
 
-            if ( substr( $type , 0 , 4 ) === 'date' ) {
+            if ( substr( $type , 0 , 4 ) === 'date' )
+            {
 
                 // Date is an array description with keys ( 'Y' : 5 , 'M' : 2 , ... )
-                if ( is_array( $key ) && ( is_assoc( $key ) ) ) {
+                if ( is_array( $key ) && ( is_assoc( $key ) ) )
+                {
                     $newdate = array();
-                    foreach ($key as $k => $v) {
+                    foreach ($key as $k => $v)
+                    {
                         $newdate[ $k ] = @$out[ $v ][ 0 ];
                     }
-                    if ( isset( $newdate['M'] ) ) {
+
+                    if ( isset( $newdate['U'] ) )
+                    {
+                        $str = date( 'Y/m/d H:i:s' , $newdate['U'] );
+                    }
+                    else if ( isset( $newdate['r'] ) )
+                    {
+                        $str = date( 'Y/m/d H:i:s' , $newdate['r'] );
+                    }
+                    else if ( isset( $newdate['c'] ) )
+                    {
+                        $str = date( 'Y/m/d H:i:s' , $newdate['c'] );
+                    }
+                    else if ( isset( $newdate['M'] ) )
+                    {
                         $str = trim( $newdate['M'] . ' ' . $newdate['d'] . ' ' . $newdate['H'] . ':' . $newdate['i'] . ':' . $newdate['s'] . ' ' . $newdate['Y'] . ' ' . @$newdate['z'] );
-                    } elseif ( isset( $newdate['m'] ) ) {
+                    }
+                    elseif ( isset( $newdate['m'] ) )
+                    {
                         $str = trim( $newdate['Y'] . '/' . $newdate['m'] . '/' . $newdate['d'] . ' ' . $newdate['H'] . ':' . $newdate['i'] . ':' . $newdate['s'] . ' ' . @$newdate['z'] );
                     }
                 }
+
                 // Date is an array description without keys ( 2 , ':' , 3 , '-' , ... )
-                else if ( is_array( $key ) ) {
+                else if ( is_array( $key ) )
+                {
                     $str = '';
-                    foreach ($key as $v) {
+                    foreach ($key as $v)
+                    {
                         $str .= ( is_string( $v ) ) ? $v : @$out[ $v ][0];
                     }
-                } else {
+                }
+
+                else
+                {
                     $str = @$out[ $key ][0];
                 }
 
                 // remove part next to the last /
                 $dateformat = ( substr( $type , 0 , 5 ) === 'date:' ) ? substr( $type , 5 ) : 'Y/m/d H:i:s';
-                if ( ( $p = strrpos(    $dateformat , '/' ) ) !== false ) {
+
+                if ( ( $p = strrpos(    $dateformat , '/' ) ) !== false )
+                {
                     $dateformat = substr( $dateformat , 0 , $p );
                 }
-                if ( ( $timestamp = strtotime( $str ) ) === false ) {
+
+                if ( ( $timestamp = strtotime( $str ) ) === false )
+                {
                     $formatted_date = "ERROR ! Unable to convert this string to date : <code>$str</code>";
                     $timestamp      = 0;
-                } else {
+                }
+
+                else
+                {
 
-                    if ( version_compare( PHP_VERSION , '5.3.0' ) >= 0 ) {
+                    if ( version_compare( PHP_VERSION , '5.3.0' ) >= 0 )
+                    {
                         $date = new DateTime();
                         $date->setTimestamp( $timestamp );
-                    } else {
+                    }
+                    else
+                    {
                         $date = new DateTime( "@" . $timestamp );
                     }
-                    if ( ! is_null( $tz ) ) {
+
+                    if ( ! is_null( $tz ) )
+                    {
                         $date->setTimezone( new DateTimeZone( $tz ) );
                     }
+
                     $formatted_date = $date->format( $dateformat );
                     $timestamp      = (int)$date->format('U');
                 }

diff --git a/inc/configure.php b/inc/configure.php
@@ -1,5 +1,5 @@
 <?php
-/*! pimpmylog - 1.7.8 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
+/*! pimpmylog - 1.7.9 - 10b502eaf17be208850be61febb044c2fdb86207*/
 /*
  * pimpmylog
  * http://pimpmylog.com

diff --git a/inc/error.inc.php b/inc/error.inc.php
@@ -1,5 +1,5 @@
 <?php
-/*! pimpmylog - 1.7.8 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
+/*! pimpmylog - 1.7.9 - 10b502eaf17be208850be61febb044c2fdb86207*/
 /*
  * pimpmylog
  * http://pimpmylog.com

diff --git a/inc/favicon.inc.php b/inc/favicon.inc.php
@@ -1,5 +1,5 @@
 <?php
-/*! pimpmylog - 1.7.8 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
+/*! pimpmylog - 1.7.9 - 10b502eaf17be208850be61febb044c2fdb86207*/
 /*
  * pimpmylog
  * http://pimpmylog.com

diff --git a/inc/getlog.pml.php b/inc/getlog.pml.php
@@ -1,5 +1,5 @@
 <?php
-/*! pimpmylog - 1.7.8 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
+/*! pimpmylog - 1.7.9 - 10b502eaf17be208850be61febb044c2fdb86207*/
 /*
  * pimpmylog
  * http://pimpmylog.com

diff --git a/inc/global.inc.php b/inc/global.inc.php
@@ -1,5 +1,5 @@
 <?php
-/*! pimpmylog - 1.7.8 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
+/*! pimpmylog - 1.7.9 - 10b502eaf17be208850be61febb044c2fdb86207*/
 /*
  * pimpmylog
  * http://pimpmylog.com

diff --git a/inc/login.inc.php b/inc/login.inc.php
@@ -1,5 +1,5 @@
 <?php
-/*! pimpmylog - 1.7.8 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
+/*! pimpmylog - 1.7.9 - 10b502eaf17be208850be61febb044c2fdb86207*/
 /*
  * pimpmylog
  * http://pimpmylog.com

diff --git a/inc/rss.php b/inc/rss.php
@@ -1,5 +1,5 @@
 <?php
-/*! pimpmylog - 1.7.8 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
+/*! pimpmylog - 1.7.9 - 10b502eaf17be208850be61febb044c2fdb86207*/
 /*
  * pimpmylog
  * http://pimpmylog.com

diff --git a/inc/rss.pml.php b/inc/rss.pml.php
@@ -1,5 +1,5 @@
 <?php
-/*! pimpmylog - 1.7.8 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
+/*! pimpmylog - 1.7.9 - 10b502eaf17be208850be61febb044c2fdb86207*/
 /*
  * pimpmylog
  * http://pimpmylog.com

diff --git a/inc/test.php b/inc/test.php
@@ -1,5 +1,5 @@
 <?php
-/*! pimpmylog - 1.7.8 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
+/*! pimpmylog - 1.7.9 - 10b502eaf17be208850be61febb044c2fdb86207*/
 /*
  * pimpmylog
  * http://pimpmylog.com

diff --git a/inc/upgrade.pml.php b/inc/upgrade.pml.php
@@ -1,5 +1,5 @@
 <?php
-/*! pimpmylog - 1.7.8 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
+/*! pimpmylog - 1.7.9 - 10b502eaf17be208850be61febb044c2fdb86207*/
 /*
  * pimpmylog
  * http://pimpmylog.com

diff --git a/inc/users.pml.php b/inc/users.pml.php
@@ -1,5 +1,5 @@
 <?php
-/*! pimpmylog - 1.7.8 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
+/*! pimpmylog - 1.7.9 - 10b502eaf17be208850be61febb044c2fdb86207*/
 /*
  * pimpmylog
  * http://pimpmylog.com

diff --git a/index.php b/index.php
@@ -1,5 +1,5 @@
 <?php
-/*! pimpmylog - 1.7.8 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
+/*! pimpmylog - 1.7.9 - 10b502eaf17be208850be61febb044c2fdb86207*/
 /*
  * pimpmylog
  * http://pimpmylog.com

diff --git a/js/configure.min.js b/js/configure.min.js
diff --git a/js/login.min.js b/js/login.min.js
@@ -1,4 +1,4 @@
-/*! pimpmylog - 1.7.8 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
+/*! pimpmylog - 1.7.9 - 10b502eaf17be208850be61febb044c2fdb86207*/
 /*
  * pimpmylog
  * http://pimpmylog.com

diff --git a/js/main.min.js b/js/main.min.js
diff --git a/js/pml.min.js b/js/pml.min.js
diff --git a/js/test.min.js b/js/test.min.js
diff --git a/version.js b/version.js
@@ -1,13 +1,19 @@
 /*PSK*/pml_version_cb(/*PSK*/
 {
-	"version"     : "1.7.8",
-	"versiondevh" : "82a1a7504873a6aed42a95a13b42ec8f8d12213f",
+	"version"     : "1.7.9",
+	"versiondevh" : "10b502eaf17be208850be61febb044c2fdb86207",
 	"messages"    : {
 		"20141121" : "Thank you to people who have starred the project on GitHub !",
 		"20141012" : "<p>Hi folks!</p><p>This alert box has been added to send important messages to you about <em>Pimp my Log</em>. It is not intended to be a <em>Spam Zone</em>.</p><p>I need to know if I should continue the development of <em>Pimp My Log</em> and how many people are interested in <em>Pimp my Log</em>. Would you just let me know by starring the project in GitHub please?</p><p><iframe src=\"http://pimpmylog.com/github-btn.html?user=potsky&repo=PimpMyLog&type=watch&count=true\" allowtransparency=\"true\" frameborder=\"0\" scrolling=\"0\" width=\"170\" height=\"30\"></iframe></p><p>And don&#8217;t worry, <em>Pimp my Log</em> will be in open-source forever.</p><p><em>potsky</em></p>",
 		"20141011" : "This message will never be shown. Never Gonna Give You Up !"
 	},
 	"changelog"   : {
+		"1.7.9" : {
+			"released" : "2015-05-27",
+			"new" : [
+				"Support for date formats (parsing): U,c and r"
+			]
+		},
 		"1.7.8" : {
 			"released" : "2015-05-23",
 			"fixed" : [