nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-12 16:06:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'issue-laf-110-new' of git://github.com/laf/librenms into laf-issue-laf-110-new

Browse Source 
Conflicts:
	html/pages/health/mempool.inc.php
	includes/defaults.inc.php
This commit is contained in:
f0o
2015-06-07 10:44:39 +00:00
parent d121fed936 451d0322c1
commit 2467b11290
26 changed files with 1469 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/definitions.inc.php
+67 -11
View File
@@ -1,5 +1,71 @@
<?php
// Observium Includes
include_once($config['install_dir'] . "/includes/dbFacile.php");
// Connect to database
$database_link = mysql_pconnect($config['db_host'], $config['db_user'], $config['db_pass']);
if (!$database_link)
{
echo("<h2>MySQL Error</h2>");
echo(mysql_error());
die;
}
$database_db = mysql_select_db($config['db_name'], $database_link);
function mergecnf($obj) {
/* Copyright (C) 2014 Daniel Preussker <f0o@devilcode.org>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. */
/**
* Merge config function
* @author f0o <f0o@devilcode.org>
* @copyright 2015 f0o, LibreNMS
* @license GPL
* @package LibreNMS
* @subpackage Config
*/
$pointer = array();
$val = $obj['config_value'];
$obj = $obj['config_name'];
$obj = explode('.',$obj,2);
if( !isset($obj[1]) ) {
if( filter_var($val,FILTER_VALIDATE_INT) ) {
$val = (int) $val;
} elseif( filter_var($val,FILTER_VALIDATE_FLOAT) ) {
$val = (float) $val;
} elseif( filter_var($val,FILTER_VALIDATE_BOOLEAN,FILTER_NULL_ON_FAILURE) !== NULL ) {
$val = filter_var($val,FILTER_VALIDATE_BOOLEAN);
}
if( !empty($obj[0]) ) {
return array($obj[0] => $val);
} else {
return array($val);
}
} else {
$pointer[$obj[0]] = mergecnf(array('config_name'=>$obj[1],'config_value'=>$val));
}
return $pointer;
}
$clone = $config;
foreach( dbFetchRows('select config_name,config_value from config') as $obj ) {
$clone = array_replace_recursive($clone,mergecnf($obj));
}
$config = array_replace_recursive($clone,$config);
/////////////////////////////////////////////////////////
# NO CHANGES TO THIS FILE, IT IS NOT USER-EDITABLE #
/////////////////////////////////////////////////////////
@@ -1742,17 +1808,7 @@ if (isset($_SERVER['HTTPS']))
$config['base_url'] = preg_replace('/^http:/','https:', $config['base_url']);
}
// Connect to database
$database_link = mysql_pconnect($config['db_host'], $config['db_user'], $config['db_pass']);
if (!$database_link)
{
echo("<h2>MySQL Error</h2>");
echo(mysql_error());
die;
}
$database_db = mysql_select_db($config['db_name'], $database_link);
if ($config['memcached']['enable'])
if ($config['memcached']['enable'] === TRUE)
{
if (class_exists("Memcached"))
{