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

Use filter class

This commit is contained in:
Isaac Connor 2020-08-17 17:42:22 -04:00
parent e3fe75f21b
commit dc451cbc85
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
web/skins/classic/views/export.php
View File

@ -85,20 +85,18 @@ if ( $user['MonitorIds'] ) {
} }
if ( isset($_REQUEST['eid']) and $_REQUEST['eid'] ) { if ( isset($_REQUEST['eid']) and $_REQUEST['eid'] ) {
ZM\Logger::Debug('Loading events by single eid');
$eventsSql .= ' AND E.Id=?'; $eventsSql .= ' AND E.Id=?';
$eventsValues[] = $_REQUEST['eid']; $eventsValues[] = $_REQUEST['eid'];
} elseif ( isset($_REQUEST['eids']) and count($_REQUEST['eids']) > 0 ) { } else if ( isset($_REQUEST['eids']) and count($_REQUEST['eids']) > 0 ) {
ZM\Logger::Debug('Loading events by eids');
$eventsSql .= ' AND E.Id IN ('.implode(',', array_map(function(){return '?';}, $_REQUEST['eids'])). ')'; $eventsSql .= ' AND E.Id IN ('.implode(',', array_map(function(){return '?';}, $_REQUEST['eids'])). ')';
$eventsValues += $_REQUEST['eids']; $eventsValues += $_REQUEST['eids'];
} else if ( isset($_REQUEST['filter']) ) { } else if ( isset($_REQUEST['filter']) ) {
parseSort(); parseSort();
parseFilter($_REQUEST['filter']); $filter = Filter::parse($_REQUEST['filter']);
$filterQuery = $_REQUEST['filter']['query']; $filterQuery = $filter->querystring();
if ( $_REQUEST['filter']['sql'] ) { if ( $filter->sql() ) {
$eventsSql .= $_REQUEST['filter']['sql']; $eventsSql .= $filter->sql();
} }
$eventsSql .= " ORDER BY $sortColumn $sortOrder"; $eventsSql .= " ORDER BY $sortColumn $sortOrder";
if ( isset($_REQUEST['filter']['Query']['limit']) ) if ( isset($_REQUEST['filter']['Query']['limit']) )