mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2025-12-23 22:37:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add db config entries to zm_configvals

Browse Source
This commit is contained in:
Isaac Connor
2025-12-19 15:59:46 -05:00
parent cdbeea439b
commit 3b0feba15f
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
web/includes/config.php.in
View File

@@ -28,6 +28,7 @@ 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);
@@ -230,10 +231,9 @@ $GLOBALS['defaultUser'] = array(
function loadConfig( $defineConsts=true ) {
global $zm_config;
global $zm_configvals;
global $dbConn;
$config = array();
$result = $dbConn->query('SELECT Name,Value,Type,Private FROM Config');
if ( !$result )
echo mysql_error();
@@ -248,6 +248,7 @@ function loadConfig( $defineConsts=true ) {
$zm_config[$row['Name']]['Value'] = constant($row['Name']);
}
}
if (!isset($zm_configvals[$row['Name']])) $zm_configvals[$row['Name']] = $row['Value'];
}
return $zm_config;
} # end function loadConfig