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

Prevent deletion of entire events directory when monitor has empty name

This commit is contained in:
Isaac Connor 2019-11-02 10:12:43 -04:00
parent 54c11bc0d1
commit 9d8a230252
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
web/includes/Monitor.php
View File

@ -380,6 +380,10 @@ private $status_fields = array(
}
public function delete() {
if ( ! $this->{'Id'} ) {
Warning("Attempt to delete a monitor without id.");
return;
}
$this->zmaControl('stop');
$this->zmcControl('stop');
@ -391,11 +395,13 @@ private $status_fields = array(
foreach ($markEids as $markEid)
deleteEvent($markEid);
deletePath(ZM_DIR_EVENTS.'/'.basename($this->{'Name'}));
if ( $this->{'Name'} )
deletePath(ZM_DIR_EVENTS.'/'.basename($this->{'Name'}));
deletePath(ZM_DIR_EVENTS.'/'.$this->{'Id'});
$Storage = $this->Storage();
if ( $Storage->Path() != ZM_DIR_EVENTS ) {
deletePath($Storage->Path().'/'.basename($this->{'Name'}));
if ( $this->{'Name'} )
deletePath($Storage->Path().'/'.basename($this->{'Name'}));
deletePath($Storage->Path().'/'.$this->{'Id'});
}
} // end if !ZM_OPT_FAST_DELETE