mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: Stop irc bot crashing on .reload #4353

Browse Source 
* Removed duplicate include

* Move set_debug into functions.php, and restore the (re)loading of includes/defaults

* Move debug call until after function has been included
This commit is contained in:
David Bell
2016-09-07 18:42:49 +01:00
committed by Neil Lathwood
parent 50a02a0fc5
commit f00c383d60
8 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
html/ajax_dash.php
View File

@@ -13,13 +13,14 @@
*/
require_once '../includes/defaults.inc.php';
set_debug($_REQUEST['debug']);
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';
set_debug($_REQUEST['debug']);
if (!$_SESSION['authenticated']) {
echo 'unauthenticated';
exit;

3
html/ajax_form.php
View File

@@ -15,7 +15,6 @@
// FUA
require_once '../includes/defaults.inc.php';
set_debug($_REQUEST['debug']);
require_once '../config.php';
require_once '../includes/definitions.inc.php';
require_once 'includes/functions.inc.php';
@@ -23,6 +22,8 @@ require_once '../includes/functions.php';
require_once 'includes/authenticate.inc.php';
require_once 'includes/vars.inc.php';
set_debug($_REQUEST['debug']);
if (!$_SESSION['authenticated']) {
echo 'unauthenticated';
exit;

3
html/ajax_listports.php
View File

@@ -12,7 +12,6 @@
*/
require_once '../includes/defaults.inc.php';
set_debug($_REQUEST['debug']);
require_once '../config.php';
require_once '../includes/definitions.inc.php';
require_once 'includes/functions.inc.php';
@@ -22,6 +21,8 @@ require_once '../includes/common.php';
require_once '../includes/rewrites.php';
require_once 'includes/authenticate.inc.php';
set_debug($_REQUEST['debug']);
if (!$_SESSION['authenticated']) {
echo 'unauthenticated';
exit;

2
html/ajax_rulesuggest.php
View File

@@ -29,11 +29,11 @@ if (!isset($_SESSION['authenticated'])) {
}
require_once '../includes/defaults.inc.php';
set_debug($_REQUEST['debug']);
require_once '../config.php';
require_once '../includes/definitions.inc.php';
require_once '../includes/functions.php';
set_debug($_REQUEST['debug']);
/**
* Levenshtein Sort

3
html/ajax_search.php
View File

@@ -1,13 +1,14 @@
<?php
require_once '../includes/defaults.inc.php';
set_debug($_REQUEST['debug']);
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';
set_debug($_REQUEST['debug']);
if (!$_SESSION['authenticated']) {
echo 'unauthenticated';
exit;

3
html/ajax_table.php
View File

@@ -13,13 +13,14 @@
*/
require_once '../includes/defaults.inc.php';
set_debug($_REQUEST['debug']);
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';
set_debug($_REQUEST['debug']);
$current = $_POST['current'];
settype($current, 'integer');
$rowCount = $_POST['rowCount'];

11
includes/defaults.inc.php
View File

@@ -23,17 +23,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);
ini_set('log_errors', 0);
ini_set('allow_url_fopen', 0);
ini_set('error_reporting', E_ALL);
}
}//end set_debug()
// set install_dir
$config['install_dir'] = realpath(__DIR__ . '/..');

11
includes/functions.php
View File

@@ -37,6 +37,17 @@ include_once($config['install_dir'] . "/includes/services.inc.php");
$console_color = new Console_Color2();
function set_debug($debug)
{
if (isset($debug)) {
ini_set('display_errors', 1);
ini_set('display_startup_errors', 0);
ini_set('log_errors', 0);
ini_set('allow_url_fopen', 0);
ini_set('error_reporting', E_ALL);
}
}//end set_debug()
function array_sort($array, $on, $order = SORT_ASC)
{
$new_array = array();