mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-05-19 03:56:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup filter loading. If filter query exists in query params, use that instead of loading from db

Browse Source
This commit is contained in:
Isaac Connor
2026-01-27 15:19:43 -05:00
parent 687003f67d
commit faa35e7c45
1 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
web/skins/classic/views/filter.php
View File

@@ -32,39 +32,42 @@ require_once('includes/User.php');
parseSort();
$filterNames = array(''=>translate('ChooseFilter'));
$filter = NULL;
# Get filter ID from request
$fid = 0;
if ( isset($_REQUEST['Id']) and $_REQUEST['Id'] ) {
if (isset($_REQUEST['Id']) and $_REQUEST['Id']) {
$fid = validInt($_REQUEST['Id']);
} else if ( isset($_REQUEST['filter']) and isset($_REQUEST['filter']['Id']) ) {
# $_REQUEST['filter']['Id'] get used later in populating filter object, so need to sanitise it
} else if (isset($_REQUEST['filter']['Id'])) {
$fid = $_REQUEST['filter']['Id'] = validInt($_REQUEST['filter']['Id']);
}
$filter = null;
foreach ( ZM\Filter::find(null,array('order'=>'lower(Name)')) as $Filter ) {
# Build filter names list for dropdown
foreach (ZM\Filter::find(null, array('order'=>'lower(Name)')) as $Filter) {
$filterNames[$Filter->Id()] = (defined('ZM_WEB_ID_ON_FILTER') and ZM_WEB_ID_ON_FILTER) ? $Filter->Id() . ' ' . $Filter->Name() : $Filter->Name();
if ( $Filter->Background() )
$filterNames[$Filter->Id()] .= '*';
if ( $Filter->Concurrent() )
$filterNames[$Filter->Id()] .= '&';
if ( $fid == $Filter->Id() ) {
$filter = $Filter;
}
if ($Filter->Background()) $filterNames[$Filter->Id()] .= '*';
if ($Filter->Concurrent()) $filterNames[$Filter->Id()] .= '&';
}
if ( !$filter ) {
# Determine how to populate the filter:
# - If we have Query data in request (e.g. from back button), use that instead of DB
# - Otherwise load from DB if we have a matching ID
# - Otherwise create empty filter with default term
$have_query_params = isset($_REQUEST['filter']['Query']);
if ($have_query_params) {
ZM\Debug('Populating filter from query params');
$filter = new ZM\Filter();
$filter->addTerm(array('cnj'=>'and', 'attr'=>'Id', 'op'=> '=', 'val'=>''));
$filter->set($_REQUEST['filter']);
} else if ($fid and isset($filterNames[$fid])) {
ZM\Debug("Loading filter $fid from database");
$filter = ZM\Filter::find_one(array('Id'=>$fid));
} else {
ZM\Debug('Creating new empty filter');
$filter = new ZM\Filter();
$filter->addTerm(array('cnj'=>'and', 'attr'=>'Id', 'op'=>'=', 'val'=>''));
}
ZM\Debug('filter: ' . print_r($filter,true));
if ( isset($_REQUEST['filter']) ) {
# Update our filter object with whatever changes we have made before saving
$filter->set($_REQUEST['filter']);
ZM\Debug("Setting filter from " . print_r($_REQUEST['filter'], true));
}
ZM\Debug('filter: ' . print_r($filter,true));
ZM\Debug('filter: ' . print_r($filter, true));
$conjunctionTypes = ZM\getFilterQueryConjunctionTypes();