mirror/zoneminder
1
0 Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-10-12 23:03:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove zm_configvals. Just use zm_config. Move code into loadConfig.

Browse Source
This commit is contained in:
Isaac Connor committed 2026-01-05 09:32:25 -05:00
1 parent 9984b6ee7d
commit b2861d5cf0
2 files changed
+70 -62
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

web/api/app/Controller/ConfigsController.php
+6 -3
View File
@@ -77,14 +77,17 @@ class ConfigsController extends AppController {
public function viewByName($name = null) {
$config = $this->Config->findByName($name, array('fields' => 'Value'));
if ( !$config ) {
global $zm_config;
if (!$config) {
global $zm_config;
if ( $zm_config[$name] ) {
if ( isset($zm_config[$name]) ) {
$config = array('Config'=>$zm_config[$name]);
} else {
ZM\Error(print_r($zm_config, true));
throw new NotFoundException(__('Invalid config'));
}
} else {
} else if ( isset($zm_config[$name]) ) {
$config['Config']['Value'] = $zm_config[$name]['Value'];
}
$this->set(array(
web/includes/config.php.in
+64 -59
View File
@@ -27,50 +27,6 @@ define( 'ZM_CONFIG_SUBDIR', '@ZM_CONFIG_SUBDIR@' ); // Path to config subfolder
define( 'ZM_VERSION', '@VERSION@' ); // Version
define( 'ZM_DIR_TEMP', '@ZM_TMPDIR@' );
define( 'ZM_DIR_CACHE', '@ZM_CACHEDIR@' );
global $zm_configvals;
global $zm_config;
$configFile = ZM_CONFIG;
$localConfigFile = basename($configFile);
if ( file_exists($localConfigFile) && filesize($localConfigFile) > 0 ) {
if ( php_sapi_name() == 'cli' && empty($_SERVER['REMOTE_ADDR']) )
print("Warning, overriding installed $localConfigFile file with local copy\n");
else
error_log("Warning, overriding installed $localConfigFile file with local copy");
$configFile = $localConfigFile;
}
# Process name, value pairs from the main config file first
$zm_configvals = process_configfile($configFile);
if (!$zm_configvals) $zm_configvals = [];
# Search for user created config files. If one or more are found then
# update our config value array with those values
$configSubFolder = ZM_CONFIG_SUBDIR;
if ( is_dir($configSubFolder) ) {
if ( is_readable($configSubFolder) ) {
foreach ( glob($configSubFolder.'/*.conf') as $filename ) {
//error_log("processing $filename");
$newconfigvals = process_configfile($filename);
if ($newconfigvals) $zm_configvals = array_replace($zm_configvals, $newconfigvals);
}
} else {
error_log('WARNING: ZoneMinder configuration subfolder found but is not readable. Check folder permissions on '.$configSubFolder);
}
} else {
error_log('WARNING: ZoneMinder configuration subfolder found but is not a directory. Check '.$configSubFolder);
}
# Now that our array our finalized, define each key => value
# pair in the array as a constant
foreach ( $zm_configvals as $key => $value ) {
define($key, $value);
}
//
// This section is options normally derived from other options or configuration
//
define('ZMU_PATH', ZM_PATH_BIN.'/zmu'); // Local path to the ZoneMinder Utility
//
// If setup supports Video 4 Linux v2
@@ -161,10 +117,13 @@ $dateFormatter = new IntlDateFormatter(null, IntlDateFormatter::SHORT, IntlDateF
$dateTimeFormatter = new IntlDateFormatter(null, IntlDateFormatter::SHORT, IntlDateFormatter::LONG);
$timeFormatter = new IntlDateFormatter(null, IntlDateFormatter::NONE, IntlDateFormatter::LONG);
require_once('database.php');
require_once('logger.php');
loadConfig();
global $zm_config;
$zm_config = loadConfig();
ZM\Logger::fetch()->initialise();
//
// This section is options normally derived from other options or configuration
//
define('ZMU_PATH', ZM_PATH_BIN.'/zmu'); // Local path to the ZoneMinder Utility
$locale = ZM_LOCALE_DEFAULT;
$locales = ResourceBundle::getLocales('');
@@ -230,27 +189,73 @@ $GLOBALS['defaultUser'] = array(
);
function loadConfig( $defineConsts=true ) {
global $zm_config;
global $zm_configvals;
global $dbConn;
$configFile = ZM_CONFIG;
$localConfigFile = basename($configFile);
if ( file_exists($localConfigFile) && filesize($localConfigFile) > 0 ) {
if ( php_sapi_name() == 'cli' && empty($_SERVER['REMOTE_ADDR']) )
print("Warning, overriding installed $localConfigFile file with local copy\n");
else
error_log("Warning, overriding installed $localConfigFile file with local copy");
$configFile = $localConfigFile;
}
# Process name, value pairs from the main config file first
$initial_config = process_configfile($configFile);
if (!$initial_config) $initial_config = [];
# Search for user created config files. If one or more are found then
# update our config value array with those values
if ( is_dir(ZM_CONFIG_SUBDIR) ) {
if ( is_readable(ZM_CONFIG_SUBDIR) ) {
foreach ( glob(ZM_CONFIG_SUBDIR.'/*.conf') as $filename ) {
$newconfig = process_configfile($filename);
if ($newconfig) $initial_config = array_merge($initial_config, $newconfig);
}
} else {
error_log('WARNING: ZoneMinder configuration subfolder found but is not readable. Check folder permissions on '.$configSubFolder);
}
} else {
error_log('WARNING: ZoneMinder configuration subfolder found but is not a directory. Check '.$configSubFolder);
}
# Need initial config defines in order to connect to db
# Now that our array our finalized, define each key => value
# pair in the array as a constant
if ($defineConsts) {
foreach ( $initial_config as $key => $config ) {
define($key, $config['Value']);
}
}
# Must have DB defines in place before including database.php
require_once('database.php');
require_once('logger.php');
$config = [];
global $dbConn;
$result = $dbConn->query('SELECT Name,Value,Type,Private FROM Config');
if ( !$result )
echo mysql_error();
while( $row = dbFetchNext($result) ) {
$zm_config[$row['Name']] = $row;
$name = $row['Name'];
$config[$name] = $row;
if (isset($initial_config[$name])) {
$config[$name]['Value'] = $initial_config[$name]['Value'];
unset($initial_config[$name]);
}
if ( $defineConsts ) {
# Values in conf.d files override db so check if already defined and update value
if ( ! defined($row['Name']) ) {
define($row['Name'], $row['Value']);
if (!defined($name)) {
define($name, $row['Value']);
} else {
$zm_config[$row['Name']]['Value'] = constant($row['Name']);
$config[$name]['Value'] = constant($name);
}
}
if (!isset($zm_configvals[$row['Name']])) $zm_configvals[$row['Name']] = $row['Value'];
}
return $zm_config;
return array_merge($config, $initial_config); # Merge any remaining config not in db
} # end function loadConfig
require_once('Server.php');
@@ -292,7 +297,7 @@ if ( defined('ZM_TIMEZONE') and ZM_TIMEZONE )
ini_set('date.timezone', ZM_TIMEZONE);
function process_configfile($configFile) {
$configvals = array();
$config = array();
if (is_readable($configFile)) {
$cfg = fopen($configFile, 'r') or error_log('Could not open config file: '.$configFile);
while ( !feof($cfg) ) {
@@ -300,7 +305,7 @@ function process_configfile($configFile) {
if ( preg_match('/^\s*(#.*)?$/', $str) ) {
continue;
} else if ( preg_match('/^\s*([^=\s]+)\s*=\s*[\'"]*(.*?)[\'"]*\s*$/', $str, $matches) ) {
$configvals[$matches[1]] = $matches[2];
$config[$matches[1]] = ['Name'=>$matches[1], 'Value'=>$matches[2]];
} else {
error_log("Malformed line in config $configFile\n$str");
}
@@ -309,7 +314,7 @@ function process_configfile($configFile) {
} else {
error_log('WARNING: ZoneMinder configuration file found but is not readable. Check file permissions on '.$configFile);
}
return $configvals;
return $config;
}
?>