grunt install from branch dev commit 10b502e

potsky · May 23, 2015 · a546e5e · a546e5e
1 parent 6dee99e
commit a546e5e
Show file tree

Hide file tree

Showing 31 changed files with 93 additions and 66 deletions.
diff --git a/cfg/apache.config.php b/cfg/apache.config.php
@@ -1,10 +1,10 @@
 <?php
-/*! pimpmylog - 1.7.7 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
+/*! pimpmylog - 1.7.8 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
 /*
  * pimpmylog
  * http://pimpmylog.com
  *
- * Copyright (c) 2014 Potsky, contributors
+ * Copyright (c) 2015 Potsky, contributors
  * Licensed under the GPLv3 license.
  */
 ?>

diff --git a/cfg/apache.paths.php b/cfg/apache.paths.php
@@ -1,10 +1,10 @@
 <?php
-/*! pimpmylog - 1.7.7 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
+/*! pimpmylog - 1.7.8 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
 /*
  * pimpmylog
  * http://pimpmylog.com
  *
- * Copyright (c) 2014 Potsky, contributors
+ * Copyright (c) 2015 Potsky, contributors
  * Licensed under the GPLv3 license.
  */
 ?>

diff --git a/cfg/config.example.php b/cfg/config.example.php
@@ -1,10 +1,10 @@
 <?php
-/*! pimpmylog - 1.7.7 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
+/*! pimpmylog - 1.7.8 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
 /*
  * pimpmylog
  * http://pimpmylog.com
  *
- * Copyright (c) 2014 Potsky, contributors
+ * Copyright (c) 2015 Potsky, contributors
  * Licensed under the GPLv3 license.
  */
 ?>

diff --git a/cfg/iis.config.php b/cfg/iis.config.php
@@ -1,10 +1,10 @@
 <?php
-/*! pimpmylog - 1.7.7 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
+/*! pimpmylog - 1.7.8 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
 /*
  * pimpmylog
  * http://pimpmylog.com
  *
- * Copyright (c) 2014 Potsky, contributors
+ * Copyright (c) 2015 Potsky, contributors
  * Licensed under the GPLv3 license.
  */
 ?>

diff --git a/cfg/iis.paths.php b/cfg/iis.paths.php
@@ -1,10 +1,10 @@
 <?php
-/*! pimpmylog - 1.7.7 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
+/*! pimpmylog - 1.7.8 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
 /*
  * pimpmylog
  * http://pimpmylog.com
  *
- * Copyright (c) 2014 Potsky, contributors
+ * Copyright (c) 2015 Potsky, contributors
  * Licensed under the GPLv3 license.
  */
 ?>

diff --git a/cfg/nginx.config.php b/cfg/nginx.config.php
@@ -1,10 +1,10 @@
 <?php
-/*! pimpmylog - 1.7.7 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
+/*! pimpmylog - 1.7.8 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
 /*
  * pimpmylog
  * http://pimpmylog.com
  *
- * Copyright (c) 2014 Potsky, contributors
+ * Copyright (c) 2015 Potsky, contributors
  * Licensed under the GPLv3 license.
  */
 ?>

diff --git a/cfg/nginx.paths.php b/cfg/nginx.paths.php
@@ -1,10 +1,10 @@
 <?php
-/*! pimpmylog - 1.7.7 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
+/*! pimpmylog - 1.7.8 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
 /*
  * pimpmylog
  * http://pimpmylog.com
  *
- * Copyright (c) 2014 Potsky, contributors
+ * Copyright (c) 2015 Potsky, contributors
  * Licensed under the GPLv3 license.
  */
 ?>

diff --git a/cfg/php.config.php b/cfg/php.config.php
@@ -1,10 +1,10 @@
 <?php
-/*! pimpmylog - 1.7.7 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
+/*! pimpmylog - 1.7.8 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
 /*
  * pimpmylog
  * http://pimpmylog.com
  *
- * Copyright (c) 2014 Potsky, contributors
+ * Copyright (c) 2015 Potsky, contributors
  * Licensed under the GPLv3 license.
  */
 ?>

diff --git a/cfg/php.paths.php b/cfg/php.paths.php
@@ -1,10 +1,10 @@
 <?php
-/*! pimpmylog - 1.7.7 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
+/*! pimpmylog - 1.7.8 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
 /*
  * pimpmylog
  * http://pimpmylog.com
  *
- * Copyright (c) 2014 Potsky, contributors
+ * Copyright (c) 2015 Potsky, contributors
  * Licensed under the GPLv3 license.
  */
 ?>

diff --git a/cfg/pimpmylog.config.php b/cfg/pimpmylog.config.php
@@ -1,10 +1,10 @@
 <?php
