Skip to content

Commit 9a33464

Browse files
murrantlaf
authored andcommittedNov 21, 2016
refactor: Centralize includes and initialization (librenms#4991)
1 parent bbf05fe commit 9a33464

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+326
-578
lines changed
 

‎addhost.php

+2-6
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,8 @@
1313

1414
use LibreNMS\Exceptions\HostUnreachableException;
1515

16-
chdir(__DIR__); // cwd to the directory containing this script
17-
18-
require 'includes/defaults.inc.php';
19-
require 'config.php';
20-
require 'includes/definitions.inc.php';
21-
require 'includes/functions.php';
16+
$init_modules = array();
17+
require __DIR__ . '/includes/init.php';
2218

2319
$options = getopt('g:p:f::');
2420

‎adduser.php

+4-12
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,11 @@
1212
*
1313
*/
1414

15-
chdir(__DIR__); // cwd to the directory containing this script
16-
17-
require 'includes/defaults.inc.php';
18-
require 'config.php';
19-
require 'includes/definitions.inc.php';
20-
require 'includes/functions.php';
21-
22-
if (file_exists('html/includes/authentication/'.$config['auth_mechanism'].'.inc.php')) {
23-
include 'html/includes/authentication/'.$config['auth_mechanism'].'.inc.php';
24-
} else {
25-
echo "ERROR: no valid auth_mechanism defined.\n";
26-
exit();
15+
$init_modules = array();
16+
if (php_sapi_name() != 'cli') {
17+
$init_modules[] = 'auth';
2718
}
19+
require __DIR__ . '/includes/init.php';
2820

2921
if (auth_usermanagement()) {
3022
if (isset($argv[1]) && isset($argv[2]) && isset($argv[3])) {

0 commit comments

Comments
 (0)
Please sign in to comment.