grunt install from branch dev commit aaa39e0

potsky · Nov 24, 2015 · 943e712 · 943e712
1 parent 22f448c
commit 943e712
Show file tree

Hide file tree

Showing 33 changed files with 56 additions and 72 deletions.
diff --git a/cfg/apache.config.php b/cfg/apache.config.php
@@ -1,5 +1,5 @@
 <?php
-/*! pimpmylog - 1.7.9 - 10b502eaf17be208850be61febb044c2fdb86207*/
+/*! pimpmylog - 1.7.10 - 65d6f147e509133fc5f09642ba82b149ef750ef2*/
 /*
  * pimpmylog
  * http://pimpmylog.com

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

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

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

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

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

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

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

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

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

diff --git a/cfg/softwares.inc.php b/cfg/softwares.inc.php
@@ -1,5 +1,5 @@
 <?php
-/*! pimpmylog - 1.7.9 - 10b502eaf17be208850be61febb044c2fdb86207*/
+/*! pimpmylog - 1.7.10 - 65d6f147e509133fc5f09642ba82b149ef750ef2*/
 /*
  * 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.9",
+    "version"     : "1.7.10",
     "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.9 - 10b502eaf17be208850be61febb044c2fdb86207*/
+/*! pimpmylog - 1.7.10 - 65d6f147e509133fc5f09642ba82b149ef750ef2*/
 /*
  * pimpmylog
  * http://pimpmylog.com

diff --git a/css/pml.min.css b/css/pml.min.css
diff --git a/css/pml.min.css.map b/css/pml.min.css.map
diff --git a/inc/configure.php b/inc/configure.php
@@ -1,5 +1,5 @@
 <?php
-/*! pimpmylog - 1.7.9 - 10b502eaf17be208850be61febb044c2fdb86207*/
+/*! pimpmylog - 1.7.10 - 65d6f147e509133fc5f09642ba82b149ef750ef2*/
 /*
  * pimpmylog
  * http://pimpmylog.com

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

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

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

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

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

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

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

diff --git a/inc/test.php b/inc/test.php
@@ -1,5 +1,5 @@
 <?php
-/*! pimpmylog - 1.7.9 - 10b502eaf17be208850be61febb044c2fdb86207*/
+/*! pimpmylog - 1.7.10 - 65d6f147e509133fc5f09642ba82b149ef750ef2*/
 /*
  * pimpmylog
  * http://pimpmylog.com
@@ -88,7 +88,13 @@ function test( $type , $regex , $match , $types , $logs , $headers = true , $mul
 /**
  * Ajax return for regexp tester
  */
-if ( ( @$_POST['action'] === 'regextest' ) && ( file_exists( $access_file ) ) ) {
+if ( @$_POST['action'] === 'regextest' )
+{
+	if ( ( ! file_exists( $access_file ) ) && ( ! Sentinel::isAdmin() ) )
+	{
+		echo json_encode( array( 'msg' => "Authentication error" ) );
+		die();
+	}
 
 	$return    = array();
 	$match     = @json_decode( $_POST['m'] , true );
@@ -126,6 +132,8 @@ function test( $type , $regex , $match , $types , $logs , $headers = true , $mul
 }
 
 
+
+
 //////////////////////
 // Javascript Lemma //
 //////////////////////

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

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

diff --git a/index.php b/index.php
@@ -1,5 +1,5 @@
 <?php
-/*! pimpmylog - 1.7.9 - 10b502eaf17be208850be61febb044c2fdb86207*/
+/*! pimpmylog - 1.7.10 - 65d6f147e509133fc5f09642ba82b149ef750ef2*/
 /*
  * 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.9 - 10b502eaf17be208850be61febb044c2fdb86207*/
+/*! pimpmylog - 1.7.10 - 65d6f147e509133fc5f09642ba82b149ef750ef2*/
 /*
  * 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.9",
-	"versiondevh" : "10b502eaf17be208850be61febb044c2fdb86207",
+	"version"     : "1.7.10",
+	"versiondevh" : "65d6f147e509133fc5f09642ba82b149ef750ef2",
 	"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.10" : {
+			"released" : "2015-11-24",
+			"fixed" : [
+				"Regex tester error in debugger for authenticated users (<a href=\"http://support.pimpmylog.com/discussions/problems/75-bug-on-debugger\" target=\"_blank\">more info</a>)"
+			]
+		},
 		"1.7.9" : {
 			"released" : "2015-05-27",
 			"new" : [