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

refactor: Centralize includes and initialization (#4991)

Browse Source
This commit is contained in:
Tony Murray
2016-11-21 14:12:59 -06:00
committed by Neil Lathwood
parent bbf05feb90
commit 9a33464c52
61 changed files with 326 additions and 578 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
html/includes/api_functions.inc.php
View File

@@ -12,12 +12,6 @@
* the source code distribution for details.
*/
require_once '../includes/functions.php';
require_once '../includes/device-groups.inc.php';
if (file_exists('../html/includes/authentication/'.$config['auth_mechanism'].'.inc.php')) {
include '../html/includes/authentication/'.$config['auth_mechanism'].'.inc.php';
}
function authToken(\Slim\Route $route)
{
$app = \Slim\Slim::getInstance();

7
html/includes/authenticate.inc.php
View File

@@ -48,13 +48,6 @@ if (!isset($config['auth_mechanism'])) {
$config['auth_mechanism'] = 'mysql';
}
if (file_exists('includes/authentication/'.$config['auth_mechanism'].'.inc.php')) {
include_once 'includes/authentication/'.$config['auth_mechanism'].'.inc.php';
} else {
print_error('ERROR: no valid auth_mechanism defined!');
exit();
}
$auth_success = 0;
if ((isset($_SESSION['username'])) || (isset($_COOKIE['sess_id'],$_COOKIE['token']))) {

13
html/includes/functions.inc.php
View File

@@ -1055,19 +1055,6 @@ function clean_bootgrid($string)
}//end clean_bootgrid()
// Insert new config items
function add_config_item($new_conf_name, $new_conf_value, $new_conf_type, $new_conf_desc)
{
if (dbInsert(array('config_name' => $new_conf_name, 'config_value' => $new_conf_value, 'config_default' => $new_conf_value, 'config_type' => $new_conf_type, 'config_desc' => $new_conf_desc, 'config_group' => '500_Custom Settings', 'config_sub_group' => '01_Custom settings', 'config_hidden' => '0', 'config_disabled' => '0'), 'config')) {
$db_inserted = 1;
} else {
$db_inserted = 0;
}
return ($db_inserted);
}//end add_config_item()
function get_config_by_group($group)
{
$group = array($group);

1
html/includes/graphs/bill/auth.inc.php
View File

@@ -1,7 +1,6 @@
<?php
// Authorises bill viewing and sets $ports as reference to mysql query containing ports for this bill
require '../includes/billing.php';
if (is_numeric($_GET['id']) && ($auth || bill_permitted($_GET['id']))) {
$bill = dbFetchRow('SELECT * FROM `bills` WHERE bill_id = ?', array($_GET['id']));

1
html/includes/print-menubar.php
View File

@@ -57,6 +57,7 @@ if ($config['title_image']) {
<li><a href="<?php echo(generate_url(array('page'=>'availability-map'))); ?>"><i class="fa fa-arrow-circle-up fa-fw fa-lg" aria-hidden="true"></i> Availability</a></li>
<li><a href="<?php echo(generate_url(array('page'=>'map'))); ?>"><i class="fa fa-desktop fa-fw fa-lg" aria-hidden="true"></i> Network</a></li>
<?php
echo 'BROKE HERE';
require_once '../includes/device-groups.inc.php';
$devices_groups = GetDeviceGroups();
if (count($devices_groups) > 0) {