diff --git a/.scrutinizer.yml b/.scrutinizer.yml index c924a41d1c..e2ae05a96c 100644 --- a/.scrutinizer.yml +++ b/.scrutinizer.yml @@ -5,4 +5,4 @@ imports: # FIXME: find a way to keep excluded_paths list sorted filter: - excluded_paths: [ html/includes/geshi/*, html/includes/jpgraph/*, html/js/*, includes/phpmailer/*, html/css/*, html/includes/Slim/*, includes/console_colour.php, includes/console_table.php, html/lib/*, lib/* ] + excluded_paths: [ html/js/*, includes/phpmailer/*, html/css/*, includes/console_colour.php, includes/console_table.php, html/lib/*, lib/* ] diff --git a/adduser.php b/adduser.php index f1e591415c..d46119e770 100755 --- a/adduser.php +++ b/adduser.php @@ -19,7 +19,7 @@ require 'includes/defaults.inc.php'; require 'config.php'; require 'includes/definitions.inc.php'; require 'includes/functions.php'; -require 'html/includes/PasswordHash.php'; +require 'html/lib/PasswordHash.php'; if (file_exists('html/includes/authentication/'.$config['auth_mechanism'].'.inc.php')) { include 'html/includes/authentication/'.$config['auth_mechanism'].'.inc.php'; diff --git a/html/api_v0.php b/html/api_v0.php index 676cca8967..0a18250495 100644 --- a/html/api_v0.php +++ b/html/api_v0.php @@ -20,7 +20,7 @@ require_once '../includes/dbFacile.php'; require_once '../includes/rewrites.php'; require_once 'includes/functions.inc.php'; require_once '../includes/rrdtool.inc.php'; -require 'includes/Slim/Slim.php'; +require 'lib/Slim/Slim.php'; \Slim\Slim::registerAutoloader(); $app = new \Slim\Slim(); require_once 'includes/api_functions.inc.php'; diff --git a/html/bandwidth-graph.php b/html/bandwidth-graph.php index d43f2bd85f..82a2a8662e 100644 --- a/html/bandwidth-graph.php +++ b/html/bandwidth-graph.php @@ -43,11 +43,11 @@ if (get_client_ip() != $_SERVER['SERVER_ADDR']) { } } -require_once 'includes/jpgraph/src/jpgraph.php'; -require_once 'includes/jpgraph/src/jpgraph_line.php'; -require_once 'includes/jpgraph/src/jpgraph_bar.php'; -require_once 'includes/jpgraph/src/jpgraph_utils.inc.php'; -require_once 'includes/jpgraph/src/jpgraph_date.php'; +require_once 'lib/jpgraph/jpgraph.php'; +require_once 'lib/jpgraph/jpgraph_line.php'; +require_once 'lib/jpgraph/jpgraph_bar.php'; +require_once 'lib/jpgraph/jpgraph_utils.inc.php'; +require_once 'lib/jpgraph/jpgraph_date.php'; if (is_numeric($_GET['bill_id'])) { if (get_client_ip() != $_SERVER['SERVER_ADDR']) { diff --git a/html/billing-graph.php b/html/billing-graph.php index 7038de620e..fffc93a7a3 100644 --- a/html/billing-graph.php +++ b/html/billing-graph.php @@ -43,10 +43,10 @@ if (get_client_ip() != $_SERVER['SERVER_ADDR']) { } } -require 'includes/jpgraph/src/jpgraph.php'; -require 'includes/jpgraph/src/jpgraph_line.php'; -require 'includes/jpgraph/src/jpgraph_utils.inc.php'; -require 'includes/jpgraph/src/jpgraph_date.php'; +require 'lib/jpgraph/jpgraph.php'; +require 'lib/jpgraph/jpgraph_line.php'; +require 'lib/jpgraph/jpgraph_utils.inc.php'; +require 'lib/jpgraph/jpgraph_date.php'; if (is_numeric($_GET['bill_id'])) { if (get_client_ip() != $_SERVER['SERVER_ADDR']) { diff --git a/html/includes/authenticate.inc.php b/html/includes/authenticate.inc.php index 0f25d24144..49e8798d84 100644 --- a/html/includes/authenticate.inc.php +++ b/html/includes/authenticate.inc.php @@ -2,7 +2,7 @@ @ini_set('session.use_only_cookies', 1); @ini_set('session.cookie_httponly', 1); -require 'includes/PasswordHash.php'; +require 'lib/PasswordHash.php'; session_start(); diff --git a/html/includes/jpgraph/README b/html/includes/jpgraph/README deleted file mode 100644 index 963cc5c8f1..0000000000 --- a/html/includes/jpgraph/README +++ /dev/null @@ -1,71 +0,0 @@ -README FOR JPGRAPH 3.0.x -======================== - -This package contains JpGraph, an Object Oriented PHP5 Graph Plotting library. - -The library is Copyright (C) 2001-2009 Aditus Consulting and -released under dual license QPL 1.0 for open source and educational -use and JpGraph Professional License for commercial use. - -Please see full license details at http://www.aditus.nu/jpgraph/ - -* -------------------------------------------------------------------- -* PHP4 IS NOT SUPPORTED in the 2.x or 3.x series -* -------------------------------------------------------------------- - -Requirements: -------------- -Miminum: -* PHP 5.1.0 or higher -* GD 2.0.28 or higher -Note: Earlier versions might work but is unsupported. - -Recommended: -* PHP >= 5.2.0 -* PHP Built-in GD library - -Installation ------------- -0. Make sure that the PHP version is compatible with the stated requirements - and that the PHP installation has support for the GD library. - Please run phpinfo() to check if GD library - is supported in the installation. - If the GD library doesn't seem to be installed - please consult the PHP manual under section "Image" for - instructions on where to find this library. Please refer to - the manual section "Verifying your PHP installation" - -1. Unzip and copy the files to a directory of your choice where Your - httpd sever can access them. - For a global site installation you should copy the files to - somewhere in the PHP search path. - -2. Check that the default directory paths in jpg-config.inc - for cache directory and TTF directory suits your installation. - Note1: The default directories are different depending on if - the library is running on Windows or UNIX. - Note2: Apache/PHP must have write permission to your cache - directory if you enable the cache feature. By default the cache - is disabled. - -3. Check that all rest of the DEFINE in jpg-config.inc - is setup to your preference. The default should be fine - for most users. - -4. Read the chapters on installation in the manual. - - -Documentation -------------- -The installation includes HTML documentation and reference guide for the -library. The portal page for all the documentation is -/docs/index.html - - -Bug reports and suggestions ---------------------------- -Should be reported using the the issue tracker at - -http://www.aditus.nu/bugtraq - - diff --git a/html/includes/jpgraph/VERSION b/html/includes/jpgraph/VERSION deleted file mode 100644 index 92f61ae6bd..0000000000 --- a/html/includes/jpgraph/VERSION +++ /dev/null @@ -1 +0,0 @@ -Version: v3.0.7, Build: r1928, Exported: Mon, 11 Jan 2010 at 23:34 (UTC+2), w1002.1 diff --git a/html/includes/PasswordHash.php b/html/lib/PasswordHash.php similarity index 100% rename from html/includes/PasswordHash.php rename to html/lib/PasswordHash.php diff --git a/html/includes/Slim/Environment.php b/html/lib/Slim/Environment.php similarity index 100% rename from html/includes/Slim/Environment.php rename to html/lib/Slim/Environment.php diff --git a/html/includes/Slim/Exception/Pass.php b/html/lib/Slim/Exception/Pass.php similarity index 100% rename from html/includes/Slim/Exception/Pass.php rename to html/lib/Slim/Exception/Pass.php diff --git a/html/includes/Slim/Exception/Stop.php b/html/lib/Slim/Exception/Stop.php similarity index 100% rename from html/includes/Slim/Exception/Stop.php rename to html/lib/Slim/Exception/Stop.php diff --git a/html/includes/Slim/Helper/Set.php b/html/lib/Slim/Helper/Set.php similarity index 100% rename from html/includes/Slim/Helper/Set.php rename to html/lib/Slim/Helper/Set.php diff --git a/html/includes/Slim/Http/Cookies.php b/html/lib/Slim/Http/Cookies.php similarity index 100% rename from html/includes/Slim/Http/Cookies.php rename to html/lib/Slim/Http/Cookies.php diff --git a/html/includes/Slim/Http/Headers.php b/html/lib/Slim/Http/Headers.php similarity index 100% rename from html/includes/Slim/Http/Headers.php rename to html/lib/Slim/Http/Headers.php diff --git a/html/includes/Slim/Http/Request.php b/html/lib/Slim/Http/Request.php similarity index 100% rename from html/includes/Slim/Http/Request.php rename to html/lib/Slim/Http/Request.php diff --git a/html/includes/Slim/Http/Response.php b/html/lib/Slim/Http/Response.php similarity index 100% rename from html/includes/Slim/Http/Response.php rename to html/lib/Slim/Http/Response.php diff --git a/html/includes/Slim/Http/Util.php b/html/lib/Slim/Http/Util.php similarity index 100% rename from html/includes/Slim/Http/Util.php rename to html/lib/Slim/Http/Util.php diff --git a/html/includes/Slim/Log.php b/html/lib/Slim/Log.php similarity index 100% rename from html/includes/Slim/Log.php rename to html/lib/Slim/Log.php diff --git a/html/includes/Slim/LogWriter.php b/html/lib/Slim/LogWriter.php similarity index 100% rename from html/includes/Slim/LogWriter.php rename to html/lib/Slim/LogWriter.php diff --git a/html/includes/Slim/Middleware.php b/html/lib/Slim/Middleware.php similarity index 100% rename from html/includes/Slim/Middleware.php rename to html/lib/Slim/Middleware.php diff --git a/html/includes/Slim/Middleware/ContentTypes.php b/html/lib/Slim/Middleware/ContentTypes.php similarity index 100% rename from html/includes/Slim/Middleware/ContentTypes.php rename to html/lib/Slim/Middleware/ContentTypes.php diff --git a/html/includes/Slim/Middleware/Flash.php b/html/lib/Slim/Middleware/Flash.php similarity index 100% rename from html/includes/Slim/Middleware/Flash.php rename to html/lib/Slim/Middleware/Flash.php diff --git a/html/includes/Slim/Middleware/MethodOverride.php b/html/lib/Slim/Middleware/MethodOverride.php similarity index 100% rename from html/includes/Slim/Middleware/MethodOverride.php rename to html/lib/Slim/Middleware/MethodOverride.php diff --git a/html/includes/Slim/Middleware/PrettyExceptions.php b/html/lib/Slim/Middleware/PrettyExceptions.php similarity index 100% rename from html/includes/Slim/Middleware/PrettyExceptions.php rename to html/lib/Slim/Middleware/PrettyExceptions.php diff --git a/html/includes/Slim/Middleware/SessionCookie.php b/html/lib/Slim/Middleware/SessionCookie.php similarity index 100% rename from html/includes/Slim/Middleware/SessionCookie.php rename to html/lib/Slim/Middleware/SessionCookie.php diff --git a/html/includes/Slim/Route.php b/html/lib/Slim/Route.php similarity index 100% rename from html/includes/Slim/Route.php rename to html/lib/Slim/Route.php diff --git a/html/includes/Slim/Router.php b/html/lib/Slim/Router.php similarity index 100% rename from html/includes/Slim/Router.php rename to html/lib/Slim/Router.php diff --git a/html/includes/Slim/Slim.php b/html/lib/Slim/Slim.php similarity index 100% rename from html/includes/Slim/Slim.php rename to html/lib/Slim/Slim.php diff --git a/html/includes/Slim/View.php b/html/lib/Slim/View.php similarity index 100% rename from html/includes/Slim/View.php rename to html/lib/Slim/View.php diff --git a/html/includes/geshi/geshi.php b/html/lib/geshi/geshi.php similarity index 100% rename from html/includes/geshi/geshi.php rename to html/lib/geshi/geshi.php diff --git a/html/includes/geshi/geshi/diff.php b/html/lib/geshi/geshi/diff.php similarity index 100% rename from html/includes/geshi/geshi/diff.php rename to html/lib/geshi/geshi/diff.php diff --git a/html/includes/geshi/geshi/ios.php b/html/lib/geshi/geshi/ios.php similarity index 100% rename from html/includes/geshi/geshi/ios.php rename to html/lib/geshi/geshi/ios.php diff --git a/html/includes/jpgraph/src/contour_dev/findpolygon.php b/html/lib/jpgraph/contour_dev/findpolygon.php similarity index 100% rename from html/includes/jpgraph/src/contour_dev/findpolygon.php rename to html/lib/jpgraph/contour_dev/findpolygon.php diff --git a/html/includes/jpgraph/src/contour_dev/tri-quad.php b/html/lib/jpgraph/contour_dev/tri-quad.php similarity index 100% rename from html/includes/jpgraph/src/contour_dev/tri-quad.php rename to html/lib/jpgraph/contour_dev/tri-quad.php diff --git a/html/includes/jpgraph/src/flag_mapping b/html/lib/jpgraph/flag_mapping similarity index 100% rename from html/includes/jpgraph/src/flag_mapping rename to html/lib/jpgraph/flag_mapping diff --git a/html/includes/jpgraph/src/flags.dat b/html/lib/jpgraph/flags.dat similarity index 100% rename from html/includes/jpgraph/src/flags.dat rename to html/lib/jpgraph/flags.dat diff --git a/html/includes/jpgraph/src/flags_thumb100x100.dat b/html/lib/jpgraph/flags_thumb100x100.dat similarity index 100% rename from html/includes/jpgraph/src/flags_thumb100x100.dat rename to html/lib/jpgraph/flags_thumb100x100.dat diff --git a/html/includes/jpgraph/src/flags_thumb35x35.dat b/html/lib/jpgraph/flags_thumb35x35.dat similarity index 100% rename from html/includes/jpgraph/src/flags_thumb35x35.dat rename to html/lib/jpgraph/flags_thumb35x35.dat diff --git a/html/includes/jpgraph/src/flags_thumb60x60.dat b/html/lib/jpgraph/flags_thumb60x60.dat similarity index 100% rename from html/includes/jpgraph/src/flags_thumb60x60.dat rename to html/lib/jpgraph/flags_thumb60x60.dat diff --git a/html/includes/jpgraph/src/gd_image.inc.php b/html/lib/jpgraph/gd_image.inc.php similarity index 98% rename from html/includes/jpgraph/src/gd_image.inc.php rename to html/lib/jpgraph/gd_image.inc.php index c2ec49e888..913558914b 100644 --- a/html/includes/jpgraph/src/gd_image.inc.php +++ b/html/lib/jpgraph/gd_image.inc.php @@ -1,4 +1,28 @@ . + * + * @package LibreNMS + * @link http://librenms.org + * @copyright 2016 Tony Murray + * @author Tony Murray + */ + //======================================================================= // File: GD_IMAGE.INC.PHP // Description: PHP Graph Plotting library. Low level image drawing routines diff --git a/html/includes/jpgraph/src/imgdata_balls.inc.php b/html/lib/jpgraph/imgdata_balls.inc.php similarity index 98% rename from html/includes/jpgraph/src/imgdata_balls.inc.php rename to html/lib/jpgraph/imgdata_balls.inc.php index abc43d091f..651c51a67f 100644 --- a/html/includes/jpgraph/src/imgdata_balls.inc.php +++ b/html/lib/jpgraph/imgdata_balls.inc.php @@ -1,4 +1,28 @@ . + * + * @package LibreNMS + * @link http://librenms.org + * @copyright 2016 Tony Murray + * @author Tony Murray + */ + //======================================================================= // File: IMGDATA_ROUNDBALLS.INC // Description: Base64 encoded images for small round markers diff --git a/html/includes/jpgraph/src/imgdata_bevels.inc.php b/html/lib/jpgraph/imgdata_bevels.inc.php similarity index 84% rename from html/includes/jpgraph/src/imgdata_bevels.inc.php rename to html/lib/jpgraph/imgdata_bevels.inc.php index 2cd545f74f..2dab45fc55 100644 --- a/html/includes/jpgraph/src/imgdata_bevels.inc.php +++ b/html/lib/jpgraph/imgdata_bevels.inc.php @@ -1,4 +1,28 @@ . + * + * @package LibreNMS + * @link http://librenms.org + * @copyright 2016 Tony Murray + * @author Tony Murray + */ + //======================================================================= // File: IMGDATA_BEVELS.INC // Description: Base64 encoded images for round bevels diff --git a/html/includes/jpgraph/src/imgdata_diamonds.inc.php b/html/lib/jpgraph/imgdata_diamonds.inc.php similarity index 91% rename from html/includes/jpgraph/src/imgdata_diamonds.inc.php rename to html/lib/jpgraph/imgdata_diamonds.inc.php index 533cd4753c..c911a97031 100644 --- a/html/includes/jpgraph/src/imgdata_diamonds.inc.php +++ b/html/lib/jpgraph/imgdata_diamonds.inc.php @@ -1,4 +1,28 @@ . + * + * @package LibreNMS + * @link http://librenms.org + * @copyright 2016 Tony Murray + * @author Tony Murray + */ + //======================================================================= // File: IMGDATA_DIAMONDS.INC // Description: Base64 encoded images for diamonds diff --git a/html/includes/jpgraph/src/imgdata_pushpins.inc.php b/html/lib/jpgraph/imgdata_pushpins.inc.php similarity index 97% rename from html/includes/jpgraph/src/imgdata_pushpins.inc.php rename to html/lib/jpgraph/imgdata_pushpins.inc.php index 53e0b159a7..f15d115e25 100644 --- a/html/includes/jpgraph/src/imgdata_pushpins.inc.php +++ b/html/lib/jpgraph/imgdata_pushpins.inc.php @@ -1,4 +1,28 @@ . + * + * @package LibreNMS + * @link http://librenms.org + * @copyright 2016 Tony Murray + * @author Tony Murray + */ + //======================================================================= // File: IMGDATA_PUSHPINS.INC // Description: Base64 encoded images for pushpins diff --git a/html/includes/jpgraph/src/imgdata_squares.inc.php b/html/lib/jpgraph/imgdata_squares.inc.php similarity index 89% rename from html/includes/jpgraph/src/imgdata_squares.inc.php rename to html/lib/jpgraph/imgdata_squares.inc.php index b17faf0449..e420b0a243 100644 --- a/html/includes/jpgraph/src/imgdata_squares.inc.php +++ b/html/lib/jpgraph/imgdata_squares.inc.php @@ -1,4 +1,28 @@ . + * + * @package LibreNMS + * @link http://librenms.org + * @copyright 2016 Tony Murray + * @author Tony Murray + */ + //======================================================================= // File: IMGDATA_SQUARES.INC // Description: Base64 encoded images for squares diff --git a/html/includes/jpgraph/src/imgdata_stars.inc.php b/html/lib/jpgraph/imgdata_stars.inc.php similarity index 89% rename from html/includes/jpgraph/src/imgdata_stars.inc.php rename to html/lib/jpgraph/imgdata_stars.inc.php index 3c5f799a85..44d638ef10 100644 --- a/html/includes/jpgraph/src/imgdata_stars.inc.php +++ b/html/lib/jpgraph/imgdata_stars.inc.php @@ -1,4 +1,28 @@ . + * + * @package LibreNMS + * @link http://librenms.org + * @copyright 2016 Tony Murray + * @author Tony Murray + */ + //======================================================================= // File: IMGDATA_STARS.INC // Description: Base64 encoded images for stars diff --git a/html/includes/jpgraph/src/jpg-config.inc.php b/html/lib/jpgraph/jpg-config.inc.php similarity index 87% rename from html/includes/jpgraph/src/jpg-config.inc.php rename to html/lib/jpgraph/jpg-config.inc.php index 35081fa05f..f7ce5b7f6b 100644 --- a/html/includes/jpgraph/src/jpg-config.inc.php +++ b/html/lib/jpgraph/jpg-config.inc.php @@ -1,4 +1,28 @@ . + * + * @package LibreNMS + * @link http://librenms.org + * @copyright 2016 Tony Murray + * @author Tony Murray + */ + //======================================================================= // File: JPG-CONFIG.INC // Description: Configuration file for JpGraph library diff --git a/html/includes/jpgraph/src/jpgraph.php b/html/lib/jpgraph/jpgraph.php similarity index 99% rename from html/includes/jpgraph/src/jpgraph.php rename to html/lib/jpgraph/jpgraph.php index a92e58836f..0eba4e3190 100644 --- a/html/includes/jpgraph/src/jpgraph.php +++ b/html/lib/jpgraph/jpgraph.php @@ -1,4 +1,28 @@ . + * + * @package LibreNMS + * @link http://librenms.org + * @copyright 2016 Tony Murray + * @author Tony Murray + */ + //======================================================================= // File: JPGRAPH.PHP // Description: PHP Graph Plotting library. Base module. diff --git a/html/includes/jpgraph/src/jpgraph_antispam-digits.php b/html/lib/jpgraph/jpgraph_antispam-digits.php similarity index 93% rename from html/includes/jpgraph/src/jpgraph_antispam-digits.php rename to html/lib/jpgraph/jpgraph_antispam-digits.php index f3cff8ae5d..c032353d68 100644 --- a/html/includes/jpgraph/src/jpgraph_antispam-digits.php +++ b/html/lib/jpgraph/jpgraph_antispam-digits.php @@ -1,4 +1,28 @@ . + * + * @package LibreNMS + * @link http://librenms.org + * @copyright 2016 Tony Murray + * @author Tony Murray + */ + //======================================================================= // File: JPGRAPH_ANTISPAM.PHP // Description: Genarate anti-spam challenge diff --git a/html/includes/jpgraph/src/jpgraph_antispam.php b/html/lib/jpgraph/jpgraph_antispam.php similarity index 98% rename from html/includes/jpgraph/src/jpgraph_antispam.php rename to html/lib/jpgraph/jpgraph_antispam.php index e9c995a745..ed2b1737ee 100644 --- a/html/includes/jpgraph/src/jpgraph_antispam.php +++ b/html/lib/jpgraph/jpgraph_antispam.php @@ -1,4 +1,28 @@ . + * + * @package LibreNMS + * @link http://librenms.org + * @copyright 2016 Tony Murray + * @author Tony Murray + */ + //======================================================================= // File: JPGRAPH_ANTISPAM.PHP // Description: Genarate anti-spam challenge diff --git a/html/includes/jpgraph/src/jpgraph_bar.php b/html/lib/jpgraph/jpgraph_bar.php similarity index 98% rename from html/includes/jpgraph/src/jpgraph_bar.php rename to html/lib/jpgraph/jpgraph_bar.php index 10a5ddfd27..92d8eb7868 100644 --- a/html/includes/jpgraph/src/jpgraph_bar.php +++ b/html/lib/jpgraph/jpgraph_bar.php @@ -1,4 +1,28 @@ . + * + * @package LibreNMS + * @link http://librenms.org + * @copyright 2016 Tony Murray + * @author Tony Murray + */ + /*======================================================================= // File: JPGRAPH_BAR.PHP // Description: Bar plot extension for JpGraph diff --git a/html/includes/jpgraph/src/jpgraph_canvas.php b/html/lib/jpgraph/jpgraph_canvas.php similarity index 80% rename from html/includes/jpgraph/src/jpgraph_canvas.php rename to html/lib/jpgraph/jpgraph_canvas.php index 4e9f9645b1..f6e23e47e6 100644 --- a/html/includes/jpgraph/src/jpgraph_canvas.php +++ b/html/lib/jpgraph/jpgraph_canvas.php @@ -1,4 +1,28 @@ . + * + * @package LibreNMS + * @link http://librenms.org + * @copyright 2016 Tony Murray + * @author Tony Murray + */ + /*======================================================================= // File: JPGRAPH_CANVAS.PHP // Description: Canvas drawing extension for JpGraph diff --git a/html/includes/jpgraph/src/jpgraph_canvtools.php b/html/lib/jpgraph/jpgraph_canvtools.php similarity index 95% rename from html/includes/jpgraph/src/jpgraph_canvtools.php rename to html/lib/jpgraph/jpgraph_canvtools.php index bb821bfa0e..ff8e010f54 100644 --- a/html/includes/jpgraph/src/jpgraph_canvtools.php +++ b/html/lib/jpgraph/jpgraph_canvtools.php @@ -1,4 +1,28 @@ . + * + * @package LibreNMS + * @link http://librenms.org + * @copyright 2016 Tony Murray + * @author Tony Murray + */ + /*======================================================================= // File: JPGRAPH_CANVTOOLS.PHP // Description: Some utilities for text and shape drawing on a canvas diff --git a/html/includes/jpgraph/src/jpgraph_contour.php b/html/lib/jpgraph/jpgraph_contour.php similarity index 96% rename from html/includes/jpgraph/src/jpgraph_contour.php rename to html/lib/jpgraph/jpgraph_contour.php index 0b23cdec40..148eda9d8f 100644 --- a/html/includes/jpgraph/src/jpgraph_contour.php +++ b/html/lib/jpgraph/jpgraph_contour.php @@ -1,4 +1,28 @@ . + * + * @package LibreNMS + * @link http://librenms.org + * @copyright 2016 Tony Murray + * @author Tony Murray + */ + /*======================================================================= // File: JPGRAPH_CONTOUR.PHP // Description: Contour plot diff --git a/html/includes/jpgraph/src/jpgraph_date.php b/html/lib/jpgraph/jpgraph_date.php similarity index 95% rename from html/includes/jpgraph/src/jpgraph_date.php rename to html/lib/jpgraph/jpgraph_date.php index 6adc9e4bb8..0fe00b4148 100644 --- a/html/includes/jpgraph/src/jpgraph_date.php +++ b/html/lib/jpgraph/jpgraph_date.php @@ -1,4 +1,28 @@ . + * + * @package LibreNMS + * @link http://librenms.org + * @copyright 2016 Tony Murray + * @author Tony Murray + */ + /*======================================================================= // File: JPGRAPH_DATE.PHP // Description: Classes to handle Date scaling diff --git a/html/includes/jpgraph/src/jpgraph_errhandler.inc.php b/html/lib/jpgraph/jpgraph_errhandler.inc.php similarity index 93% rename from html/includes/jpgraph/src/jpgraph_errhandler.inc.php rename to html/lib/jpgraph/jpgraph_errhandler.inc.php index 68b5b5d46b..e325e8ffc0 100644 --- a/html/includes/jpgraph/src/jpgraph_errhandler.inc.php +++ b/html/lib/jpgraph/jpgraph_errhandler.inc.php @@ -1,4 +1,28 @@ . + * + * @package LibreNMS + * @link http://librenms.org + * @copyright 2016 Tony Murray + * @author Tony Murray + */ + //======================================================================= // File: JPGRAPH_ERRHANDLER.PHP // Description: Error handler class together with handling of localized diff --git a/html/includes/jpgraph/src/jpgraph_error.php b/html/lib/jpgraph/jpgraph_error.php similarity index 85% rename from html/includes/jpgraph/src/jpgraph_error.php rename to html/lib/jpgraph/jpgraph_error.php index 5e0857fbee..87f9ce8006 100644 --- a/html/includes/jpgraph/src/jpgraph_error.php +++ b/html/lib/jpgraph/jpgraph_error.php @@ -1,4 +1,28 @@ . + * + * @package LibreNMS + * @link http://librenms.org + * @copyright 2016 Tony Murray + * @author Tony Murray + */ + /*======================================================================= // File: JPGRAPH_ERROR.PHP // Description: Error plot extension for JpGraph diff --git a/html/includes/jpgraph/src/jpgraph_flags.php b/html/lib/jpgraph/jpgraph_flags.php similarity index 94% rename from html/includes/jpgraph/src/jpgraph_flags.php rename to html/lib/jpgraph/jpgraph_flags.php index 3bf902ddce..85295b1457 100644 --- a/html/includes/jpgraph/src/jpgraph_flags.php +++ b/html/lib/jpgraph/jpgraph_flags.php @@ -1,4 +1,28 @@ . + * + * @package LibreNMS + * @link http://librenms.org + * @copyright 2016 Tony Murray + * @author Tony Murray + */ + //======================================================================= // File: JPGRAPH_FLAGS.PHP // Description: Class Jpfile. Handles plotmarks diff --git a/html/includes/jpgraph/src/jpgraph_gantt.php b/html/lib/jpgraph/jpgraph_gantt.php similarity index 99% rename from html/includes/jpgraph/src/jpgraph_gantt.php rename to html/lib/jpgraph/jpgraph_gantt.php index b8f0e5fc9f..635c17612b 100644 --- a/html/includes/jpgraph/src/jpgraph_gantt.php +++ b/html/lib/jpgraph/jpgraph_gantt.php @@ -1,4 +1,28 @@ . + * + * @package LibreNMS + * @link http://librenms.org + * @copyright 2016 Tony Murray + * @author Tony Murray + */ + /*======================================================================= // File: JPGRAPH_GANTT.PHP // Description: JpGraph Gantt plot extension diff --git a/html/includes/jpgraph/src/jpgraph_gb2312.php b/html/lib/jpgraph/jpgraph_gb2312.php similarity index 99% rename from html/includes/jpgraph/src/jpgraph_gb2312.php rename to html/lib/jpgraph/jpgraph_gb2312.php index bfaa58af02..0f272ac8f0 100644 --- a/html/includes/jpgraph/src/jpgraph_gb2312.php +++ b/html/lib/jpgraph/jpgraph_gb2312.php @@ -1,4 +1,28 @@ . + * + * @package LibreNMS + * @link http://librenms.org + * @copyright 2016 Tony Murray + * @author Tony Murray + */ + //======================================================================= // File: JPGRAPH_GB2312.PHP // Description: Chinese font conversions diff --git a/html/includes/jpgraph/src/jpgraph_gradient.php b/html/lib/jpgraph/jpgraph_gradient.php similarity index 95% rename from html/includes/jpgraph/src/jpgraph_gradient.php rename to html/lib/jpgraph/jpgraph_gradient.php index a990b9ff45..ff299877dd 100644 --- a/html/includes/jpgraph/src/jpgraph_gradient.php +++ b/html/lib/jpgraph/jpgraph_gradient.php @@ -1,4 +1,28 @@ . + * + * @package LibreNMS + * @link http://librenms.org + * @copyright 2016 Tony Murray + * @author Tony Murray + */ + /*======================================================================= // File: JPGRAPH_GRADIENT.PHP // Description: Create a color gradient diff --git a/html/includes/jpgraph/src/jpgraph_iconplot.php b/html/lib/jpgraph/jpgraph_iconplot.php similarity index 87% rename from html/includes/jpgraph/src/jpgraph_iconplot.php rename to html/lib/jpgraph/jpgraph_iconplot.php index ca622314c1..f43cf36962 100644 --- a/html/includes/jpgraph/src/jpgraph_iconplot.php +++ b/html/lib/jpgraph/jpgraph_iconplot.php @@ -1,4 +1,28 @@ . + * + * @package LibreNMS + * @link http://librenms.org + * @copyright 2016 Tony Murray + * @author Tony Murray + */ + //======================================================================= // File: JPGRAPH_ICONPLOT.PHP // Description: Extension module to add icons to plots diff --git a/html/includes/jpgraph/src/jpgraph_imgtrans.php b/html/lib/jpgraph/jpgraph_imgtrans.php similarity index 90% rename from html/includes/jpgraph/src/jpgraph_imgtrans.php rename to html/lib/jpgraph/jpgraph_imgtrans.php index 6f0cc07aa3..4d966d5751 100644 --- a/html/includes/jpgraph/src/jpgraph_imgtrans.php +++ b/html/lib/jpgraph/jpgraph_imgtrans.php @@ -1,4 +1,28 @@ . + * + * @package LibreNMS + * @link http://librenms.org + * @copyright 2016 Tony Murray + * @author Tony Murray + */ + //======================================================================= // File: JPGRAPH_IMGTRANS.PHP // Description: Extension for JpGraph to do some simple img transformations diff --git a/html/includes/jpgraph/src/jpgraph_led.php b/html/lib/jpgraph/jpgraph_led.php similarity index 93% rename from html/includes/jpgraph/src/jpgraph_led.php rename to html/lib/jpgraph/jpgraph_led.php index 45cda1ba9e..accc5b69be 100644 --- a/html/includes/jpgraph/src/jpgraph_led.php +++ b/html/lib/jpgraph/jpgraph_led.php @@ -1,4 +1,28 @@ . + * + * @package LibreNMS + * @link http://librenms.org + * @copyright 2016 Tony Murray + * @author Tony Murray + */ + //======================================================================= // File: JPGRAPH_LED.PHP // Description: Module to generate Dotted LED-like digits diff --git a/html/includes/jpgraph/src/jpgraph_legend.inc.php b/html/lib/jpgraph/jpgraph_legend.inc.php similarity index 95% rename from html/includes/jpgraph/src/jpgraph_legend.inc.php rename to html/lib/jpgraph/jpgraph_legend.inc.php index c1099c4728..9705edcc28 100644 --- a/html/includes/jpgraph/src/jpgraph_legend.inc.php +++ b/html/lib/jpgraph/jpgraph_legend.inc.php @@ -1,4 +1,28 @@ . + * + * @package LibreNMS + * @link http://librenms.org + * @copyright 2016 Tony Murray + * @author Tony Murray + */ + //======================================================================= // File: JPGRAPH_LEGEND.INC.PHP // Description: Class to handle the legend box in the graph that gives diff --git a/html/includes/jpgraph/src/jpgraph_line.php b/html/lib/jpgraph/jpgraph_line.php similarity index 96% rename from html/includes/jpgraph/src/jpgraph_line.php rename to html/lib/jpgraph/jpgraph_line.php index 3151fb4fc1..ef72f057c2 100644 --- a/html/includes/jpgraph/src/jpgraph_line.php +++ b/html/lib/jpgraph/jpgraph_line.php @@ -1,4 +1,28 @@ . + * + * @package LibreNMS + * @link http://librenms.org + * @copyright 2016 Tony Murray + * @author Tony Murray + */ + /*======================================================================= // File: JPGRAPH_LINE.PHP // Description: Line plot extension for JpGraph diff --git a/html/includes/jpgraph/src/jpgraph_log.php b/html/lib/jpgraph/jpgraph_log.php similarity index 92% rename from html/includes/jpgraph/src/jpgraph_log.php rename to html/lib/jpgraph/jpgraph_log.php index 58628c4e88..82b48d6a6c 100644 --- a/html/includes/jpgraph/src/jpgraph_log.php +++ b/html/lib/jpgraph/jpgraph_log.php @@ -1,4 +1,28 @@ . + * + * @package LibreNMS + * @link http://librenms.org + * @copyright 2016 Tony Murray + * @author Tony Murray + */ + /*======================================================================= // File: JPGRAPH_LOG.PHP // Description: Log scale plot extension for JpGraph diff --git a/html/includes/jpgraph/src/jpgraph_meshinterpolate.inc.php b/html/lib/jpgraph/jpgraph_meshinterpolate.inc.php similarity index 81% rename from html/includes/jpgraph/src/jpgraph_meshinterpolate.inc.php rename to html/lib/jpgraph/jpgraph_meshinterpolate.inc.php index bc9d6f0363..0aea48b38d 100644 --- a/html/includes/jpgraph/src/jpgraph_meshinterpolate.inc.php +++ b/html/lib/jpgraph/jpgraph_meshinterpolate.inc.php @@ -1,4 +1,28 @@ . + * + * @package LibreNMS + * @link http://librenms.org + * @copyright 2016 Tony Murray + * @author Tony Murray + */ + /*======================================================================= // File: JPGRAPH_MESHINTERPOLATE.INC.PHP // Description: Utility class to do mesh linear interpolation of a matrix diff --git a/html/includes/jpgraph/src/jpgraph_mgraph.php b/html/lib/jpgraph/jpgraph_mgraph.php similarity index 93% rename from html/includes/jpgraph/src/jpgraph_mgraph.php rename to html/lib/jpgraph/jpgraph_mgraph.php index fbd8f5d89e..ae92210e72 100644 --- a/html/includes/jpgraph/src/jpgraph_mgraph.php +++ b/html/lib/jpgraph/jpgraph_mgraph.php @@ -1,4 +1,28 @@ . + * + * @package LibreNMS + * @link http://librenms.org + * @copyright 2016 Tony Murray + * @author Tony Murray + */ + /*======================================================================= // File: JPGRAPH_MGRAPH.PHP // Description: Class to handle multiple graphs in the same image diff --git a/html/includes/jpgraph/src/jpgraph_pie.php b/html/lib/jpgraph/jpgraph_pie.php similarity index 98% rename from html/includes/jpgraph/src/jpgraph_pie.php rename to html/lib/jpgraph/jpgraph_pie.php index a4208b4529..2b5872d635 100644 --- a/html/includes/jpgraph/src/jpgraph_pie.php +++ b/html/lib/jpgraph/jpgraph_pie.php @@ -1,4 +1,28 @@ . + * + * @package LibreNMS + * @link http://librenms.org + * @copyright 2016 Tony Murray + * @author Tony Murray + */ + /*======================================================================= // File: JPGRAPH_PIE.PHP // Description: Pie plot extension for JpGraph diff --git a/html/includes/jpgraph/src/jpgraph_pie3d.php b/html/lib/jpgraph/jpgraph_pie3d.php similarity index 97% rename from html/includes/jpgraph/src/jpgraph_pie3d.php rename to html/lib/jpgraph/jpgraph_pie3d.php index 45cb2b2b99..2c01e25fa4 100644 --- a/html/includes/jpgraph/src/jpgraph_pie3d.php +++ b/html/lib/jpgraph/jpgraph_pie3d.php @@ -1,4 +1,28 @@ . + * + * @package LibreNMS + * @link http://librenms.org + * @copyright 2016 Tony Murray + * @author Tony Murray + */ + /*======================================================================= // File: JPGRAPH_PIE3D.PHP // Description: 3D Pie plot extension for JpGraph diff --git a/html/includes/jpgraph/src/jpgraph_plotband.php b/html/lib/jpgraph/jpgraph_plotband.php similarity index 96% rename from html/includes/jpgraph/src/jpgraph_plotband.php rename to html/lib/jpgraph/jpgraph_plotband.php index 1c78d33a4a..3e7ae3ffee 100644 --- a/html/includes/jpgraph/src/jpgraph_plotband.php +++ b/html/lib/jpgraph/jpgraph_plotband.php @@ -1,4 +1,28 @@ . + * + * @package LibreNMS + * @link http://librenms.org + * @copyright 2016 Tony Murray + * @author Tony Murray + */ + //======================================================================= // File: JPGRAPH_PLOTBAND.PHP // Description: PHP4 Graph Plotting library. Extension module. diff --git a/html/includes/jpgraph/src/jpgraph_plotline.php b/html/lib/jpgraph/jpgraph_plotline.php similarity index 83% rename from html/includes/jpgraph/src/jpgraph_plotline.php rename to html/lib/jpgraph/jpgraph_plotline.php index 7c19219e8f..13a203197c 100644 --- a/html/includes/jpgraph/src/jpgraph_plotline.php +++ b/html/lib/jpgraph/jpgraph_plotline.php @@ -1,4 +1,28 @@ . + * + * @package LibreNMS + * @link http://librenms.org + * @copyright 2016 Tony Murray + * @author Tony Murray + */ + /*======================================================================= // File: JPGRAPH_PLOTLINE.PHP // Description: PlotLine extension for JpGraph diff --git a/html/includes/jpgraph/src/jpgraph_plotmark.inc.php b/html/lib/jpgraph/jpgraph_plotmark.inc.php similarity index 95% rename from html/includes/jpgraph/src/jpgraph_plotmark.inc.php rename to html/lib/jpgraph/jpgraph_plotmark.inc.php index 78a08cff2e..c602b65cce 100644 --- a/html/includes/jpgraph/src/jpgraph_plotmark.inc.php +++ b/html/lib/jpgraph/jpgraph_plotmark.inc.php @@ -1,4 +1,28 @@ . + * + * @package LibreNMS + * @link http://librenms.org + * @copyright 2016 Tony Murray + * @author Tony Murray + */ + //======================================================================= // File: JPGRAPH_PLOTMARK.PHP // Description: Class file. Handles plotmarks diff --git a/html/includes/jpgraph/src/jpgraph_polar.php b/html/lib/jpgraph/jpgraph_polar.php similarity index 97% rename from html/includes/jpgraph/src/jpgraph_polar.php rename to html/lib/jpgraph/jpgraph_polar.php index af3c88bde9..6d70e6233d 100644 --- a/html/includes/jpgraph/src/jpgraph_polar.php +++ b/html/lib/jpgraph/jpgraph_polar.php @@ -1,4 +1,28 @@ . + * + * @package LibreNMS + * @link http://librenms.org + * @copyright 2016 Tony Murray + * @author Tony Murray + */ + /*======================================================================= // File: JPGRAPH_POLAR.PHP // Description: Polar plot extension for JpGraph diff --git a/html/includes/jpgraph/src/jpgraph_radar.php b/html/lib/jpgraph/jpgraph_radar.php similarity index 97% rename from html/includes/jpgraph/src/jpgraph_radar.php rename to html/lib/jpgraph/jpgraph_radar.php index c71ffafe5c..ac9b6338e1 100644 --- a/html/includes/jpgraph/src/jpgraph_radar.php +++ b/html/lib/jpgraph/jpgraph_radar.php @@ -1,4 +1,28 @@ . + * + * @package LibreNMS + * @link http://librenms.org + * @copyright 2016 Tony Murray + * @author Tony Murray + */ + /*======================================================================= // File: JPGRAPH_RADAR.PHP // Description: Radar plot extension for JpGraph diff --git a/html/includes/jpgraph/src/jpgraph_regstat.php b/html/lib/jpgraph/jpgraph_regstat.php similarity index 89% rename from html/includes/jpgraph/src/jpgraph_regstat.php rename to html/lib/jpgraph/jpgraph_regstat.php index c327c95985..933123947f 100644 --- a/html/includes/jpgraph/src/jpgraph_regstat.php +++ b/html/lib/jpgraph/jpgraph_regstat.php @@ -1,4 +1,28 @@ . + * + * @package LibreNMS + * @link http://librenms.org + * @copyright 2016 Tony Murray + * @author Tony Murray + */ + /*======================================================================= // File: JPGRAPH_REGSTAT.PHP // Description: Regression and statistical analysis helper classes diff --git a/html/includes/jpgraph/src/jpgraph_rgb.inc.php b/html/lib/jpgraph/jpgraph_rgb.inc.php similarity index 96% rename from html/includes/jpgraph/src/jpgraph_rgb.inc.php rename to html/lib/jpgraph/jpgraph_rgb.inc.php index 2cbc85bb31..974e0a300e 100644 --- a/html/includes/jpgraph/src/jpgraph_rgb.inc.php +++ b/html/lib/jpgraph/jpgraph_rgb.inc.php @@ -1,4 +1,28 @@ . + * + * @package LibreNMS + * @link http://librenms.org + * @copyright 2016 Tony Murray + * @author Tony Murray + */ + //======================================================================= // File: JPGRAPH_RGB.INC.PHP // Description: Class to handle RGb color space specification and diff --git a/html/includes/jpgraph/src/jpgraph_scatter.php b/html/lib/jpgraph/jpgraph_scatter.php similarity index 90% rename from html/includes/jpgraph/src/jpgraph_scatter.php rename to html/lib/jpgraph/jpgraph_scatter.php index 141fdfa202..8f7ea1ec92 100644 --- a/html/includes/jpgraph/src/jpgraph_scatter.php +++ b/html/lib/jpgraph/jpgraph_scatter.php @@ -1,4 +1,28 @@ . + * + * @package LibreNMS + * @link http://librenms.org + * @copyright 2016 Tony Murray + * @author Tony Murray + */ + /*======================================================================= // File: JPGRAPH_SCATTER.PHP // Description: Scatter (and impuls) plot extension for JpGraph diff --git a/html/includes/jpgraph/src/jpgraph_stock.php b/html/lib/jpgraph/jpgraph_stock.php similarity index 88% rename from html/includes/jpgraph/src/jpgraph_stock.php rename to html/lib/jpgraph/jpgraph_stock.php index 45a136805b..1c257b3c35 100644 --- a/html/includes/jpgraph/src/jpgraph_stock.php +++ b/html/lib/jpgraph/jpgraph_stock.php @@ -1,4 +1,28 @@ . + * + * @package LibreNMS + * @link http://librenms.org + * @copyright 2016 Tony Murray + * @author Tony Murray + */ + /*======================================================================= // File: JPGRAPH_STOCK.PHP // Description: Stock plot extension for JpGraph diff --git a/html/includes/jpgraph/src/jpgraph_text.inc.php b/html/lib/jpgraph/jpgraph_text.inc.php similarity index 92% rename from html/includes/jpgraph/src/jpgraph_text.inc.php rename to html/lib/jpgraph/jpgraph_text.inc.php index c93846b858..6de7427e4b 100644 --- a/html/includes/jpgraph/src/jpgraph_text.inc.php +++ b/html/lib/jpgraph/jpgraph_text.inc.php @@ -1,4 +1,28 @@ . + * + * @package LibreNMS + * @link http://librenms.org + * @copyright 2016 Tony Murray + * @author Tony Murray + */ + //======================================================================= // File: JPGRAPH_TEXT.INC.PHP // Description: Class to handle text as object in the graph. diff --git a/html/includes/jpgraph/src/jpgraph_ttf.inc.php b/html/lib/jpgraph/jpgraph_ttf.inc.php similarity index 96% rename from html/includes/jpgraph/src/jpgraph_ttf.inc.php rename to html/lib/jpgraph/jpgraph_ttf.inc.php index 1e0d52409c..49e0b5cb2f 100644 --- a/html/includes/jpgraph/src/jpgraph_ttf.inc.php +++ b/html/lib/jpgraph/jpgraph_ttf.inc.php @@ -1,4 +1,28 @@ . + * + * @package LibreNMS + * @link http://librenms.org + * @copyright 2016 Tony Murray + * @author Tony Murray + */ + //======================================================================= // File: jpgraph_ttf.inc.php // Description: Handling of TTF fonts diff --git a/html/includes/jpgraph/src/jpgraph_utils.inc.php b/html/lib/jpgraph/jpgraph_utils.inc.php similarity index 96% rename from html/includes/jpgraph/src/jpgraph_utils.inc.php rename to html/lib/jpgraph/jpgraph_utils.inc.php index bd9fc911de..ca179c7e70 100644 --- a/html/includes/jpgraph/src/jpgraph_utils.inc.php +++ b/html/lib/jpgraph/jpgraph_utils.inc.php @@ -1,4 +1,28 @@ . + * + * @package LibreNMS + * @link http://librenms.org + * @copyright 2016 Tony Murray + * @author Tony Murray + */ + /*======================================================================= // File: JPGRAPH_UTILS.INC // Description: Collection of non-essential "nice to have" utilities diff --git a/html/includes/jpgraph/src/lang/de.inc.php b/html/lib/jpgraph/lang/de.inc.php similarity index 100% rename from html/includes/jpgraph/src/lang/de.inc.php rename to html/lib/jpgraph/lang/de.inc.php diff --git a/html/includes/jpgraph/src/lang/en.inc.php b/html/lib/jpgraph/lang/en.inc.php similarity index 100% rename from html/includes/jpgraph/src/lang/en.inc.php rename to html/lib/jpgraph/lang/en.inc.php diff --git a/html/includes/jpgraph/src/lang/prod.inc.php b/html/lib/jpgraph/lang/prod.inc.php similarity index 100% rename from html/includes/jpgraph/src/lang/prod.inc.php rename to html/lib/jpgraph/lang/prod.inc.php diff --git a/html/pages/device/showconfig.inc.php b/html/pages/device/showconfig.inc.php index 7ae4bd5a21..a60022461c 100644 --- a/html/pages/device/showconfig.inc.php +++ b/html/pages/device/showconfig.inc.php @@ -1,6 +1,6 @@