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

fix quotes

This commit is contained in:
Isaac Connor 2017-07-21 10:54:33 -04:00
parent ee7d714d59
commit 457d909c88
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
web/skins/classic/views/console.php
View File

@ -51,7 +51,7 @@ $eventCounts = array(
'filter' => array( 'filter' => array(
'Query' => array( 'Query' => array(
'terms' => array( 'terms' => array(
array( 'attr' => "DateTime", 'op' => '>=', 'val' => '-1 day' ), array( 'attr' => 'DateTime', 'op' => '>=', 'val' => '-1 day' ),
) )
) )
), ),
@ -62,7 +62,7 @@ $eventCounts = array(
'filter' => array( 'filter' => array(
'Query' => array( 'Query' => array(
'terms' => array( 'terms' => array(
array( 'attr' => "DateTime", 'op' => '>=', 'val' => '-7 day' ), array( 'attr' => 'DateTime', 'op' => '>=', 'val' => '-7 day' ),
) )
) )
), ),
@ -73,7 +73,7 @@ $eventCounts = array(
'filter' => array( 'filter' => array(
'Query' => array( 'Query' => array(
'terms' => array( 'terms' => array(
array( 'attr' => "DateTime", 'op' => '>=', 'val' => '-1 month' ), array( 'attr' => 'DateTime', 'op' => '>=', 'val' => '-1 month' ),
) )
) )
), ),
@ -84,7 +84,7 @@ $eventCounts = array(
'filter' => array( 'filter' => array(
'Query' => array( 'Query' => array(
'terms' => array( 'terms' => array(
array( 'attr' => "Archived", 'op' => '=', 'val' => '1' ), array( 'attr' => 'Archived', 'op' => '=', 'val' => '1' ),
) )
) )
), ),
@ -107,7 +107,7 @@ for( $i = 0; $i < count($displayMonitors); $i += 1 ) {
for ( $j = 0; $j < count($eventCounts); $j += 1 ) { for ( $j = 0; $j < count($eventCounts); $j += 1 ) {
$filter = addFilterTerm( $eventCounts[$j]['filter'], count($eventCounts[$j]['filter']['Query']['terms']), array( 'cnj' => 'and', 'attr' => 'MonitorId', 'op' => '=', 'val' => $monitor['Id'] ) ); $filter = addFilterTerm( $eventCounts[$j]['filter'], count($eventCounts[$j]['filter']['Query']['terms']), array( 'cnj' => 'and', 'attr' => 'MonitorId', 'op' => '=', 'val' => $monitor['Id'] ) );
parseFilter( $filter ); parseFilter( $filter );
$counts[] = "count(if(1".$filter['sql'].",1,NULL)) as EventCount$j"; $counts[] = 'count(if(1'.$filter['sql'].",1,NULL)) as EventCount$j";
$monitor['eventCounts'][$j]['filter'] = $filter; $monitor['eventCounts'][$j]['filter'] = $filter;
} }
$sql = 'select '.join($counts,', ').' from Events as E where MonitorId = ?'; $sql = 'select '.join($counts,', ').' from Events as E where MonitorId = ?';