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

Fix 2340 (#2368) 

* include includes/functions.php so that we have access to all it's contents

* add a beforeDelete function which deletes the files.  Add other needed functions like Path() LinkPath() etc.

* add require_once for Storage and functions because we use them in Event

* Now that ZM has namespaces use the ZM Event class to do the heavy lifting of delete

* Don't need functions in AppController anymore
This commit is contained in:
Isaac Connor 2019-02-26 11:28:56 -05:00 committed by GitHub
parent 53c0fae688
commit 92dc7878de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
web/api/app/Model/Event.php
View File

@ -1,4 +1,6 @@
<?php
require_once __DIR__ .'/../../../includes/Event.php';
App::uses('AppModel', 'Model');
/**
* Event Model
@ -100,20 +102,20 @@ class Event extends AppModel {
),
);
public function Relative_Path($event) {
$event_path = '';
if ( $event['Scheme'] == 'Deep' ) {
$event_path = $event['MonitorId'] .'/'.strftime('%y/%m/%d/%H/%M/%S', strtotime($event['StartTime']));
} else if ( $event['Scheme'] == 'Medium' ) {
$event_path = $event['MonitorId'] .'/'.strftime('%Y-%m-%d', strtotime($event['StartTime'])) . '/'.$event['Id'];
} else {
$event_path = $event['MonitorId'] .'/'.$event['Id'];
}
return $event_path;
public function Relative_Path() {
$Event = new ZM\Event($this->data);
return $Event->Relative_Path();
} // end function Relative_Path()
public function Path() {
$Event = new ZM\Event($this->data);
return $Event->Path();
}
public function Link_Path() {
$Event = new ZM\Event($this->data);
return $Event->Link_Path();
}
public function fileExists($event) {
//$data = $this->findById($id);
@ -121,10 +123,10 @@ class Event extends AppModel {
$storage = $this->Storage->findById($event['StorageId']);
if ( $event['DefaultVideo'] ) {
if ( file_exists($storage['Storage']['Path'].'/'.$this->Relative_Path($event).'/'.$event['DefaultVideo']) ) {
if ( file_exists($storage['Storage']['Path'].'/'.$this->Relative_Path().'/'.$event['DefaultVideo']) ) {
return 1;
} else {
Logger::Debug("FIle does not exist at " . $storage['Storage']['Path'].'/'.$this->Relative_Path($event).'/'.$event['DefaultVideo'] );
Logger::Debug("FIle does not exist at " . $storage['Storage']['Path'].'/'.$this->Relative_Path().'/'.$event['DefaultVideo'] );
}
} else {
Logger::Debug("No DefaultVideo in Event" . $this->Event);
@ -136,4 +138,8 @@ Logger::Debug("No DefaultVideo in Event" . $this->Event);
$storage = $this->Storage->findById($event['StorageId']);
return filesize($storage['Storage']['Path'].'/'.$this->Relative_Path($event).'/'.$event['DefaultVideo']);
}
public function beforeDelete($cascade=true) {
$Event = new ZM\Event($this->data);
return $Event->delete();
} // end function afterDelete
}

2
web/includes/Event.php
View File

@ -1,5 +1,7 @@
<?php
namespace ZM;
require_once('Storage.php');
require_once('functions.php');
$event_cache = array();