Centralize class loader (#4169)

Move the classloader to as early as possible in defaults.inc.php
This should cover all application entrances.
Set install_dir based on the location of defaults.inc.php

html/data.php

@@ -16,13 +16,6 @@ require_once '../includes/defaults.inc.php';
 require_once '../config.php';
 require_once '../includes/definitions.inc.php';
 
-// initialize the class loader and add custom mappings
-require_once $config['install_dir'] . '/LibreNMS/ClassLoader.php';
-$classLoader = new LibreNMS\ClassLoader();
-$classLoader->registerClass('Console_Color2', $config['install_dir'] . '/includes/console_colour.php');
-$classLoader->registerClass('PasswordHash', $config['install_dir'] . '/html/lib/PasswordHash.php');
-$classLoader->register();
-
 require_once '../includes/common.php';
 require_once '../includes/dbFacile.php';
 require_once '../includes/rewrites.php';

html/graph-realtime.php

@@ -17,13 +17,6 @@ require_once '../includes/defaults.inc.php';
 require_once '../config.php';
 require_once '../includes/definitions.inc.php';
 
-// initialize the class loader and add custom mappings
-require_once $config['install_dir'] . '/LibreNMS/ClassLoader.php';
-$classLoader = new LibreNMS\ClassLoader();
-$classLoader->registerClass('Console_Color2', $config['install_dir'] . '/includes/console_colour.php');
-$classLoader->registerClass('PasswordHash', $config['install_dir'] . '/html/lib/PasswordHash.php');
-$classLoader->register();
-
 require_once '../includes/common.php';
 require_once '../includes/dbFacile.php';
 require_once '../includes/rewrites.php';

html/graph.php

@@ -34,13 +34,6 @@ require_once '../includes/defaults.inc.php';
 require_once '../config.php';
 require_once '../includes/definitions.inc.php';
 
-// initialize the class loader and add custom mappings
-require_once $config['install_dir'] . '/LibreNMS/ClassLoader.php';
-$classLoader = new LibreNMS\ClassLoader();
-$classLoader->registerClass('Console_Color2', $config['install_dir'] . '/includes/console_colour.php');
-$classLoader->registerClass('PasswordHash', $config['install_dir'] . '/html/lib/PasswordHash.php');
-$classLoader->register();
-
 require_once '../includes/common.php';
 require_once '../includes/dbFacile.php';
 require_once '../includes/rewrites.php';

includes/defaults.inc.php

@@ -24,7 +24,6 @@
 error_reporting(E_ERROR|E_PARSE|E_CORE_ERROR|E_COMPILE_ERROR);
 
 function set_debug($debug) {
-
     if (isset($debug)) {
         ini_set('display_errors', 1);
         ini_set('display_startup_errors', 0);
@@ -32,15 +31,26 @@ function set_debug($debug) {
         ini_set('allow_url_fopen', 0);
         ini_set('error_reporting', E_ALL);
     }
-
 }//end set_debug()
 
+// set install_dir
+$config['install_dir'] = realpath(__DIR__ . '/..');
+
+// initialize the class loader and add custom mappings
+require_once $config['install_dir'] . '/LibreNMS/ClassLoader.php';
+$classLoader = new LibreNMS\ClassLoader();
+$classLoader->registerClass('Console_Color2', $config['install_dir'] . '/includes/console_colour.php');
+$classLoader->registerClass('Console_Table', $config['install_dir'] . '/includes/console_table.php');
+$classLoader->registerClass('PHPMailer', $config['install_dir'] . "/includes/phpmailer/class.phpmailer.php");
+$classLoader->registerClass('SMTP', $config['install_dir'] . "/includes/phpmailer/class.smtp.php");
+$classLoader->registerClass('PasswordHash', $config['install_dir'] . '/html/lib/PasswordHash.php');
+$classLoader->register();
+
 // Default directories
 $config['project_name'] = 'LibreNMS';
 $config['project_id']   = strtolower($config['project_name']);
 
 $config['temp_dir']    = '/tmp';
-$config['install_dir'] = '/opt/'.$config['project_id'];
 $config['log_dir']     = $config['install_dir'].'/logs';
 
 // MySQL extension to use

includes/functions.php

@@ -20,16 +20,6 @@ use LibreNMS\Exceptions\InvalidPortAssocModeException;
 use LibreNMS\Exceptions\SnmpVersionUnsupportedException;
 
 
-// initialize the class loader and add custom mappings
-require_once $config['install_dir'] . '/LibreNMS/ClassLoader.php';
-$classLoader = new LibreNMS\ClassLoader();
-$classLoader->registerClass('Console_Color2', $config['install_dir'] . '/includes/console_colour.php');
-$classLoader->registerClass('Console_Table', $config['install_dir'] . '/includes/console_table.php');
-$classLoader->registerClass('PHPMailer', $config['install_dir'] . "/includes/phpmailer/class.phpmailer.php");
-$classLoader->registerClass('SMTP', $config['install_dir'] . "/includes/phpmailer/class.smtp.php");
-$classLoader->registerClass('PasswordHash', $config['install_dir'] . '/html/lib/PasswordHash.php');
-$classLoader->register();
-
 // Include from PEAR
 
 include_once("Net/IPv4.php");

tests/bootstrap.php

@@ -26,15 +26,10 @@
 // get the current LibreNMS install directory
 $install_dir = realpath(__DIR__ . '/..');
 
-require_once $install_dir . '/LibreNMS/ClassLoader.php';
-
-// initialize the class loader
-$loader = new LibreNMS\ClassLoader();
-$loader->registerDir($install_dir . '/tests', 'LibreNMS\Tests');
-$loader->register();
-
 require_once $install_dir . '/includes/defaults.inc.php';
 
+$classLoader->registerDir($install_dir . '/tests', 'LibreNMS\Tests');
+
 require_once $install_dir . '/includes/rrdtool.inc.php';
 require_once $install_dir . '/includes/syslog.php';