ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

whitespace

This commit is contained in:
Isaac Connor 2021-09-25 16:10:50 -04:00
parent 888d79706a
commit 03892796eb
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
web/skins/classic/views/monitor.php
View File

@ -21,44 +21,50 @@
require_once('includes/Server.php'); require_once('includes/Server.php');
require_once('includes/Storage.php'); require_once('includes/Storage.php');
if ( !canEdit('Monitors', empty($_REQUEST['mid'])?0:$_REQUEST['mid']) ) { if (!canEdit('Monitors', empty($_REQUEST['mid'])?0:$_REQUEST['mid'])) {
$view = 'error'; $view = 'error';
return; return;
} }
$Server = null; $Server = null;
if ( defined('ZM_SERVER_ID') ) { if (defined('ZM_SERVER_ID')) {
$Server = dbFetchOne('SELECT * FROM Servers WHERE Id=?', NULL, array(ZM_SERVER_ID)); $Server = dbFetchOne('SELECT * FROM Servers WHERE Id=?', NULL, array(ZM_SERVER_ID));
} }
if ( !$Server ) { if (!$Server) {
$Server = array('Id' => ''); $Server = array('Id' => '');
} }
$mid = null; $mid = null;
$monitor = null; $monitor = null;
if ( !empty($_REQUEST['mid']) ) { if (!empty($_REQUEST['mid'])) {
$mid = validInt($_REQUEST['mid']); $mid = validInt($_REQUEST['mid']);
$monitor = new ZM\Monitor($mid); $monitor = new ZM\Monitor($mid);
if ( $monitor and ZM_OPT_X10 ) if ($monitor->Id()) {
$x10Monitor = dbFetchOne('SELECT * FROM TriggersX10 WHERE MonitorId = ?', NULL, array($mid)); if (ZM_OPT_X10) {
$x10Monitor = dbFetchOne('SELECT * FROM TriggersX10 WHERE MonitorId = ?', NULL, array($mid));
}
} else {
$monitor->Name(translate('Monitor').'-'.$mid);
$monitor->WebColour(random_colour());
}
} }
if ( !$monitor ) { if (!$monitor) {
$monitor = new ZM\Monitor(); $monitor = new ZM\Monitor();
$monitor->Name(translate('Monitor').'-'.getTableAutoInc('Monitors')); $monitor->Name(translate('Monitor').'-'.getTableAutoInc('Monitors'));
$monitor->WebColour(random_colour()); $monitor->WebColour(random_colour());
} # end if $_REQUEST['mid'] } # end if $_REQUEST['mid']
if ( isset($_REQUEST['dupId']) ) { if (isset($_REQUEST['dupId'])) {
$monitor = new ZM\Monitor($_REQUEST['dupId']); $monitor = new ZM\Monitor($_REQUEST['dupId']);
$monitor->GroupIds(); // have to load before we change the Id $monitor->GroupIds(); // have to load before we change the Id
if ( ZM_OPT_X10 ) if (ZM_OPT_X10)
$x10Monitor = dbFetchOne('SELECT * FROM TriggersX10 WHERE MonitorId = ?', NULL, array($_REQUEST['dupId'])); $x10Monitor = dbFetchOne('SELECT * FROM TriggersX10 WHERE MonitorId = ?', NULL, array($_REQUEST['dupId']));
$clonedName = $monitor->Name(); $clonedName = $monitor->Name();
$monitor->Name('Clone of '.$monitor->Name()); $monitor->Name('Clone of '.$monitor->Name());
$monitor->Id($mid); $monitor->Id($mid);
} }
if ( ZM_OPT_X10 && empty($x10Monitor) ) { if (ZM_OPT_X10 && empty($x10Monitor)) {
$x10Monitor = array( $x10Monitor = array(
'Activation' => '', 'Activation' => '',
'AlarmInput' => '', 'AlarmInput' => '',
@ -69,14 +75,14 @@ if ( ZM_OPT_X10 && empty($x10Monitor) ) {
function fourcc($a, $b, $c, $d) { function fourcc($a, $b, $c, $d) {
return ord($a) | (ord($b) << 8) | (ord($c) << 16) | (ord($d) << 24); return ord($a) | (ord($b) << 8) | (ord($c) << 16) | (ord($d) << 24);
} }
if ( isset($_REQUEST['newMonitor']) ) { if (isset($_REQUEST['newMonitor'])) {
# Update the monitor object with whatever has been set so far. # Update the monitor object with whatever has been set so far.
$monitor->set($_REQUEST['newMonitor']); $monitor->set($_REQUEST['newMonitor']);
if ( ZM_OPT_X10 ) if (ZM_OPT_X10)
$newX10Monitor = $_REQUEST['newX10Monitor']; $newX10Monitor = $_REQUEST['newX10Monitor'];
} else { } else {
if ( ZM_OPT_X10 ) if (ZM_OPT_X10)
$newX10Monitor = $x10Monitor; $newX10Monitor = $x10Monitor;
} }