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

Use object methods to load montiors

pull/3812/head
Isaac Connor 2024-01-28 16:53:30 -05:00
parent 2c7c928fa6
commit 0e88d764f0
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/skins/classic/views/js/user.js.php
View File

@ -7,7 +7,7 @@ const monitors = new Array();
foreach ($monitors as $m) {
?>
monitors[monitors.length] = {
'id': <?php echo $m['Id'] ?>
'id': <?php echo $m->Id() ?>
};
<?php
} // end foreach monitor

17
web/skins/classic/views/user.php
View File

@ -46,13 +46,6 @@ $inve = array( 'Inherit'=>translate('Inherit'),'None'=>translate('None'), 'View'
$bandwidths = array_merge( array( ''=>'' ), $bandwidth_options );
$langs = array_merge( array( ''=>'' ), getLanguages() );
$sql = 'SELECT Id, Name FROM Monitors ORDER BY Sequence ASC';
$monitors = array();
foreach ( dbFetchAll($sql) as $monitor ) {
if ( visibleMonitor($monitor['Id']) ) {
$monitors[$monitor['Id']] = $monitor;
}
}
$focusWindow = true;
@ -279,9 +272,10 @@ if (canEdit('Groups')) {
</thead>
<tbody>
<?php
foreach ($monitors as $m) {
$monitor = new ZM\Monitor($m);
echo '
$monitors = ZM\Monitor::find(['Deleted'=>0], ['order'=>'Sequence ASC']);
foreach ( $monitors as $monitor ) {
if ($monitor->canView()) {
echo '
<tr class="monitor">
<td class="Id">'.$monitor->Id().'</td>
<td class="Name">'.validHtmlStr($monitor->Name()).'</td>
@ -291,6 +285,9 @@ if (canEdit('Groups')) {
['data-on-change'=>'updateEffectivePermissions']).'</td>
<td class="effective_permission" id="effective_permission'.$monitor->Id().'">'.translate($monitor->effectivePermission($User)).'</td>
</tr>';
} else {
ZM\Debug("Can't view monitor ".$monitor->Id(). ' ' .$monitor->canView());
}
}
?>
</tbody>