From 08ffd939a7530c44cd68b455f75175f79698073c Mon Sep 17 00:00:00 2001 From: alecpl <alec@alec.pl> Date: Thu, 29 Dec 2011 04:35:01 -0500 Subject: [PATCH] - Add separate pagesize setting for mail messages and contacts (#1488269) --- program/steps/addressbook/delete.inc | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/program/steps/addressbook/delete.inc b/program/steps/addressbook/delete.inc index 222535c..30e0ca1 100644 --- a/program/steps/addressbook/delete.inc +++ b/program/steps/addressbook/delete.inc @@ -103,20 +103,20 @@ // create resultset object $count = count($records); - $first = ($page-1) * $CONFIG['pagesize']; + $first = ($page-1) * $PAGE_SIZE; $result = new rcube_result_set($count, $first); // get records from the next page to add to the list - $pages = ceil((count($records) + $delcnt) / $CONFIG['pagesize']); + $pages = ceil((count($records) + $delcnt) / $PAGE_SIZE); if ($_GET['_from'] != 'show' && $pages > 1 && $page < $pages) { // sort the records ksort($records, SORT_LOCALE_STRING); - $first += $CONFIG['pagesize']; + $first += $PAGE_SIZE; // create resultset object $res = new rcube_result_set($count, $first - $delcnt); - if ($CONFIG['pagesize'] < $count) { + if ($PAGE_SIZE < $count) { $records = array_slice($records, $first - $delcnt, $delcnt); } @@ -132,7 +132,7 @@ $result = $CONTACTS->count(); // get records from the next page to add to the list - $pages = ceil(($result->count + $delcnt) / $CONFIG['pagesize']); + $pages = ceil(($result->count + $delcnt) / $PAGE_SIZE); if ($_GET['_from'] != 'show' && $pages > 1 && $page < $pages) { $CONTACTS->set_page($page); $records = $CONTACTS->list_records(null, -$delcnt); @@ -140,7 +140,7 @@ } // update message count display -$OUTPUT->set_env('pagecount', ceil($result->count / $CONFIG['pagesize'])); +$OUTPUT->set_env('pagecount', ceil($result->count / $PAGE_SIZE)); $OUTPUT->command('set_rowcount', rcmail_get_rowcount_text($result)); if (!empty($_SESSION['contact_undo'])) { -- Gitblit v1.9.1