mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-05-14 01:24:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove ZM\s that shouldn't be there

Browse Source
This commit is contained in:
Isaac Connor
2023-02-19 17:23:45 -05:00
parent 717b156d86
commit 5090000cdd
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
web/includes/Monitor.php
View File

@@ -756,19 +756,19 @@ public static function getStatuses() {
if ($u===null or $u['Id'] == $user['Id'])
return editableMonitor($this->{'Id'});
$monitor_permission = ZM\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' or $monitor_permission->Permission() == 'View')) {
ZM\Debug("Can't edit monitor ".$this->{'Id'}." because of monitor permission ".$monitor_permission->Permission());
Debug("Can't edit monitor ".$this->{'Id'}." because of monitor permission ".$monitor_permission->Permission());
return false;
}
$group_permissions = ZM\Group_Permission::find(array('UserId'=>$user['Id']));
$group_permissions = Group_Permission::find(array('UserId'=>$user['Id']));
# If denied view in any group, then can't view it.
foreach ($group_permissions as $permission) {
if (!$permission->canEditMonitor($this->{'Id'})) {
ZM\Debug("Can't edit monitor ".$this->{'Id'}." because of group ".$permision->Group()->Name().' '.$permision->Permission());
Debug("Can't edit monitor ".$this->{'Id'}." because of group ".$permision->Group()->Name().' '.$permision->Permission());
return false;
}
}
@@ -780,20 +780,20 @@ public static function getStatuses() {
if (($u === null) or ($u['Id'] == $user['Id']))
return visibleMonitor($this->Id());
$monitor_permission = ZM\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')) {
ZM\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;
}
$group_permissions = ZM\Group_Permission::find(array('UserId'=>$user['Id']));
$group_permissions = Group_Permission::find(array('UserId'=>$user['Id']));
# If denied view in any group, then can't view it.
$group_permission_value = 'Inherit';
foreach ($group_permissions as $permission) {
$value = $pmerssion->MonitorPermission($mid);
if ($value == 'None') {
ZM\Debug("Can't view monitor ".$this->{'Id'}." because of group ".$permision->Group()->Name().' '.$permision->Permission());
Debug("Can't view monitor ".$this->{'Id'}." because of group ".$permision->Group()->Name().' '.$permision->Permission());
return false;
}
if ($value == 'Edit' or $value == 'View') {