Move libraries in /includes to /lib (#4217)

This commit is contained in:
Tony Murray
2016-08-26 08:04:21 -05:00
committed by Neil Lathwood
parent 8973a78664
commit 15b0cd68ea
7 changed files with 4 additions and 5 deletions

View File

@ -21,7 +21,6 @@ require 'includes/definitions.inc.php';
require 'includes/functions.php';
require 'includes/polling/functions.inc.php';
require 'includes/alerts.inc.php';
require 'includes/console_table.php';
$options = getopt('l:u:r::');

View File

@ -39,10 +39,10 @@ $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('Console_Color2', $config['install_dir'] . '/lib/console_colour.php');
$classLoader->registerClass('Console_Table', $config['install_dir'] . '/lib/console_table.php');
$classLoader->registerClass('PHPMailer', $config['install_dir'] . "/lib/phpmailer/class.phpmailer.php");
$classLoader->registerClass('SMTP', $config['install_dir'] . "/lib/phpmailer/class.smtp.php");
$classLoader->registerClass('PasswordHash', $config['install_dir'] . '/html/lib/PasswordHash.php');
$classLoader->register();