ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add ZM Namespace to Error calls

This commit is contained in:
Isaac Connor 2020-01-02 16:54:50 -05:00
parent 06f846c88b
commit e9815bf9c7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -179,14 +179,14 @@ if ( ! defined('ZM_SERVER_ID') ) {
# Use Server lookup so that it caches # Use Server lookup so that it caches
$Server = ZM\Server::find_one(array('Name'=>ZM_SERVER_NAME)); $Server = ZM\Server::find_one(array('Name'=>ZM_SERVER_NAME));
if ( !$Server ) { if ( !$Server ) {
Error('Invalid Multi-Server configration detected. ZM_SERVER_NAME set to ' . ZM_SERVER_NAME . ' in zm.conf, but no corresponding entry found in Servers table.'); ZM\Error('Invalid Multi-Server configration detected. ZM_SERVER_NAME set to ' . ZM_SERVER_NAME . ' in zm.conf, but no corresponding entry found in Servers table.');
} else { } else {
define('ZM_SERVER_ID', $Server->Id()); define('ZM_SERVER_ID', $Server->Id());
} }
} else if ( defined('ZM_SERVER_HOST') and ZM_SERVER_HOST ) { } else if ( defined('ZM_SERVER_HOST') and ZM_SERVER_HOST ) {
$Server = ZM\Server::find_one(array('Name'=>ZM_SERVER_HOST)); $Server = ZM\Server::find_one(array('Name'=>ZM_SERVER_HOST));
if ( ! $Server ) { if ( ! $Server ) {
Error('Invalid Multi-Server configration detected. ZM_SERVER_HOST set to ' . ZM_SERVER_HOST . ' in zm.conf, but no corresponding entry found in Servers table.'); ZM\Error('Invalid Multi-Server configration detected. ZM_SERVER_HOST set to ' . ZM_SERVER_HOST . ' in zm.conf, but no corresponding entry found in Servers table.');
} else { } else {
define('ZM_SERVER_ID', $Server->Id()); define('ZM_SERVER_ID', $Server->Id());
} }
@ -199,7 +199,7 @@ function process_configfile($configFile) {
if ( is_readable( $configFile ) ) { if ( is_readable( $configFile ) ) {
$configvals = array(); $configvals = array();
$cfg = fopen($configFile, 'r') or Error("Could not open config file: $configFile."); $cfg = fopen($configFile, 'r') or ZM\Error("Could not open config file: $configFile.");
while ( !feof($cfg) ) { while ( !feof($cfg) ) {
$str = fgets($cfg, 256); $str = fgets($cfg, 256);
if ( preg_match('/^\s*(#.*)?$/', $str) ) { if ( preg_match('/^\s*(#.*)?$/', $str) ) {
@ -207,7 +207,7 @@ function process_configfile($configFile) {
} else if ( preg_match( '/^\s*([^=\s]+)\s*=\s*[\'"]*(.*?)[\'"]*\s*$/', $str, $matches )) { } else if ( preg_match( '/^\s*([^=\s]+)\s*=\s*[\'"]*(.*?)[\'"]*\s*$/', $str, $matches )) {
$configvals[$matches[1]] = $matches[2]; $configvals[$matches[1]] = $matches[2];
} else { } else {
Error("Malformed line in config $configFile\n$str"); ZM\Error("Malformed line in config $configFile\n$str");
} }
} }
fclose($cfg); fclose($cfg);