diff --git a/web/api/app/Controller/Component/ImageComponent.php b/web/api/app/Controller/Component/ImageComponent.php index 2033e0d8c..567333a71 100644 --- a/web/api/app/Controller/Component/ImageComponent.php +++ b/web/api/app/Controller/Component/ImageComponent.php @@ -89,11 +89,11 @@ class ImageComponent extends Component { } - // Take the StartTime of an Event and return + // Take the StartDateTime of an Event and return // the path to its location on the filesystem public function getEventPath( $event ) { if ( $config['ZM_USE_DEEP_STORAGE'] == 1 ) - return $event['Event']['MonitorId'].'/'.strftime( "%y/%m/%d/%H/%M/%S", strtotime($event['Event']['StartTime']) ); + return $event['Event']['MonitorId'].'/'.strftime( '%y/%m/%d/%H/%M/%S', strtotime($event['Event']['StartDateTime']) ); else return $event['Event']['MonitorId'].'/'.$event['Event']['Id']; } diff --git a/web/api/app/Controller/EventsController.php b/web/api/app/Controller/EventsController.php index 3b132e932..021c40b5e 100644 --- a/web/api/app/Controller/EventsController.php +++ b/web/api/app/Controller/EventsController.php @@ -65,7 +65,7 @@ class EventsController extends AppController { // API 'limit' => '100', - 'order' => array('StartTime'), + 'order' => array('StartDateTime'), 'paramType' => 'querystring', ); if ( isset($conditions['GroupId']) ) { @@ -309,7 +309,7 @@ class EventsController extends AppController { } else { $conditions = array(); } - array_push($conditions, array("StartTime >= DATE_SUB(NOW(), INTERVAL $expr $unit)")); + array_push($conditions, array("StartDateTime >= DATE_SUB(NOW(), INTERVAL $expr $unit)")); $query = $this->Event->find('all', array( 'fields' => array( 'MonitorId',