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

Test for valid monitor id in snapshot creation.

pull/3669/merge
Isaac Connor 2023-02-20 10:30:34 -05:00
parent bf810ec8c4
commit f4a2925177
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
web/includes/actions/snapshot.php
View File

@ -21,7 +21,6 @@
require_once('includes/Snapshot.php');
require_once('includes/Monitor.php');
if ( $action == 'create' ) {
if ( ! (isset($_REQUEST['monitor_ids']) and count($_REQUEST['monitor_ids']) > 0 ) ) {
ZM\Error('No monitor ids given in snapshot creation request');
@ -31,9 +30,16 @@ if ( $action == 'create' ) {
$snapshot->save(array('CreatedBy'=>$user['Id']));
foreach ( $_REQUEST['monitor_ids'] as $monitor_id ) {
if (!validCardinal($monitor_id)) {
Error("Monitor Id value is invalid $monitor_id");
continue;
}
$monitor = ZM\Monitor::find_one(['Id'=>$monitor_id]);
if (!$monitor) {
Error("Monitor not found for id $monitor_id");
continue;
}
$snapshot_event = new ZM\Snapshot_Event();
$monitor = new ZM\Monitor($monitor_id);
$event_id = $monitor->TriggerOn();
ZM\Debug("Have event $event_id for monitor $monitor_id");
if ( $event_id ) {
@ -44,7 +50,8 @@ if ( $action == 'create' ) {
}
} # end foreach monitor
foreach ( $_REQUEST['monitor_ids'] as $monitor_id ) {
$monitor = new ZM\Monitor($monitor_id);
$monitor = ZM\Monitor::find_one(['Id'=>$monitor_id]);
if (!$monitor) continue;
$monitor->TriggerOff();
}
$dbConn->beginTransaction();