Changeset 5662 in subversion for trunk/roundcubemail/program/steps/addressbook/func.inc

Timestamp:

Dec 29, 2011 4:35:01 AM (17 months ago)

Author:

alec

Message:

• Add separate pagesize setting for mail messages and contacts (#1488269)

File:

• trunk/roundcubemail/program/steps/addressbook/func.inc (modified) (5 diffs)

trunk/roundcubemail/program/steps/addressbook/func.inc

@@ -57 +57 @@
 );
 
+$PAGE_SIZE = $RCMAIL->config->get('addressbook_pagesize');
+if (!$PAGE_SIZE) {
+    $PAGE_SIZE = $RCMAIL->config->get('pagesize', 50);
+}
 
 // Addressbook UI
@@ -109 +113 @@
 function rcmail_contact_source($source=null, $init_env=false, $writable=false)
 {
-    global $RCMAIL, $OUTPUT, $CONFIG, $CONTACT_COLTYPES;
+    global $RCMAIL, $OUTPUT, $CONTACT_COLTYPES, $PAGE_SIZE;
 
     if (!strlen($source)) {
@@ -117 +121 @@
     // Get object
     $CONTACTS = $RCMAIL->get_address_book($source, $writable);
-    $CONTACTS->set_pagesize($CONFIG['pagesize']);
+    $CONTACTS->set_pagesize($PAGE_SIZE);
 
     // set list properties and session vars
@@ -392 +396 @@
 function rcmail_get_rowcount_text($result=null)
 {
-    global $CONTACTS, $CONFIG;
+    global $CONTACTS, $PAGE_SIZE;
 
     // read nr of contacts
@@ -406 +410 @@
             'vars'  => array(
             'from'  => $result->first + 1,
-            'to'    => min($result->count, $result->first + $CONFIG['pagesize']),
+            'to'    => min($result->count, $result->first + $PAGE_SIZE),
             'count' => $result->count)
         ));