-/*! pimpmylog - 1.7.7 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
+/*! pimpmylog - 1.7.8 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
 /*
  * pimpmylog
  * http://pimpmylog.com
  *
- * Copyright (c) 2014 Potsky, contributors
+ * Copyright (c) 2015 Potsky, contributors
  * Licensed under the GPLv3 license.
  */
 ?>

diff --git a/cfg/softwares.inc.php b/cfg/softwares.inc.php
@@ -1,10 +1,10 @@
 <?php
-/*! pimpmylog - 1.7.7 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
+/*! pimpmylog - 1.7.8 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
 /*
  * pimpmylog
  * http://pimpmylog.com
  *
- * Copyright (c) 2014 Potsky, contributors
+ * Copyright (c) 2015 Potsky, contributors
  * Licensed under the GPLv3 license.
  */
 ?>

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.7",
+    "version"     : "1.7.8",
     "license"     : "GPL-3.0+",
     "type"        : "project",
     "homepage"    : "http://pimpmylog.com",

diff --git a/css/config.inc.css b/css/config.inc.css
@@ -1,9 +1,9 @@
-/*! pimpmylog - 1.7.7 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
+/*! pimpmylog - 1.7.8 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
 /*
  * pimpmylog
  * http://pimpmylog.com
  *
- * Copyright (c) 2014 Potsky, contributors
+ * Copyright (c) 2015 Potsky, contributors
  * Licensed under the GPLv3 license.
  */
 /*

diff --git a/inc/configure.php b/inc/configure.php
@@ -1,10 +1,10 @@
 <?php
-/*! pimpmylog - 1.7.7 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
+/*! pimpmylog - 1.7.8 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
 /*
  * pimpmylog
  * http://pimpmylog.com
  *
- * Copyright (c) 2014 Potsky, contributors
+ * Copyright (c) 2015 Potsky, contributors
  * Licensed under the GPLv3 license.
  */
 ?><?php

diff --git a/inc/error.inc.php b/inc/error.inc.php
@@ -1,10 +1,10 @@
 <?php
-/*! pimpmylog - 1.7.7 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
+/*! pimpmylog - 1.7.8 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
 /*
  * pimpmylog
  * http://pimpmylog.com
  *
- * Copyright (c) 2014 Potsky, contributors
+ * Copyright (c) 2015 Potsky, contributors
  * Licensed under the GPLv3 license.
  */
 ?><?php

diff --git a/inc/favicon.inc.php b/inc/favicon.inc.php
@@ -1,10 +1,10 @@
 <?php
-/*! pimpmylog - 1.7.7 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
+/*! pimpmylog - 1.7.8 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
 /*
  * pimpmylog
  * http://pimpmylog.com
  *
- * Copyright (c) 2014 Potsky, contributors
+ * Copyright (c) 2015 Potsky, contributors
  * Licensed under the GPLv3 license.
  */
 ?><?php

diff --git a/inc/getlog.pml.php b/inc/getlog.pml.php
@@ -1,10 +1,10 @@
 <?php
-/*! pimpmylog - 1.7.7 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
+/*! pimpmylog - 1.7.8 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
 /*
  * pimpmylog
  * http://pimpmylog.com
  *
- * Copyright (c) 2014 Potsky, contributors
+ * Copyright (c) 2015 Potsky, contributors
  * Licensed under the GPLv3 license.
  */
 ?><?php

diff --git a/inc/global.inc.php b/inc/global.inc.php
@@ -1,10 +1,10 @@
 <?php
-/*! pimpmylog - 1.7.7 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
+/*! pimpmylog - 1.7.8 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
 /*
  * pimpmylog
  * http://pimpmylog.com
  *
- * Copyright (c) 2014 Potsky, contributors
+ * Copyright (c) 2015 Potsky, contributors
  * Licensed under the GPLv3 license.
  */
 ?><?php
@@ -897,21 +897,40 @@ function clean_json_version($data)
 	return str_replace( array( '/*PSK*/pml_version_cb(/*PSK*/' , '/*PSK*/);/*PSK*/' , '/*PSK*/)/*PSK*/' ) , array( '' , '' , '' ) , $data );
 }
 
