Move third party software to html/lib form html/includes

.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/* ]

adduser.php

@@ -19,7 +19,7 @@
 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';

html/api_v0.php

@@ -20,7 +20,7 @@
 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';

html/bandwidth-graph.php

@@ -43,11 +43,11 @@
     }
 }
 
-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']) {

html/billing-graph.php

@@ -43,10 +43,10 @@
     }
 }
 
-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']) {

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();
 

html/includes/jpgraph/src/gd_image.inc.php → html/lib/jpgraph/gd_image.inc.php

@@ -1,4 +1,28 @@
 <?php
+/**
+ * gd_image.inc.php
+ *
+ * -Description-
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @package    LibreNMS
+ * @link       http://librenms.org
+ * @copyright  2016 Tony Murray
+ * @author     Tony Murray <[email protected]>
+ */
+
 //=======================================================================
 // File:        GD_IMAGE.INC.PHP
 // Description: PHP Graph Plotting library. Low level image drawing routines

html/includes/jpgraph/src/imgdata_balls.inc.php → html/lib/jpgraph/imgdata_balls.inc.php

@@ -1,4 +1,28 @@
 <?php
+/**
+ * imgdata_balls.inc.php
+ *
+ * -Description-
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @package    LibreNMS
+ * @link       http://librenms.org
+ * @copyright  2016 Tony Murray
+ * @author     Tony Murray <[email protected]>
+ */
+
 //=======================================================================
 // File:        IMGDATA_ROUNDBALLS.INC
 // Description: Base64 encoded images for small round markers

html/includes/jpgraph/src/imgdata_bevels.inc.php → html/lib/jpgraph/imgdata_bevels.inc.php

@@ -1,4 +1,28 @@
 <?php
+/**
+ * imgdata_bevels.inc.php
+ *
+ * -Description-
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @package    LibreNMS
+ * @link       http://librenms.org
+ * @copyright  2016 Tony Murray
+ * @author     Tony Murray <[email protected]>
+ */
+
 //=======================================================================
 // File:        IMGDATA_BEVELS.INC
 // Description: Base64 encoded images for round bevels

html/includes/jpgraph/src/imgdata_diamonds.inc.php → html/lib/jpgraph/imgdata_diamonds.inc.php

@@ -1,4 +1,28 @@
 <?php
+/**
+ * imgdata_diamonds.inc.php
+ *
+ * -Description-
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @package    LibreNMS
+ * @link       http://librenms.org
+ * @copyright  2016 Tony Murray
+ * @author     Tony Murray <[email protected]>
+ */
+
 //=======================================================================
 // File:        IMGDATA_DIAMONDS.INC
 // Description: Base64 encoded images for diamonds

html/includes/jpgraph/src/imgdata_pushpins.inc.php → html/lib/jpgraph/imgdata_pushpins.inc.php

@@ -1,4 +1,28 @@
 <?php
+/**
+ * imgdata_pushpins.inc.php
+ *
+ * -Description-
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @package    LibreNMS
+ * @link       http://librenms.org
+ * @copyright  2016 Tony Murray
+ * @author     Tony Murray <[email protected]>
+ */
+
 //=======================================================================
 // File: IMGDATA_PUSHPINS.INC
 // Description: Base64 encoded images for pushpins

html/includes/jpgraph/src/imgdata_squares.inc.php → html/lib/jpgraph/imgdata_squares.inc.php

@@ -1,4 +1,28 @@
 <?php
+/**
+ * imgdata_squares.inc.php
+ *
+ * -Description-
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @package    LibreNMS
+ * @link       http://librenms.org
+ * @copyright  2016 Tony Murray
+ * @author     Tony Murray <[email protected]>
+ */
+
 //=======================================================================
 // File:        IMGDATA_SQUARES.INC
 // Description: Base64 encoded images for squares

html/includes/jpgraph/src/imgdata_stars.inc.php → html/lib/jpgraph/imgdata_stars.inc.php

@@ -1,4 +1,28 @@
 <?php
+/**
+ * imgdata_stars.inc.php
+ *
+ * -Description-
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @package    LibreNMS
+ * @link       http://librenms.org
+ * @copyright  2016 Tony Murray
+ * @author     Tony Murray <[email protected]>
+ */
+
 //=======================================================================
 // File:        IMGDATA_STARS.INC
 // Description: Base64 encoded images for stars

html/includes/jpgraph/src/jpg-config.inc.php → html/lib/jpgraph/jpg-config.inc.php

@@ -1,4 +1,28 @@
 <?php
+/**
+ * jpg-config.inc.php
+ *
+ * -Description-
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @package    LibreNMS
+ * @link       http://librenms.org
+ * @copyright  2016 Tony Murray
+ * @author     Tony Murray <[email protected]>
+ */
+
 //=======================================================================
 // File:        JPG-CONFIG.INC
 // Description: Configuration file for JpGraph library

html/includes/jpgraph/src/jpgraph.php → html/lib/jpgraph/jpgraph.php

@@ -1,4 +1,28 @@
 <?php
+/**
+ * jpgraph.php
+ *
+ * -Description-
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @package    LibreNMS
+ * @link       http://librenms.org
+ * @copyright  2016 Tony Murray
+ * @author     Tony Murray <[email protected]>
+ */
+
 //=======================================================================
 // File:        JPGRAPH.PHP
 // Description: PHP Graph Plotting library. Base module.