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

10
web/ajax/status.php
View File

@ -193,7 +193,7 @@ function collectData() {
$entitySpec = &$statusData[strtolower(validJsStr($_REQUEST['entity']))];
#print_r( $entitySpec );
if ( !canView( $entitySpec['permission'] ) )
ajaxError( 'Unrecognised action or insufficient permissions' );
ajaxError('Unrecognised action or insufficient permissions');
if ( !empty($entitySpec['func']) ) {
$data = eval( 'return( '.$entitySpec['func']." );" );
@ -398,9 +398,9 @@ function getNearEvents() {
global $user, $sortColumn, $sortOrder;
$eventId = $_REQUEST['id'];
$event = dbFetchOne( 'SELECT * FROM Events WHERE Id=?', NULL, array( $eventId ) );
$event = dbFetchOne('SELECT * FROM Events WHERE Id=?', NULL, array($eventId));
parseFilter( $_REQUEST['filter'] );
parseFilter($_REQUEST['filter']);
parseSort();
if ( $user['MonitorIds'] )
@ -419,8 +419,8 @@ function getNearEvents() {
$sql .= ', E.Id DESC';
}
$sql .= ' LIMIT 1';
$result = dbQuery( $sql );
$prevEvent = dbFetchNext( $result );
$result = dbQuery($sql);
$prevEvent = dbFetchNext($result);
$sql = "SELECT E.Id AS Id, E.StartTime AS StartTime FROM Events AS E INNER JOIN Monitors AS M ON E.MonitorId = M.Id WHERE $sortColumn ".($sortOrder=='asc'?'>=':'<=')." '".$event[$_REQUEST['sort_field']]."'".$_REQUEST['filter']['sql'].$midSql.' AND E.Id>'.$event['Id'] . " ORDER BY $sortColumn $sortOrder";
if ( $sortColumn != 'E.Id' ) {

16
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 );
break;
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'] );
break;
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'] );
break;
case CMD_SCALE :
@ -131,7 +131,7 @@ if ( sem_acquire($semaphore,1) !== false ) {
$data['auth'] = generateAuthHash(ZM_AUTH_HASH_IPS);
}
}
ajaxResponse( array( 'status'=>$data ) );
ajaxResponse(array('status'=>$data));
break;
case MSG_DATA_EVENT :
if ( version_compare( phpversion(), '5.6.0', '<') ) {
@ -158,16 +158,16 @@ if ( sem_acquire($semaphore,1) !== false ) {
sem_release($semaphore);
} else {
ZM\Logger::Debug("Couldn't get semaphore");
ajaxResponse( array() );
ajaxResponse(array());
}
ajaxError('Unrecognised action or insufficient permissions in ajax/stream');
function ajaxCleanup() {
global $socket, $localSocketFile;
if ( !empty( $socket ) )
@socket_close( $socket );
if ( !empty( $localSocketFile ) )
@unlink( $localSocketFile );
if ( !empty($socket) )
@socket_close($socket);
if ( !empty($localSocketFile) )
@unlink($localSocketFile);
}
?>

6
web/includes/functions.php
View File

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