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

Fix auth for monitor_permissions...

pull/3669/merge
Isaac Connor 2023-02-25 16:00:34 -05:00
parent 9fe1e507c7
commit 9ceb22db8f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
web/includes/auth.php
View File

@ -267,9 +267,9 @@ function visibleMonitor($mid) {
if ($monitor_permissions === null) {
$monitor_permissions = array_to_hash_by_key('MonitorId', ZM\Monitor_Permission::find(array('UserId'=>$user['Id'])));
}
if (isset($monitor_permissions[$mid]) and ($monitor_permissions[$mid]->Permission() == 'None')) {
ZM\Debug("Can't view monitor $mid because of monitor ".$monitor_permissions[$mid]->Permission());
return false;
if (isset($monitor_permissions[$mid])) {
ZM\Debug('Returning '.($monitor_permissions[$mid]->Permission() == 'None' ? false : true)." for monitor $mid");
return ($monitor_permissions[$mid]->Permission() == 'None' ? false : true);
}
global $group_permissions;
@ -290,7 +290,7 @@ function visibleMonitor($mid) {
if ($group_permission_value != 'Inherit') return true;
#if (!$user or ($user['Monitors'] == 'None')) return false;
#ZM\Debug("Returning " . ($user['Monitors'] == 'None' ? 'false' : 'true') . " for monitor $mid");
ZM\Debug("Returning " . ($user['Monitors'] == 'None' ? 'false' : 'true') . " for monitor $mid");
return ($user['Monitors'] != 'None');
}