ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rename process_configfile to remove namesspace colision

pull/2077/head
Isaac Connor 2018-04-05 11:44:21 -04:00
parent fb392b2765
commit 87f5204c46
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web/api/app/Config/bootstrap.php.in
View File

@ -121,7 +121,7 @@ Configure::write('ZM_VERSION', '@VERSION@');
Configure::write('ZM_API_VERSION', '@API_VERSION@');
# Process name, value pairs from the main config file first
$configvals = process_configfile(Configure::read('ZM_CONFIG'));
$configvals = api_process_configfile(Configure::read('ZM_CONFIG'));
# Search for user created config files. If one or more are found then
# update our config value array with those values
@ -129,7 +129,7 @@ $configSubFolder = Configure::read('ZM_CONFIG_SUBDIR');
if ( is_dir($configSubFolder) ) {
if ( is_readable($configSubFolder) ) {
foreach ( glob("$configSubFolder/*.conf") as $filename ) {
$configvals = array_replace($configvals, process_configfile($filename) );
$configvals = array_replace($configvals, api_process_configfile($filename) );
}
} else {
error_log( "WARNING: ZoneMinder configuration subfolder found but is not readable. Check folder permissions on $configSubFolder." );
@ -164,7 +164,7 @@ if ( ! defined('ZM_SERVER_ID') ) {
}
}
function process_configfile($configFile) {
function api_process_configfile($configFile) {
if ( is_readable( $configFile ) ) {
$configvals = array();