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

Deal with structure of json response from API when getting Janus_Pin

pull/3621/head
Isaac Connor 2022-09-28 18:36:47 -04:00
parent f5bdbcf0bd
commit 8d56949800
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
web/includes/Monitor.php
View File

@ -279,9 +279,8 @@ public static function getStatuses() {
return $output ? trim($output) : $output; return $output ? trim($output) : $output;
} else if ($this->ServerId()) { } else if ($this->ServerId()) {
$result = $this->Server()->SendToApi('/monitors/'.$this->{'Id'}.'.json'); $result = $this->Server()->SendToApi('/monitors/'.$this->{'Id'}.'.json');
Debug(print_r($result, true));
$json = json_decode($result, true); $json = json_decode($result, true);
return $json['Janus_Pin']; return ((isset($json['monitor']) and isset($json['monitor']['Monitor']) and isset($json['monitor']['Monitor']['Janus_Pin'])) ? $json['monitor']['Monitor']['Janus_Pin'] : '');
} else { } else {
Error('Server not assigned to Monitor in a multi-server setup. Please assign a server to the Monitor.'); Error('Server not assigned to Monitor in a multi-server setup. Please assign a server to the Monitor.');
} }