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

include auth.php if auth is on, and return '' for auth_hash is auth is disabled

pull/2090/head^2
Isaac Connor 2018-04-30 11:24:53 -04:00
parent 3c9c05891f
commit c3b6cd4bab
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
web/api/app/Controller/HostController.php
View File

@ -6,14 +6,14 @@ class HostController extends AppController {
public $components = array('RequestHandler');
public function daemonCheck($daemon=false, $args=false) {
$string = Configure::read('ZM_PATH_BIN')."/zmdc.pl check";
$string = Configure::read('ZM_PATH_BIN').'/zmdc.pl check';
if ( $daemon ) {
$string .= " $daemon";
if ( $args )
$string .= " $args";
}
$result = exec( $string );
$result = preg_match( '/running/', $result );
$result = exec($string);
$result = preg_match('/running/', $result);
$this->set(array(
'result' => $result,
@ -31,10 +31,18 @@ class HostController extends AppController {
}
function getAuthHash() {
$this->set(array(
'auth_hash'=> generateAuthHash( ZM_AUTH_HASH_IPS ),
'_serialize' => array('auth_hash')
) );
if ( $zmOptAuth == '1' ) {
require_once '../../../includes/auth.php';
$this->set(array(
'auth_hash' => generateAuthHash(ZM_AUTH_HASH_IPS),
'_serialize' => array('auth_hash')
) );
} else {
$this->set(array(
'auth_hash' => '',
'_serialize' => array('auth_hash')
) );
}
}
// If $mid is set, only return disk usage for that monitor