nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-08-03 08:01:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move mergecnf to own file.

Browse Source
This commit is contained in:
f0o
2015-06-09 14:06:03 +00:00
parent 56a53c98b3
commit 2759008de6
2 changed files with 48 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/definitions.inc.php
+1 -47
View File
@@ -2,6 +2,7 @@
// Observium Includes // Observium Includes
include_once($config['install_dir'] . "/includes/dbFacile.php"); include_once($config['install_dir'] . "/includes/dbFacile.php");
include_once($config['install_dir'] . "/includes/mergecnf.inc.php");
// Connect to database // Connect to database
$database_link = mysql_pconnect($config['db_host'], $config['db_user'], $config['db_pass']); $database_link = mysql_pconnect($config['db_host'], $config['db_user'], $config['db_pass']);
@@ -13,53 +14,6 @@ if (!$database_link)
} }
$database_db = mysql_select_db($config['db_name'], $database_link); $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; $clone = $config;
foreach( dbFetchRows('select config_name,config_value from config') as $obj ) { foreach( dbFetchRows('select config_name,config_value from config') as $obj ) {
$clone = array_replace_recursive($clone,mergecnf($obj)); $clone = array_replace_recursive($clone,mergecnf($obj));
includes/mergecnf.inc.php
+47
View File
@@ -0,0 +1,47 @@
<?php
/* Copyright (C) 2015 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
*/
function mergecnf($obj) {
$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;
}