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

Fix controlling daemon when the monitor is Local

This commit is contained in:
Isaac Connor 2018-06-06 12:56:33 -04:00
parent 3109536dda
commit cd64619743
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
web/api/app/Controller/MonitorsController.php
View File

@ -332,25 +332,18 @@ class MonitorsController extends AppController {
} }
public function daemonControl($id, $command, $monitor=null, $daemon=null) { public function daemonControl($id, $command, $monitor=null, $daemon=null) {
$args = '';
$daemons = array(); $daemons = array();
if (!$monitor) { if ( !$monitor ) {
// Need to see if it is local or remote // Need to see if it is local or remote
$monitor = $this->Monitor->find('first', array( $monitor = $this->Monitor->find('first', array(
'fields' => array('Type', 'Function'), 'fields' => array('Type', 'Function', 'Device'),
'conditions' => array('Id' => $id) 'conditions' => array('Id' => $id)
)); ));
$monitor = $monitor['Monitor']; $monitor = $monitor['Monitor'];
} }
if ($monitor['Type'] == 'Local') { if ( $monitor['Function'] == 'Monitor' ) {
$args = '-d ' . $monitor['Device'];
} else {
$args = '-m ' . $id;
}
if ($monitor['Function'] == 'Monitor') {
array_push($daemons, 'zmc'); array_push($daemons, 'zmc');
} else { } else {
array_push($daemons, 'zmc', 'zma'); array_push($daemons, 'zmc', 'zma');
@ -359,6 +352,13 @@ class MonitorsController extends AppController {
$zm_path_bin = Configure::read('ZM_PATH_BIN'); $zm_path_bin = Configure::read('ZM_PATH_BIN');
foreach ($daemons as $daemon) { foreach ($daemons as $daemon) {
$args = '';
if ( $daemon == 'zmc' and $monitor['Type'] == 'Local') {
$args = '-d ' . $monitor['Device'];
} else {
$args = '-m ' . $id;
}
$shellcmd = escapeshellcmd("$zm_path_bin/zmdc.pl $command $daemon $args"); $shellcmd = escapeshellcmd("$zm_path_bin/zmdc.pl $command $daemon $args");
$status = exec( $shellcmd ); $status = exec( $shellcmd );
} }