refactor: Centralize includes and initialization (librenms#4991)

iuriss · Nov 21, 2016 · 9a33464 · 9a33464
1 parent bbf05fe
commit 9a33464
Show file tree

Hide file tree

Showing 61 changed files with 326 additions and 578 deletions.
diff --git a/addhost.php b/addhost.php
@@ -13,12 +13,8 @@
 
 use LibreNMS\Exceptions\HostUnreachableException;
 
-chdir(__DIR__); // cwd to the directory containing this script
-
-require 'includes/defaults.inc.php';
-require 'config.php';
-require 'includes/definitions.inc.php';
-require 'includes/functions.php';
+$init_modules = array();
+require __DIR__ . '/includes/init.php';
 
 $options = getopt('g:p:f::');
 

diff --git a/adduser.php b/adduser.php
@@ -12,19 +12,11 @@
  *
  */
 
-chdir(__DIR__); // cwd to the directory containing this script
-
-require 'includes/defaults.inc.php';
-require 'config.php';
-require 'includes/definitions.inc.php';
-require 'includes/functions.php';
-
-if (file_exists('html/includes/authentication/'.$config['auth_mechanism'].'.inc.php')) {
-    include 'html/includes/authentication/'.$config['auth_mechanism'].'.inc.php';
-} else {
-    echo "ERROR: no valid auth_mechanism defined.\n";
-    exit();
+$init_modules = array();
+if (php_sapi_name() != 'cli') {
+    $init_modules[] = 'auth';
 }
+require __DIR__ . '/includes/init.php';
 
 if (auth_usermanagement()) {
     if (isset($argv[1]) && isset($argv[2]) && isset($argv[3])) {

diff --git a/alerts.php b/alerts.php
@@ -25,10 +25,8 @@
  * @subpackage Alerts
  */
 
-chdir(__DIR__); // cwd to the directory containing this script
-
-require_once 'includes/defaults.inc.php';
-require_once 'config.php';
+$init_modules = array('alerts');
+require __DIR__ . '/includes/init.php';
 
 $options = getopt('d::');
 
@@ -47,9 +45,6 @@
     file_put_contents($config['install_dir'].'/.alerts.lock', getmypid());
 }
 
-require_once $config['install_dir'].'/includes/definitions.inc.php';
-require_once $config['install_dir'].'/includes/functions.php';
-require_once $config['install_dir'].'/includes/alerts.inc.php';
 
 if (isset($options['d'])) {
     echo "DEBUG!\n";

diff --git a/billing-calculate.php b/billing-calculate.php
@@ -11,12 +11,8 @@
  * @copyright  (C) 2006 - 2012 Adam Armstrong
  */
 
-chdir(__DIR__); // cwd to the directory containing this script
-
-require 'includes/defaults.inc.php';
-require 'config.php';
-require 'includes/definitions.inc.php';
-require 'includes/functions.php';
+$init_modules = array();
+require __DIR__ . '/includes/init.php';
 
 $options = getopt('r');
 

diff --git a/check-services.php b/check-services.php
@@ -13,12 +13,8 @@
  * the source code distribution for details.
  */
 
-chdir(__DIR__); // cwd to the directory containing this script
-
-require 'includes/defaults.inc.php';
-require 'config.php';
-require 'includes/definitions.inc.php';
-require 'includes/functions.php';
+$init_modules = array();
+require __DIR__ . '/includes/init.php';
 
 $options = getopt('d::');
 if (isset($options['d'])) {

diff --git a/config_to_json.php b/config_to_json.php
@@ -11,6 +11,7 @@
 
 // check if we are running through the CLI, otherwise abort
 if (php_sapi_name() == 'cli' && empty($_SERVER['REMOTE_ADDR'])) {
+    $config['install_dir'] = __DIR__;
     include_once 'includes/defaults.inc.php';
     include_once 'config.php';
     echo json_encode($config);

diff --git a/contrib/generate-iplist.php b/contrib/generate-iplist.php
@@ -11,10 +11,8 @@
  * @copyright  (C) 2006 - 2012 Adam Armstrong
  */
 
-require 'includes/defaults.inc.php';
-require 'config.php';
-require 'includes/definitions.inc.php';
-require 'includes/functions.php';
+$init_modules = array();
+require realpath(__DIR__ . '/..') . '/includes/init.php';
 
 $handle = fopen('ips.txt', 'w');
 
@@ -39,4 +37,4 @@
 
 fclose($handle);
 
-shell_exec('fping -t 100 -f ips.txt > ips-scanned.txt');
+shell_exec($config['fping'] . ' -t 100 -f ips.txt > ips-scanned.txt');
diff --git a/daily.php b/daily.php
@@ -6,13 +6,8 @@
  * (c) 2013 LibreNMS Contributors
  */
 
-chdir(__DIR__); // cwd to the directory containing this script
-
-require 'includes/defaults.inc.php';
-require 'config.php';
-require_once 'includes/definitions.inc.php';
-require 'includes/functions.php';
-require_once 'includes/alerts.inc.php';
+$init_modules = array('alerts');
+require __DIR__ . '/includes/init.php';
 
 $options = getopt('f:d');
 

diff --git a/delhost.php b/delhost.php
@@ -11,12 +11,8 @@
  * @copyright  (C) 2006 - 2012 Adam Armstrong
  */
 
-chdir(__DIR__); // cwd to the directory containing this script
-
-require 'includes/defaults.inc.php';
-require 'config.php';
-require 'includes/definitions.inc.php';
-require 'includes/functions.php';
+$init_modules = array();
+require __DIR__ . '/includes/init.php';
 
 // Remove a host and all related data from the system
 if ($argv[1]) {

diff --git a/discovery.php b/discovery.php
@@ -11,13 +11,8 @@
  * @copyright  (C) 2006 - 2012 Adam Armstrong
  */
 
-chdir(__DIR__); // cwd to the directory containing this script
-
-require 'includes/defaults.inc.php';
-require 'config.php';
-require 'includes/definitions.inc.php';
-require 'includes/functions.php';
-require 'includes/discovery/functions.inc.php';
+$init_modules = array('discovery');
+require __DIR__ . '/includes/init.php';
 
 $start         = microtime(true);
 $runtime_stats = array();

diff --git a/dist-pollers.php b/dist-pollers.php
@@ -13,14 +13,8 @@
  * the source code distribution for details.
  */
 
-chdir(__DIR__); // cwd to the directory containing this script
-
-require 'includes/defaults.inc.php';
-require 'config.php';
-require 'includes/definitions.inc.php';
-require 'includes/functions.php';
-require 'includes/polling/functions.inc.php';
-require 'includes/alerts.inc.php';
+$init_modules = array('polling', 'alerts');
+require __DIR__ . '/includes/init.php';
 
 $options = getopt('l:u:r::');
 

diff --git a/html/ajax_dash.php b/html/ajax_dash.php
@@ -12,12 +12,8 @@
  * the source code distribution for details.
  */
 
-require_once '../includes/defaults.inc.php';
-require_once '../config.php';
-require_once '../includes/definitions.inc.php';
-require_once 'includes/functions.inc.php';
-require_once '../includes/functions.php';
-require_once 'includes/authenticate.inc.php';
+$init_modules = array('web', 'auth');
+require realpath(__DIR__ . '/..') . '/includes/init.php';
 
 set_debug($_REQUEST['debug']);
 

diff --git a/html/ajax_form.php b/html/ajax_form.php
@@ -14,14 +14,8 @@
 
 // FUA
 
-require_once '../includes/defaults.inc.php';
-require_once '../config.php';
-require_once '../includes/definitions.inc.php';
-require_once 'includes/functions.inc.php';
-require_once '../includes/functions.php';
-require_once 'includes/authenticate.inc.php';
-require_once 'includes/vars.inc.php';
-require_once '../includes/alerts.inc.php';
+$init_modules = array('web', 'auth');
+require realpath(__DIR__ . '/..') . '/includes/init.php';
 
 set_debug($_REQUEST['debug']);
 

diff --git a/html/ajax_listports.php b/html/ajax_listports.php
@@ -10,16 +10,8 @@
  * @copyright  (C) 2006 - 2012 Adam Armstrong
  */
 
-require_once '../includes/defaults.inc.php';
-require_once '../config.php';
-require_once '../includes/definitions.inc.php';
-require_once '../includes/functions.php';
-require_once 'includes/functions.inc.php';
-require_once '../includes/dbFacile.php';
-require_once '../includes/common.php';
-
-require_once '../includes/rewrites.php';
-require_once 'includes/authenticate.inc.php';
+$init_modules = array('web', 'auth');
+require realpath(__DIR__ . '/..') . '/includes/init.php';
 
 set_debug($_REQUEST['debug']);
 

diff --git a/html/ajax_output.php b/html/ajax_output.php
@@ -12,19 +12,17 @@
  * the source code distribution for details.
  */
 
-require_once '../includes/defaults.inc.php';
-require_once '../config.php';
-require_once '../includes/definitions.inc.php';
-require_once 'includes/functions.inc.php';
-require_once '../includes/functions.php';
-require_once 'includes/authenticate.inc.php';
-require_once '../includes/alerts.inc.php';
+$init_modules = array('web', 'auth', 'alerts');
+require realpath(__DIR__ . '/..') . '/includes/init.php';
+
+if (!$_SESSION['authenticated']) {
+    echo "Unauthenticated\n";
+    exit;
+}
 
 set_debug($_REQUEST['debug']);
 $id = mres($_REQUEST['id']);
 
 if (isset($id)) {
-    if (file_exists("includes/output/$id.inc.php")) {
-        include_once "includes/output/$id.inc.php";
-    }
+    require $config['install_dir'] . "/html/includes/output/$id.inc.php";
 }
diff --git a/html/ajax_rulesuggest.php b/html/ajax_rulesuggest.php
@@ -28,12 +28,8 @@
     die('Unauthorized.');
 }
 
-require_once '../includes/defaults.inc.php';
-require_once '../config.php';
-require_once '../includes/definitions.inc.php';
-require_once '../includes/functions.php';
-require_once 'includes/functions.inc.php';
-require_once 'includes/vars.inc.php';
+$init_modules = array('web');
+require realpath(__DIR__ . '/..') . '/includes/init.php';
 
 set_debug($_REQUEST['debug']);
 

diff --git a/html/ajax_search.php b/html/ajax_search.php
@@ -1,11 +1,7 @@
 <?php
 
-require_once '../includes/defaults.inc.php';
-require_once '../config.php';
-require_once '../includes/definitions.inc.php';
-require_once 'includes/functions.inc.php';
-require_once '../includes/functions.php';
-require_once 'includes/authenticate.inc.php';
+$modules = array('web');
+require realpath(__DIR__ . '/..') . '/includes/init.php';
 
 set_debug($_REQUEST['debug']);
 

diff --git a/html/ajax_table.php b/html/ajax_table.php
@@ -12,12 +12,13 @@
  * the source code distribution for details.
  */
 
-require_once '../includes/defaults.inc.php';
-require_once '../config.php';
-require_once '../includes/definitions.inc.php';
-require_once 'includes/functions.inc.php';
-require_once '../includes/functions.php';
-require_once 'includes/authenticate.inc.php';
+$init_modules = array('web', 'auth');
+require realpath(__DIR__ . '/..') . '/includes/init.php';
+
+if (!$_SESSION['authenticated']) {
+    echo "Unauthenticated\n";
+    exit;
+}
 
 set_debug($_REQUEST['debug']);
 

diff --git a/html/api_v0.php b/html/api_v0.php
@@ -12,18 +12,13 @@
  * the source code distribution for details.
  */
 
-require_once '../includes/defaults.inc.php';
-require_once '../config.php';
-require_once '../includes/definitions.inc.php';
-require_once '../includes/common.php';
-require_once '../includes/dbFacile.php';
-require_once '../includes/rewrites.php';
-require_once 'includes/functions.inc.php';
-require_once '../includes/rrdtool.inc.php';
-require 'lib/Slim/Slim.php';
+$init_modules = array('web', 'alerts');
+require realpath(__DIR__ . '/..') . '/includes/init.php';
+
+require $config['install_dir'] . '/html/lib/Slim/Slim.php';
 \Slim\Slim::registerAutoloader();
 $app = new \Slim\Slim();
-require_once 'includes/api_functions.inc.php';
+require $config['install_dir'] . '/html/includes/api_functions.inc.php';
 $app->setName('api');
 
 $app->group(

diff --git a/html/bandwidth-graph.php b/html/bandwidth-graph.php
@@ -27,12 +27,8 @@
     ini_set('error_reporting', 0);
 }
 
-require '../includes/defaults.inc.php';
-require '../config.php';
-require '../includes/definitions.inc.php';
-require '../includes/functions.php';
-require 'includes/functions.inc.php';
-require 'includes/authenticate.inc.php';
+$init_modules = array('web', 'auth');
+require realpath(__DIR__ . '/..') . '/includes/init.php';
 
 if (get_client_ip() != $_SERVER['SERVER_ADDR']) {
     if (!$_SESSION['authenticated']) {
@@ -41,11 +37,11 @@
     }
 }
 
-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';
+require_once $config['install_dir'] . '/html/lib/jpgraph/jpgraph.php';
+require_once $config['install_dir'] . '/html/lib/jpgraph/jpgraph_line.php';
+require_once $config['install_dir'] . '/html/lib/jpgraph/jpgraph_bar.php';
+require_once $config['install_dir'] . '/html/lib/jpgraph/jpgraph_utils.inc.php';
+require_once $config['install_dir'] . '/html/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
@@ -27,12 +27,8 @@
     ini_set('error_reporting', 0);
 }
 
-require '../includes/defaults.inc.php';
-require '../config.php';
-require '../includes/definitions.inc.php';
-require '../includes/functions.php';
-require 'includes/functions.inc.php';
-require 'includes/authenticate.inc.php';
+$init_modules = array('web', 'auth');
+require realpath(__DIR__ . '/..') . '/includes/init.php';
 
 if (get_client_ip() != $_SERVER['SERVER_ADDR']) {
     if (!$_SESSION['authenticated']) {
@@ -41,10 +37,10 @@
     }
 }
 
-require 'lib/jpgraph/jpgraph.php';
-require 'lib/jpgraph/jpgraph_line.php';
-require 'lib/jpgraph/jpgraph_utils.inc.php';
-require 'lib/jpgraph/jpgraph_date.php';
+require $config['install_dir'] . '/html/lib/jpgraph/jpgraph.php';
+require $config['install_dir'] . '/html/lib/jpgraph/jpgraph_line.php';
+require $config['install_dir'] . '/html/lib/jpgraph/jpgraph_utils.inc.php';
+require $config['install_dir'] . '/html/lib/jpgraph/jpgraph_date.php';
 
 if (is_numeric($_GET['bill_id'])) {
     if (get_client_ip() != $_SERVER['SERVER_ADDR']) {