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

Fix array uses of user object. Include data-id in monitor div.

pull/3703/head
Isaac Connor 2023-05-10 11:03:10 -04:00
parent ecb541bd04
commit a8365d40b4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web/includes/Monitor.php
View File

@ -802,7 +802,7 @@ public static function getStatuses() {
if (($u === null) or ($u->Id() == $user->Id())) if (($u === null) or ($u->Id() == $user->Id()))
return visibleMonitor($this->Id()); return visibleMonitor($this->Id());
$monitor_permission = Monitor_Permission::find_one(array('UserId'=>$u['Id'], 'MonitorId'=>$this->{'Id'})); $monitor_permission = Monitor_Permission::find_one(array('UserId'=>$u->Id(), 'MonitorId'=>$this->{'Id'}));
if ($monitor_permission and ($monitor_permission->Permission() == 'None')) { if ($monitor_permission and ($monitor_permission->Permission() == 'None')) {
Debug("Can't view monitor ".$this->{'Id'}." because of monitor permission ".$monitor_permission->Permission()); Debug("Can't view monitor ".$this->{'Id'}." because of monitor permission ".$monitor_permission->Permission());
return false; return false;
@ -823,7 +823,7 @@ public static function getStatuses() {
} }
} }
if ($group_permission_value != 'Inherit') return true; if ($group_permission_value != 'Inherit') return true;
return ($u['Monitors'] != 'None'); return ($u->Monitors() != 'None');
} # end function canView } # end function canView
function AlarmCommand($cmd) { function AlarmCommand($cmd) {
@ -1002,7 +1002,7 @@ public static function getStatuses() {
$options['buffer'] = $this->StreamReplayBuffer(); $options['buffer'] = $this->StreamReplayBuffer();
//Warning("width: " . $options['width'] . ' height: ' . $options['height']. ' scale: ' . $options['scale'] ); //Warning("width: " . $options['width'] . ' height: ' . $options['height']. ' scale: ' . $options['scale'] );
$html = ' $html = '
<div id="monitor'. $this->Id() . '" class="monitor" title="'.$this->Id(). ' '.$this->Name().'"> <div id="monitor'. $this->Id() . '" data-id="'.$this->Id().'" class="monitor" title="'.$this->Id(). ' '.$this->Name().'">
<div <div
id="imageFeed'. $this->Id() .'" id="imageFeed'. $this->Id() .'"
class="monitorStream imageFeed" class="monitorStream imageFeed"