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

Bug 303 - Fixed paging issue when deleting last page of events. 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1906 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan 2006-03-31 13:42:31 +00:00
parent 8b4ba55581
commit 655999fa82
1 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
web/zm_html_view_events.php
View File

@ -46,25 +46,6 @@ if ( $filter_sql )
$events_sql .= $filter_sql;
}
$events_sql .= " order by $sort_column $sort_order";
if ( $page )
{
$limit_start = (($page-1)*ZM_WEB_EVENTS_PER_PAGE);
if ( empty( $limit ) )
{
$limit_amount = ZM_WEB_EVENTS_PER_PAGE;
}
else
{
$limit_left = $limit - $limit_start;
$limit_amount = ($limit_left>ZM_WEB_EVENTS_PER_PAGE)?ZM_WEB_EVENTS_PER_PAGE:$limit_left;
}
$events_sql .= " limit $limit_start, $limit_amount";
}
elseif ( !empty( $limit ) )
{
$events_sql .= " limit 0, $limit";
}
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
@ -119,6 +100,36 @@ else
{
$n_events = $limit;
}
$pages = (int)ceil($n_events/ZM_WEB_EVENTS_PER_PAGE);
if ( $pages > 1 )
{
if ( $page )
{
if ( $page < 0 )
$page = 1;
if ( $page > $pages )
$page = $pages;
}
}
if ( $page )
{
$limit_start = (($page-1)*ZM_WEB_EVENTS_PER_PAGE);
if ( empty( $limit ) )
{
$limit_amount = ZM_WEB_EVENTS_PER_PAGE;
}
else
{
$limit_left = $limit - $limit_start;
$limit_amount = ($limit_left>ZM_WEB_EVENTS_PER_PAGE)?ZM_WEB_EVENTS_PER_PAGE:$limit_left;
}
$events_sql .= " limit $limit_start, $limit_amount";
}
elseif ( !empty( $limit ) )
{
$events_sql .= " limit 0, $limit";
}
if ( !($result = mysql_query( $events_sql )) )
die( mysql_error() );
$max_width = 0;