From 22f448c9aaf8115663536aaef410b5eb9152d950 Mon Sep 17 00:00:00 2001
From: Potsky
Date: Wed, 27 May 2015 09:09:41 +0200
Subject: [PATCH] grunt install from branch dev commit 65d6f14
---
cfg/apache.config.php | 2 +-
cfg/apache.paths.php | 2 +-
cfg/config.example.php | 2 +-
cfg/iis.config.php | 2 +-
cfg/iis.paths.php | 2 +-
cfg/nginx.config.php | 2 +-
cfg/nginx.paths.php | 2 +-
cfg/php.config.php | 2 +-
cfg/php.paths.php | 2 +-
cfg/pimpmylog.config.php | 2 +-
cfg/softwares.inc.php | 2 +-
composer.json | 2 +-
css/config.inc.css | 2 +-
inc/classes/LogParser.php | 66 ++++++++++++++++++++++++++++++---------
inc/configure.php | 2 +-
inc/error.inc.php | 2 +-
inc/favicon.inc.php | 2 +-
inc/getlog.pml.php | 2 +-
inc/global.inc.php | 2 +-
inc/login.inc.php | 2 +-
inc/rss.php | 2 +-
inc/rss.pml.php | 2 +-
inc/test.php | 2 +-
inc/upgrade.pml.php | 2 +-
inc/users.pml.php | 2 +-
index.php | 2 +-
js/configure.min.js | 2 +-
js/login.min.js | 2 +-
js/main.min.js | 2 +-
js/pml.min.js | 2 +-
js/test.min.js | 2 +-
version.js | 10 ++++--
32 files changed, 90 insertions(+), 46 deletions(-)
diff --git a/cfg/apache.config.php b/cfg/apache.config.php
index 3fd26319..488003e9 100644
--- a/cfg/apache.config.php
+++ b/cfg/apache.config.php
@@ -1,5 +1,5 @@
$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 : $str
";
$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
index 631e9069..9fdaadaf 100644
--- a/inc/configure.php
+++ b/inc/configure.php
@@ -1,5 +1,5 @@
Hi folks!
This alert box has been added to send important messages to you about Pimp my Log. It is not intended to be a Spam Zone.
I need to know if I should continue the development of Pimp My Log and how many people are interested in Pimp my Log. Would you just let me know by starring the project in GitHub please?
And don’t worry, Pimp my Log will be in open-source forever.
potsky
",
"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" : [