mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-05-13 00:54:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use new insert function to allow re-use of monitor Ids

Browse Source
This commit is contained in:
Isaac Connor
2021-02-01 16:44:41 -05:00
parent 50e5f84df2
commit 0dc6b60985
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
web/includes/actions/monitor.php
View File

@@ -28,23 +28,23 @@ if ( $action == 'save' ) {
$mid = 0;
if ( !empty($_REQUEST['mid']) ) {
$mid = validInt($_REQUEST['mid']);
if ( !canEdit('Monitors', $mid) ) {
ZM\Warning('You do not have permission to edit this monitor');
return;
}
if ( ZM_OPT_X10 ) {
$x10Monitor = dbFetchOne('SELECT * FROM TriggersX10 WHERE MonitorId=?', NULL, array($mid));
if ( !$x10Monitor )
$x10Monitor = array();
}
if ( !canEdit('Monitors', $mid) ) {
ZM\Warning('You do not have permission to edit this monitor');
return;
}
} else {
if ( ZM_OPT_X10 ) {
$x10Monitor = array();
}
if ( $user['MonitorIds'] ) {
ZM\Warning('You are restricted to certain monitors so cannot add a new one.');
return;
}
if ( ZM_OPT_X10 ) {
$x10Monitor = array();
}
}
$monitor = new ZM\Monitor($mid);
@@ -212,8 +212,11 @@ if ( $action == 'save' ) {
# FIXME This is actually a race condition. Should lock the table.
$maxSeq = dbFetchOne('SELECT MAX(Sequence) AS MaxSequence FROM Monitors', 'MaxSequence');
$changes['Sequence'] = $maxSeq+1;
if ( $mid and !$monitor->Id() ) {
$changes['Id'] = $mid;
}
if ( $monitor->save($changes) ) {
if ( $monitor->insert($changes) ) {
$mid = $monitor->Id();
$zoneArea = $_REQUEST['newMonitor']['Width'] * $_REQUEST['newMonitor']['Height'];
dbQuery("INSERT INTO Zones SET MonitorId = ?, Name = 'All', Type = 'Active', Units = 'Percent', NumCoords = 4, Coords = ?, Area=?, AlarmRGB = 0xff0000, CheckMethod = 'Blobs', MinPixelThreshold = 25, MinAlarmPixels=?, MaxAlarmPixels=?, FilterX = 3, FilterY = 3, MinFilterPixels=?, MaxFilterPixels=?, MinBlobPixels=?, MinBlobs = 1", array( $mid, sprintf( "%d,%d %d,%d %d,%d %d,%d", 0, 0, $_REQUEST['newMonitor']['Width']-1, 0, $_REQUEST['newMonitor']['Width']-1, $_REQUEST['newMonitor']['Height']-1, 0, $_REQUEST['newMonitor']['Height']-1 ), $zoneArea, intval(($zoneArea*3)/100), intval(($zoneArea*75)/100), intval(($zoneArea*3)/100), intval(($zoneArea*75)/100), intval(($zoneArea*2)/100) ) );