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

Merge pull request from digital-gnome/eventnavFix 

Fix nearevents path
pull/2077/head
Isaac Connor 2017-10-07 12:49:50 -04:00 committed by GitHub
parent f230aa01ef e23b4a0d5d
commit d0541b0837
2 changed files with 3 additions and 3 deletions

4
web/ajax/status.php
View File

@ -390,8 +390,8 @@ function getNearEvents() {
$result['NextEventId'] = empty($nextEvent)?0:$nextEvent['Id']; $result['NextEventId'] = empty($nextEvent)?0:$nextEvent['Id'];
$result['PrevEventStartTime'] = empty($prevEvent)?0:$prevEvent['StartTime']; $result['PrevEventStartTime'] = empty($prevEvent)?0:$prevEvent['StartTime'];
$result['NextEventStartTime'] = empty($nextEvent)?0:$nextEvent['StartTime']; $result['NextEventStartTime'] = empty($nextEvent)?0:$nextEvent['StartTime'];
$result['PrevEventDefVideoPath'] = empty($prevEvent)?0:(getEventDefaultVideoPath($prevEvent)); $result['PrevEventDefVideoPath'] = empty($prevEvent)?0:(getEventDefaultVideoPath($prevEvent['Id']));
$result['NextEventDefVideoPath'] = empty($nextEvent)?0:(getEventDefaultVideoPath($nextEvent)); $result['NextEventDefVideoPath'] = empty($nextEvent)?0:(getEventDefaultVideoPath($nextEvent['Id']));
return( $result ); return( $result );
} }

2
web/includes/functions.php
View File

@ -471,7 +471,7 @@ function getEventPath( $event ) {
function getEventDefaultVideoPath( $event ) { function getEventDefaultVideoPath( $event ) {
$Event = new Event( $event ); $Event = new Event( $event );
return $Event->getStreamSrc( array( "mode=mpeg&format=h264" ) ); return $Event->getStreamSrc( array( "mode"=>"mpeg", "format"=>"h264" ) );
//$Event->Path().'/'.$event['DefaultVideo']; //$Event->Path().'/'.$event['DefaultVideo'];
} }