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

handle sort_asc not being set. Handle term['val'] not being set.

pull/2910/head
Isaac Connor 2020-04-10 11:13:30 -04:00
parent a25c3dfb5c
commit 2d748091a2
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
web/includes/functions.php
View File

@ -1065,7 +1065,7 @@ function parseSort($saveToSession=false, $querySep='&') {
$sortColumn = 'E.StartTime';
break;
}
if ( !$_REQUEST['sort_asc'] )
if ( !isset($_REQUEST['sort_asc']) )
$_REQUEST['sort_asc'] = 0;
$sortOrder = $_REQUEST['sort_asc'] ? 'asc' : 'desc';
$sortQuery = $querySep.'sort_field='.validHtmlStr($_REQUEST['sort_field']).$querySep.'sort_asc='.validHtmlStr($_REQUEST['sort_asc']);
@ -1235,6 +1235,7 @@ function parseFilter(&$filter, $saveToSession=false, $querySep='&') {
break;
}
$valueList = array();
if ( !isset($term['val']) ) $term['val'] = '';
foreach ( preg_split('/["\'\s]*?,["\'\s]*?/', preg_replace('/^["\']+?(.+)["\']+?$/', '$1', $term['val'])) as $value ) {
switch ( $term['attr'] ) {