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

Merge branch 'master' into storageareas

pull/2618/head
Isaac Connor 2019-05-24 10:06:14 -04:00
parent f9004443cf db9ba7eeab
commit 729dee5dda
3 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/ajax/stream.php
View File

@ -35,11 +35,11 @@ if ( sem_acquire($semaphore,1) !== false ) {
$msg = pack( 'lcn', MSG_CMD, $_REQUEST['command'], $_REQUEST['rate']+32768 ); $msg = pack( 'lcn', MSG_CMD, $_REQUEST['command'], $_REQUEST['rate']+32768 );
break; break;
case CMD_ZOOMIN : case CMD_ZOOMIN :
ZM\Logger::Debug( 'Zooming to '.$_REQUEST['x'].",".$_REQUEST['y'] ); ZM\Logger::Debug( 'Zooming to '.$_REQUEST['x'].','.$_REQUEST['y'] );
$msg = pack( 'lcnn', MSG_CMD, $_REQUEST['command'], $_REQUEST['x'], $_REQUEST['y'] ); $msg = pack( 'lcnn', MSG_CMD, $_REQUEST['command'], $_REQUEST['x'], $_REQUEST['y'] );
break; break;
case CMD_PAN : case CMD_PAN :
ZM\Logger::Debug( 'Panning to '.$_REQUEST['x'].",".$_REQUEST['y'] ); ZM\Logger::Debug( 'Panning to '.$_REQUEST['x'].','.$_REQUEST['y'] );
$msg = pack( 'lcnn', MSG_CMD, $_REQUEST['command'], $_REQUEST['x'], $_REQUEST['y'] ); $msg = pack( 'lcnn', MSG_CMD, $_REQUEST['command'], $_REQUEST['x'], $_REQUEST['y'] );
break; break;
case CMD_SCALE : case CMD_SCALE :

6
web/includes/functions.php
View File

@ -1050,9 +1050,15 @@ function parseSort( $saveToSession=false, $querySep='&' ) {
case 'StartTime' : case 'StartTime' :
$sortColumn = 'E.StartTime'; $sortColumn = 'E.StartTime';
break; break;
case 'StartDateTime' :
$sortColumn = 'E.StartTime';
break;
case 'EndTime' : case 'EndTime' :
$sortColumn = 'E.EndTime'; $sortColumn = 'E.EndTime';
break; break;
case 'EndDateTime' :
$sortColumn = 'E.EndTime';
break;
case 'Length' : case 'Length' :
$sortColumn = 'E.Length'; $sortColumn = 'E.Length';
break; break;