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

We CANNOT specify nextId for the next mid to use. If we do that then we can overwrite existing db entries

This commit is contained in:
Isaac Connor 2021-03-13 12:47:05 -05:00
parent 478d11e6f2
commit 2a6621959c
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,13 +33,14 @@ if ( defined('ZM_SERVER_ID') ) {
if ( !$Server ) {
$Server = array('Id' => '');
}
$mid = null;
$monitor = null;
if ( !empty($_REQUEST['mid']) ) {
$nextId = validInt($_REQUEST['mid']);
$monitor = new ZM\Monitor($_REQUEST['mid']);
$mid = validInt($_REQUEST['mid']);
$monitor = new ZM\Monitor($mid);
if ( $monitor and ZM_OPT_X10 )
$x10Monitor = dbFetchOne('SELECT * FROM TriggersX10 WHERE MonitorId = ?', NULL, array($_REQUEST['mid']));
$x10Monitor = dbFetchOne('SELECT * FROM TriggersX10 WHERE MonitorId = ?', NULL, array($mid));
}
if ( !$monitor ) {
@ -56,7 +57,7 @@ if ( isset($_REQUEST['dupId']) ) {
$x10Monitor = dbFetchOne('SELECT * FROM TriggersX10 WHERE MonitorId = ?', NULL, array($_REQUEST['dupId']));
$clonedName = $monitor->Name();
$monitor->Name('Clone of '.$monitor->Name());
$monitor->Id(!empty($_REQUEST['mid'])?validInt($_REQUEST['mid']) : 0);
$monitor->Id($mid);
}
if ( ZM_OPT_X10 && empty($x10Monitor) ) {
@ -467,7 +468,7 @@ if ( canEdit('Monitors') ) {
<div class="d-flex flex-row container-fluid pr-0">
<form name="contentForm" id="contentForm" method="post" action="?view=monitor">
<input type="hidden" name="tab" value="<?php echo $tab?>"/>
<input type="hidden" name="mid" value="<?php echo $monitor->Id() ? $monitor->Id() : validHtmlStr($nextId) ?>"/>
<input type="hidden" name="mid" value="<?php echo $monitor->Id() ? $monitor->Id() : $mid ?>"/>
<input type="hidden" name="origMethod" value="<?php echo (null !== $monitor->Method())?validHtmlStr($monitor->Method()):'' ?>"/>
<div class="tab-content" id="pills-tabContent">
<?php