From a8365d40b4f69bce86796ff7be8821cfc6dbeecd Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Wed, 10 May 2023 11:03:10 -0400 Subject: [PATCH] Fix array uses of user object. Include data-id in monitor div. --- web/includes/Monitor.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/includes/Monitor.php b/web/includes/Monitor.php index 5a44f2f76..e8a0452e0 100644 --- a/web/includes/Monitor.php +++ b/web/includes/Monitor.php @@ -802,7 +802,7 @@ public static function getStatuses() { if (($u === null) or ($u->Id() == $user->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')) { Debug("Can't view monitor ".$this->{'Id'}." because of monitor permission ".$monitor_permission->Permission()); return false; @@ -823,7 +823,7 @@ public static function getStatuses() { } } if ($group_permission_value != 'Inherit') return true; - return ($u['Monitors'] != 'None'); + return ($u->Monitors() != 'None'); } # end function canView function AlarmCommand($cmd) { @@ -1002,7 +1002,7 @@ public static function getStatuses() { $options['buffer'] = $this->StreamReplayBuffer(); //Warning("width: " . $options['width'] . ' height: ' . $options['height']. ' scale: ' . $options['scale'] ); $html = ' -
+