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

rename var from nevents to nFrames because that's what they are. Fix an error when page=0

pull/2661/head
Isaac Connor 2019-07-07 16:03:54 -04:00
parent 4c306fb140
commit 3c1cd1e750
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,7 +28,6 @@ require_once('includes/Frame.php');
$countSql = 'SELECT COUNT(*) AS FrameCount FROM Frames AS F WHERE 1 '; $countSql = 'SELECT COUNT(*) AS FrameCount FROM Frames AS F WHERE 1 ';
$frameSql = 'SELECT *, unix_timestamp( TimeStamp ) AS UnixTimeStamp FROM Frames AS F WHERE 1 '; $frameSql = 'SELECT *, unix_timestamp( TimeStamp ) AS UnixTimeStamp FROM Frames AS F WHERE 1 ';
$eid = $_REQUEST['eid'];
// override the sort_field handling in parseSort for frames // override the sort_field handling in parseSort for frames
if ( empty($_REQUEST['sort_field']) ) if ( empty($_REQUEST['sort_field']) )
@ -59,6 +58,7 @@ if ( $_REQUEST['filter']['sql'] ) {
$frameSql .= " ORDER BY $sortColumn $sortOrder,Id $sortOrder"; $frameSql .= " ORDER BY $sortColumn $sortOrder,Id $sortOrder";
$eid = validInt($_REQUEST['eid']);
$Event = new ZM\Event($eid); $Event = new ZM\Event($eid);
$Monitor = $Event->Monitor(); $Monitor = $Event->Monitor();
@ -75,22 +75,22 @@ 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;
$nEvents = dbFetchOne($countSql, 'FrameCount' ); $nFrames = dbFetchOne($countSql, 'FrameCount' );
if ( !empty($limit) && $nEvents > $limit ) { if ( !empty($limit) && ($nFrames > $limit) ) {
$nEvents = $limit; $nFrames = $limit;
} }
$pages = (int)ceil($nEvents/ZM_WEB_EVENTS_PER_PAGE); $pages = (int)ceil($nFrames/ZM_WEB_EVENTS_PER_PAGE);
if ( !empty($page) ) { if ( !empty($page) ) {
if ( $page < 0 ) if ( $page <= 0 )
$page = 1; $page = 1;
else if ( $pages and ( $page > $pages ) ) else if ( $pages and ( $page > $pages ) )
$page = $pages; $page = $pages;
$limitStart = (($page-1)*ZM_WEB_EVENTS_PER_PAGE); $limitStart = (($page-1)*ZM_WEB_EVENTS_PER_PAGE);
if ( empty( $limit ) ) { if ( empty($limit) ) {
$limitAmount = ZM_WEB_EVENTS_PER_PAGE; $limitAmount = ZM_WEB_EVENTS_PER_PAGE;
} else { } else {
$limitLeft = $limit - $limitStart; $limitLeft = $limit - $limitStart;
@ -104,7 +104,7 @@ if ( !empty($page) ) {
$maxShortcuts = 5; $maxShortcuts = 5;
$pagination = getPagination($pages, $page, $maxShortcuts, $sortQuery.'&eid='.$eid.$limitQuery.$filterQuery); $pagination = getPagination($pages, $page, $maxShortcuts, $sortQuery.'&eid='.$eid.$limitQuery.$filterQuery);
$frames = dbFetchAll( $frameSql ); $frames = dbFetchAll($frameSql);
$focusWindow = true; $focusWindow = true;