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

fixup loading SERVER_ID from SERVER_NAME

pull/1088/head
Isaac Connor 2015-07-17 10:12:44 -04:00
parent 3c821f3686
commit 441a82e611
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -167,13 +167,22 @@ function loadConfig( $defineConsts=true )
}
// For Human-readability, user ZM_SERVER in zm.conf, and convert it here to a ZM_SERVER_ID
if ( ! defined(ZM_SERVER_ID) and defined(ZM_SERVER) ) {
$server_id = dbFetchOne('SELECT Id FROM Servers WHERE Name=?', 'Id', array(ZM_SERVER_NAME));
if ( ! $server_id ) {
Error("ZM_SERVER_NAME set in config, but not found in Servers table.");
} else {
define( ZM_SERVER_ID, $server_id );
}
if ( ! defined('ZM_SERVER_ID') ) {
if ( defined('ZM_SERVER_NAME') ) {
$server_id = dbFetchOne('SELECT Id FROM Servers WHERE Name=?', 'Id', array(ZM_SERVER_NAME));
if ( ! $server_id ) {
Error("ZM_SERVER_NAME set in config, but not found in Servers table.");
} else {
define( 'ZM_SERVER_ID', $server_id );
}
} else if ( defined('ZM_SERVER_HOST') ) {
$server_id = dbFetchOne('SELECT Id FROM Servers WHERE Name=?', 'Id', array(ZM_SERVER_HOST));
if ( ! $server_id ) {
Error("ZM_SERVER_HOST set in config, but not found in Servers table.");
} else {
define( 'ZM_SERVER_ID', $server_id );
}
}
}