+/**
+ * Do nothing for set_error_handler PHP5.2 style
+ *
+ * @param   integer  $errno
+ * @param   string   $errstr
+ *
+ * @return  void
+ */
+function dumb_test($errno, $errstr)
+{
+
+}
+
 /**
  * Try to guess who runs the server
  *
  * @return  string  a user information
  */
 function get_server_user()
 {
-	if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+	if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN')
+    {
 		return '';
-	} else if ( SAFE_MODE === true ) {
+	}
+    else if ( SAFE_MODE === true )
+    {
 		// for Suhosin
 		return '';
-	} else {
+	}
+    else
+    {
 		// for PHP disabled_func
-		set_error_handler( function($errno, $errstr, $errfile, $errline, array $errcontext) {});
+        set_error_handler( "dumb_test" );
+
 		$a = exec( 'whoami' );
 		restore_error_handler();
 
@@ -1181,13 +1200,15 @@ function get_non_UTC_timstamp( $timestamp = null , $tzfrom = null )
 function upgrade_is_composer() {
 	$a = false;
 
-	// Catch errors for people who has activated open_basedire restrictions
-	set_error_handler( function($errno, $errstr, $errfile, $errline, array $errcontext) {});
+	// Catch errors for people who has activated open_basedir restrictions
+    set_error_handler( "dumb_test" );
+
 	if      ( basename( PML_BASE ) !== 'pimp-my-log' ) $a = false;
 	else if ( ! is_dir(      PML_BASE . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'potsky' ) ) $a = false;
 	else if ( ! is_dir(      PML_BASE . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'vendor' ) ) $a = false;
 	else if ( ! file_exists( PML_BASE . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'composer.json' ) ) $a = false;
 	else $a = true;
+
 	restore_error_handler();
 
 	return $a;

diff --git a/inc/login.inc.php b/inc/login.inc.php
@@ -1,10 +1,10 @@
 <?php
-/*! pimpmylog - 1.7.7 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
+/*! pimpmylog - 1.7.8 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
 /*
  * pimpmylog
  * http://pimpmylog.com
  *
- * Copyright (c) 2014 Potsky, contributors
+ * Copyright (c) 2015 Potsky, contributors
  * Licensed under the GPLv3 license.
  */
 ?><?php

diff --git a/inc/rss.php b/inc/rss.php
@@ -1,10 +1,10 @@
 <?php
-/*! pimpmylog - 1.7.7 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
+/*! pimpmylog - 1.7.8 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
 /*
  * pimpmylog
  * http://pimpmylog.com
  *
- * Copyright (c) 2014 Potsky, contributors
+ * Copyright (c) 2015 Potsky, contributors
  * Licensed under the GPLv3 license.
  */
 ?><?php

diff --git a/inc/rss.pml.php b/inc/rss.pml.php
@@ -1,10 +1,10 @@
 <?php
-/*! pimpmylog - 1.7.7 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
+/*! pimpmylog - 1.7.8 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
 /*
  * pimpmylog
  * http://pimpmylog.com
  *
- * Copyright (c) 2014 Potsky, contributors
+ * Copyright (c) 2015 Potsky, contributors
  * Licensed under the GPLv3 license.
  */
 ?><?php

diff --git a/inc/test.php b/inc/test.php
@@ -1,10 +1,10 @@
 <?php
-/*! pimpmylog - 1.7.7 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
+/*! pimpmylog - 1.7.8 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
 /*
  * pimpmylog
  * http://pimpmylog.com
  *
- * Copyright (c) 2014 Potsky, contributors
+ * Copyright (c) 2015 Potsky, contributors
  * Licensed under the GPLv3 license.
  */
 ?><?php

diff --git a/inc/upgrade.pml.php b/inc/upgrade.pml.php
@@ -1,10 +1,10 @@
 <?php
-/*! pimpmylog - 1.7.7 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
+/*! pimpmylog - 1.7.8 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
 /*
  * pimpmylog
  * http://pimpmylog.com
  *
- * Copyright (c) 2014 Potsky, contributors
+ * Copyright (c) 2015 Potsky, contributors
  * Licensed under the GPLv3 license.
  */
 ?><?php

diff --git a/inc/users.pml.php b/inc/users.pml.php
@@ -1,10 +1,10 @@
 <?php
-/*! pimpmylog - 1.7.7 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
+/*! pimpmylog - 1.7.8 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
 /*
  * pimpmylog
  * http://pimpmylog.com
  *
- * Copyright (c) 2014 Potsky, contributors
+ * Copyright (c) 2015 Potsky, contributors
  * Licensed under the GPLv3 license.
  */
 ?><?php

diff --git a/index.php b/index.php
@@ -1,10 +1,10 @@
 <?php
-/*! pimpmylog - 1.7.7 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
+/*! pimpmylog - 1.7.8 - 82a1a7504873a6aed42a95a13b42ec8f8d12213f*/
 /*
  * pimpmylog
  * http://pimpmylog.com
  *
- * Copyright (c) 2014 Potsky, contributors
+ * Copyright (c) 2015 Potsky, contributors
  * Licensed under the GPLv3 license.
  */
 ?><?php

diff --git a/js/configure.min.js b/js/configure.min.js