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

fix spacing

This commit is contained in:
Isaac Connor 2019-08-08 13:34:28 -04:00
parent df285006d2
commit 45b970fb09
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web/skins/classic/views/frames.php
View File

@ -39,7 +39,7 @@ if ( empty($_REQUEST['sort_field']) )
if ( !isset($_REQUEST['sort_asc']) ) if ( !isset($_REQUEST['sort_asc']) )
$_REQUEST['sort_asc'] = true; $_REQUEST['sort_asc'] = true;
if( ! isset($_REQUEST['filter'])){ if ( ! isset($_REQUEST['filter'])){
// generate a dummy filter from the eid for pagination // generate a dummy filter from the eid for pagination
$_REQUEST['filter'] = array('Query' => array( 'terms' => array( ) ) ); $_REQUEST['filter'] = array('Query' => array( 'terms' => array( ) ) );
$_REQUEST['filter'] = addFilterTerm( $_REQUEST['filter'] = addFilterTerm(
@ -53,7 +53,6 @@ parseSort();
parseFilter($_REQUEST['filter']); parseFilter($_REQUEST['filter']);
$filterQuery = $_REQUEST['filter']['query']; $filterQuery = $_REQUEST['filter']['query'];
if ( $_REQUEST['filter']['sql'] ) { if ( $_REQUEST['filter']['sql'] ) {
$countSql .= $_REQUEST['filter']['sql']; $countSql .= $_REQUEST['filter']['sql'];
$frameSql .= $_REQUEST['filter']['sql']; $frameSql .= $_REQUEST['filter']['sql'];
@ -61,7 +60,6 @@ if ( $_REQUEST['filter']['sql'] ) {
$frameSql .= " ORDER BY $sortColumn $sortOrder,Id $sortOrder"; $frameSql .= " ORDER BY $sortColumn $sortOrder,Id $sortOrder";
if ( isset( $_REQUEST['scale'] ) ) { if ( isset( $_REQUEST['scale'] ) ) {
$scale = validNum($_REQUEST['scale']); $scale = validNum($_REQUEST['scale']);
} else if ( isset( $_COOKIE['zmWatchScale'.$Monitor->Id()] ) ) { } else if ( isset( $_COOKIE['zmWatchScale'.$Monitor->Id()] ) ) {
@ -75,7 +73,7 @@ if ( isset( $_REQUEST['scale'] ) ) {
$page = isset($_REQUEST['page']) ? validInt($_REQUEST['page']) : 1; $page = isset($_REQUEST['page']) ? validInt($_REQUEST['page']) : 1;
$limit = isset($_REQUEST['limit']) ? validInt($_REQUEST['limit']) : 0; $limit = isset($_REQUEST['limit']) ? validInt($_REQUEST['limit']) : 0;
$nFrames = dbFetchOne($countSql, 'FrameCount' ); $nFrames = dbFetchOne($countSql, 'FrameCount');
if ( !empty($limit) && ($nFrames > $limit) ) { if ( !empty($limit) && ($nFrames > $limit) ) {
$nFrames = $limit; $nFrames = $limit;