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

Use unviewableMonitorIds fixing invalid user of u->MonitorIds

pull/3703/head
Isaac Connor 2023-05-10 11:03:39 -04:00
parent a8365d40b4
commit 18790a01f6
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/skins/classic/views/monitor.php
View File

@ -545,7 +545,6 @@ switch ($name) {
<li><label><?php echo translate('Triggers') ?></label>
<?php
$optTriggers = getSetValues('Monitors', 'Triggers');
ZM\Debug("Triggers: " . print_r($optTriggers, true));
$breakCount = (int)(ceil(count($optTriggers)));
$breakCount = min(3, $breakCount);
$optCount = 0;
@ -1284,7 +1283,7 @@ echo htmlSelect('newMonitor[OutputContainer]', $videowriter_containers, $monitor
<?php
$users = array(''=>translate('None'));
foreach (ZM\User::find() as $u) {
if ($u->MonitorIds() and (!$monitor->Id() or in_array($monitor->Id(), explode(',', $u->MonitorIds()))))
if (!$monitor->Id() or in_array($monitor->Id(), $u->unviewableMonitorIds()))
continue;
$users[$u->Id()] = $u->Username();
}