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

pass a minimum event hash instead of the event id to deleteEvent

pull/696/head
Isaac Connor 2015-02-06 11:50:07 -05:00
parent 9a1e210849
commit bcdac0104f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
web/includes/actions.php
View File

@ -574,9 +574,10 @@ if ( !empty($action) )
// well time out before completing, in which case zmaudit will still tidy up // well time out before completing, in which case zmaudit will still tidy up
if ( !ZM_OPT_FAST_DELETE ) if ( !ZM_OPT_FAST_DELETE )
{ {
$markEids = dbFetchAll( "select Id from Events where MonitorId=?", 'Id', array($markMid) ); // Slight hack, we maybe should load *, but we happen to know that the deleteEvent function uses Id and StartTime.
$markEids = dbFetchAll( "SELECT Id,StartTime FROM Events WHERE MonitorId=?", NULL, array($markMid) );
foreach( $markEids as $markEid ) foreach( $markEids as $markEid )
deleteEvent( $markEid ); deleteEvent( $markEid, $markMid );
deletePath( ZM_DIR_EVENTS."/".basename($monitor['Name']) ); deletePath( ZM_DIR_EVENTS."/".basename($monitor['Name']) );
deletePath( ZM_DIR_EVENTS."/".$monitor['Id'] ); // I'm trusting the Id. deletePath( ZM_DIR_EVENTS."/".$monitor['Id'] ); // I'm trusting the Id.