grunt install from branch dev commit 61426ba

potsky · Dec 14, 2016 · 93ec863 · 93ec863
1 parent d7a5c13
commit 93ec863
Show file tree

Hide file tree

Showing 34 changed files with 848 additions and 523 deletions.
diff --git a/README.md b/README.md
@@ -1,9 +1,7 @@
 Pimp my Log 
 ===========
 
-[![Latest Stable Version](https://poser.pugx.org/potsky/pimp-my-log/v/stable.svg)](https://packagist.org/packages/potsky/pimp-my-log)
-[![Build Status](https://travis-ci.org/potsky/PimpMyLog.svg)](https://travis-ci.org/potsky/PimpMyLog)
-[![Stories in Ready](https://badge.waffle.io/potsky/PimpMyLog.png?label=ready&title=Ready)](https://waffle.io/potsky/PimpMyLog)
+[![Latest Stable Version](https://poser.pugx.org/potsky/pimp-my-log/v/stable.svg)](https://packagist.org/packages/potsky/pimp-my-log) [![Build Status](https://travis-ci.org/potsky/PimpMyLog.svg)](https://travis-ci.org/potsky/PimpMyLog)
 
 All informations are available on [pimpmylog.com](http://pimpmylog.com).
 

diff --git a/cfg/apache.config.php b/cfg/apache.config.php
@@ -1,10 +1,10 @@
 <?php
-/*! pimpmylog - 1.7.10 - 65d6f147e509133fc5f09642ba82b149ef750ef2*/
+/*! pimpmylog - 1.7.11 - d666559cb0e141ca9c4984773e180f75b7c53664*/
 /*
  * pimpmylog
  * http://pimpmylog.com
  *
- * Copyright (c) 2015 Potsky, contributors
+ * Copyright (c) 2016 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.10 - 65d6f147e509133fc5f09642ba82b149ef750ef2*/
+/*! pimpmylog - 1.7.11 - d666559cb0e141ca9c4984773e180f75b7c53664*/
 /*
  * pimpmylog
  * http://pimpmylog.com
  *
- * Copyright (c) 2015 Potsky, contributors
+ * Copyright (c) 2016 Potsky, contributors
  * Licensed under the GPLv3 license.
  */
 ?>
@@ -16,17 +16,17 @@
  * @var  array
  */
 $paths = array(
-	'/var/log/',
-	'/var/log/apache/',
-	'/var/log/apache2/',
-	'/var/log/httpd/',
-	'/usr/local/var/log/apache/',
-	'/usr/local/var/log/apache2/',
-	'/usr/local/var/log/httpd/',
-	'/opt/local/apache/logs/',
-	'/opt/local/apache2/logs/',
-	'/opt/local/httpd/logs/',
-	'C:/wamp/logs/',
+	'/var/log/' ,
+	'/var/log/apache/' ,
+	'/var/log/apache2/' ,
+	'/var/log/httpd/' ,
+	'/usr/local/var/log/apache/' ,
+	'/usr/local/var/log/apache2/' ,
+	'/usr/local/var/log/httpd/' ,
+	'/opt/local/apache/logs/' ,
+	'/opt/local/apache2/logs/' ,
+	'/opt/local/httpd/logs/' ,
+	'C:/wamp/logs/' ,
 );
 
 
@@ -41,15 +41,51 @@
  * @var  array
  */
 $files = array(
-	'error' => array(
-		'error.log',
-		'error_log',
-		'apache_error.log',
-	),
+	'error'  => array(
+		'error.log' ,
+		'error_log' ,
+		'apache_error.log' ,
+	) ,
 	'access' => array(
-		'access.log',
-		'access_log',
-		'apache.log',
-		'apache_access.log',
-	),
+		'access.log' ,
+		'access_log' ,
+		'apache.log' ,
+		'apache_access.log' ,
+	) ,
 );
+
+/**
+ * Add sub-directories within specified paths
+ * helps with multiple site environments
+ */
+foreach ( $paths as $path )
+{
+	if ( is_dir( $path ) )
+	{
+		try
+		{
+			$directory = new RecursiveDirectoryIterator( $path );
+			$iterator  = new RecursiveIteratorIterator( $directory );
+			/** @var DirectoryIterator $file */
+			foreach ( $iterator as $file )
+			{
+				foreach ( $files as $type )
+				{
+					foreach ( $type as $filename )
+					{
+						if ( $file->getFilename() === $filename )
+						{
+							$paths[] = $file->getPath();
+							continue 3;
+						}
+					}
+				}
+			}
+		}
+		catch ( Exception $e )
+		{
+		}
+	}
+}
+
+sort( $paths );
diff --git a/cfg/config.example.php b/cfg/config.example.php
@@ -1,10 +1,10 @@
 <?php
-/*! pimpmylog - 1.7.10 - 65d6f147e509133fc5f09642ba82b149ef750ef2*/
+/*! pimpmylog - 1.7.11 - d666559cb0e141ca9c4984773e180f75b7c53664*/
 /*
  * pimpmylog
  * http://pimpmylog.com
  *
- * Copyright (c) 2015 Potsky, contributors
+ * Copyright (c) 2016 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.10 - 65d6f147e509133fc5f09642ba82b149ef750ef2*/
+/*! pimpmylog - 1.7.11 - d666559cb0e141ca9c4984773e180f75b7c53664*/
 /*
  * pimpmylog
  * http://pimpmylog.com
  *
- * Copyright (c) 2015 Potsky, contributors
+ * Copyright (c) 2016 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.10 - 65d6f147e509133fc5f09642ba82b149ef750ef2*/
+/*! pimpmylog - 1.7.11 - d666559cb0e141ca9c4984773e180f75b7c53664*/
 /*
  * pimpmylog
  * http://pimpmylog.com
  *
- * Copyright (c) 2015 Potsky, contributors
+ * Copyright (c) 2016 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.10 - 65d6f147e509133fc5f09642ba82b149ef750ef2*/
+/*! pimpmylog - 1.7.11 - d666559cb0e141ca9c4984773e180f75b7c53664*/
 /*
  * pimpmylog
  * http://pimpmylog.com
  *
- * Copyright (c) 2015 Potsky, contributors
+ * Copyright (c) 2016 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.10 - 65d6f147e509133fc5f09642ba82b149ef750ef2*/
+/*! pimpmylog - 1.7.11 - d666559cb0e141ca9c4984773e180f75b7c53664*/
 /*
  * pimpmylog
  * http://pimpmylog.com
  *
- * Copyright (c) 2015 Potsky, contributors
+ * Copyright (c) 2016 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.10 - 65d6f147e509133fc5f09642ba82b149ef750ef2*/
+/*! pimpmylog - 1.7.11 - d666559cb0e141ca9c4984773e180f75b7c53664*/
 /*
  * pimpmylog
  * http://pimpmylog.com
  *
- * Copyright (c) 2015 Potsky, contributors
+ * Copyright (c) 2016 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.10 - 65d6f147e509133fc5f09642ba82b149ef750ef2*/
+/*! pimpmylog - 1.7.11 - d666559cb0e141ca9c4984773e180f75b7c53664*/
 /*
  * pimpmylog
  * http://pimpmylog.com
  *
- * Copyright (c) 2015 Potsky, contributors
+ * Copyright (c) 2016 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.10 - 65d6f147e509133fc5f09642ba82b149ef750ef2*/
+/*! pimpmylog - 1.7.11 - d666559cb0e141ca9c4984773e180f75b7c53664*/
 /*
  * pimpmylog
  * http://pimpmylog.com
  *
- * Copyright (c) 2015 Potsky, contributors
+ * Copyright (c) 2016 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.10 - 65d6f147e509133fc5f09642ba82b149ef750ef2*/
+/*! pimpmylog - 1.7.11 - d666559cb0e141ca9c4984773e180f75b7c53664*/
 /*
  * pimpmylog
  * http://pimpmylog.com
  *
- * Copyright (c) 2015 Potsky, contributors
+ * Copyright (c) 2016 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.10",
+    "version"     : "1.7.11",
     "license"     : "GPL-3.0+",
     "type"        : "project",
     "homepage"    : "http://pimpmylog.com",
@@ -24,6 +24,7 @@
         }
     ],
     "require" : {
-        "php" : ">=5.2.0"
+        "php" : ">=5.2.0",
+        "composer/installers": "*"
     }
 }
diff --git a/css/config.inc.css b/css/config.inc.css
@@ -1,9 +1,9 @@
-/*! pimpmylog - 1.7.10 - 65d6f147e509133fc5f09642ba82b149ef750ef2*/
+/*! pimpmylog - 1.7.11 - d666559cb0e141ca9c4984773e180f75b7c53664*/
 /*
  * pimpmylog
  * http://pimpmylog.com
  *
- * Copyright (c) 2015 Potsky, contributors
+ * Copyright (c) 2016 Potsky, contributors
  * Licensed under the GPLv3 license.
  */
 /*
@@ -30,7 +30,6 @@ Your stylesheet will be loaded instead of this one if you create a file located
 	white-space     : pre-wrap;
 	-ms-word-break  : break-all;
 	word-break      : break-all;
-	word-break      : break-word;
 	-webkit-hyphens : auto;
 	-moz-hyphens    : auto;
 	hyphens         : auto;
@@ -46,15 +45,14 @@ Your stylesheet will be loaded instead of this one if you create a file located
 	white-space : nowrap;
 }
 
-
 .pml-badge {
 	font-size  : 0.9em;
 	text-align : center;
 }
 
 /* Specific to column */
 .pml-CMD {
-	white-space :nowrap;
+	white-space : nowrap;
 }
 
 .pml-Severity {
@@ -77,30 +75,38 @@ Your stylesheet will be loaded instead of this one if you create a file located
 	font-size       : 0.8em;
 	-ms-word-break  : break-all;
 	word-break      : break-all;
-	word-break      : break-word;
 	-webkit-hyphens : auto;
 	-moz-hyphens    : auto;
 	hyphens         : auto;
 }
 
 .pml-User {
-	font-size: 0.8em;
+	font-size : 0.8em;
 }
 
 /* New log color on the row */
 .newlog td:first-child {
-	background-position : 0 0;
-	background-image    : url(../img/1x1pink_low.gif);
-	background-size     : 1px 100%;
-	background-repeat   : no-repeat;
+	background-size : 1px 100%;
+	background      : url(../img/1x1pink_low.gif) no-repeat 0 0;
 }
 
 /* Marker colors when you click on a date field */
 td.pml-date {
-	cursor:pointer;
+	cursor : pointer;
+}
+
+tr:nth-child(odd) td.marker {
+	background-color : #efef00 !important;
 }
-tr:nth-child(odd)        td.marker { background-color : #efef00!important; }
-tr:nth-child(even)       td.marker { background-color : #ffff00!important; }
-tr:nth-child(odd):hover  td.marker { background-color : #e8e800!important; }
-tr:nth-child(even):hover td.marker { background-color : #f8f800!important; }
 
+tr:nth-child(even) td.marker {
+	background-color : #ffff00 !important;
+}
+
+tr:nth-child(odd):hover td.marker {
+	background-color : #e8e800 !important;
+}
+
+tr:nth-child(even):hover td.marker {
+	background-color : #f8f800 !important;
+}
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,10 +1,10 @@
 <?php
-/*! pimpmylog - 1.7.10 - 65d6f147e509133fc5f09642ba82b149ef750ef2*/
+/*! pimpmylog - 1.7.11 - d666559cb0e141ca9c4984773e180f75b7c53664*/
 /*
  * pimpmylog
  * http://pimpmylog.com
  *
- * Copyright (c) 2015 Potsky, contributors
+ * Copyright (c) 2016 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.10 - 65d6f147e509133fc5f09642ba82b149ef750ef2*/
+/*! pimpmylog - 1.7.11 - d666559cb0e141ca9c4984773e180f75b7c53664*/
 /*
  * pimpmylog
  * http://pimpmylog.com
  *
- * Copyright (c) 2015 Potsky, contributors
+ * Copyright (c) 2016 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.10 - 65d6f147e509133fc5f09642ba82b149ef750ef2*/
+/*! pimpmylog - 1.7.11 - d666559cb0e141ca9c4984773e180f75b7c53664*/
 /*
  * pimpmylog
  * http://pimpmylog.com
  *
- * Copyright (c) 2015 Potsky, contributors
+ * Copyright (c) 2016 Potsky, contributors
  * Licensed under the GPLv3 license.
  */
 ?><?php