diff options
Diffstat (limited to 'program/include')
| -rw-r--r-- | program/include/rcmail.php | 4 | ||||
| -rw-r--r-- | program/include/rcube_addressbook.php | 19 | ||||
| -rw-r--r-- | program/include/rcube_contacts.php | 15 | ||||
| -rw-r--r-- | program/include/rcube_ldap.php | 26 | ||||
| -rw-r--r-- | program/include/rcube_mdb2.php | 2 |
5 files changed, 44 insertions, 22 deletions
diff --git a/program/include/rcmail.php b/program/include/rcmail.php index 5965099c9..1c34759e6 100644 --- a/program/include/rcmail.php +++ b/program/include/rcmail.php @@ -452,6 +452,10 @@ class rcmail true, true); } + // set configured sort order + if ($sort_col = $this->config->get('addressbook_sort_col')) + $contacts->set_sort_order($sort_col); + // add to the 'books' array for shutdown function $this->address_books[$id] = $contacts; diff --git a/program/include/rcube_addressbook.php b/program/include/rcube_addressbook.php index f7a526885..308aee4f5 100644 --- a/program/include/rcube_addressbook.php +++ b/program/include/rcube_addressbook.php @@ -5,7 +5,7 @@ | program/include/rcube_addressbook.php | | | | This file is part of the Roundcube Webmail client | - | Copyright (C) 2006-2011, The Roundcube Dev Team | + | Copyright (C) 2006-2012, The Roundcube Dev Team | | | | Licensed under the GNU General Public License version 3 or | | any later version with exceptions for skins & plugins. | @@ -47,6 +47,8 @@ abstract class rcube_addressbook public $group_id = null; public $list_page = 1; public $page_size = 10; + public $sort_col = 'name'; + public $sort_order = 'ASC'; public $coltypes = array('name' => array('limit'=>1), 'firstname' => array('limit'=>1), 'surname' => array('limit'=>1), 'email' => array('limit'=>1)); protected $error; @@ -183,6 +185,21 @@ abstract class rcube_addressbook $this->page_size = (int)$size; } + /** + * Set internal sort settings + * + * @param string $sort_col Sort column + * @param string $sort_order Sort order + */ + function set_sort_order($sort_col, $sort_order = null) + { + if ($sort_col != null && ($this->coltypes[$sort_col] || in_array($sort_col, $this->coltypes))) { + $this->sort_col = $sort_col; + } + if ($sort_order != null) { + $this->sort_order = strtoupper($sort_order) == 'DESC' ? 'DESC' : 'ASC'; + } + } /** * Check the given data before saving. diff --git a/program/include/rcube_contacts.php b/program/include/rcube_contacts.php index 1cfebb503..1a4950d84 100644 --- a/program/include/rcube_contacts.php +++ b/program/include/rcube_contacts.php @@ -5,7 +5,7 @@ | program/include/rcube_contacts.php | | | | This file is part of the Roundcube Webmail client | - | Copyright (C) 2006-2011, The Roundcube Dev Team | + | Copyright (C) 2006-2012, The Roundcube Dev Team | | | | Licensed under the GNU General Public License version 3 or | | any later version with exceptions for skins & plugins. | @@ -217,6 +217,16 @@ class rcube_contacts extends rcube_addressbook $join = " LEFT JOIN ".get_table_name($this->db_groupmembers)." AS m". " ON (m.contact_id = c.".$this->primary_key.")"; + $order_col = (in_array($this->sort_col, $this->table_cols) ? $this->sort_col : 'name'); + $order_cols = array('c.'.$order_col); + if ($order_col == 'firstname') + $order_cols[] = 'c.surname'; + else if ($order_col == 'surname') + $order_cols[] = 'c.firstname'; + if ($order_col != 'name') + $order_cols[] = 'c.name'; + $order_cols[] = 'c.email'; + $sql_result = $this->db->limitquery( "SELECT * FROM ".get_table_name($this->db_name)." AS c" . $join . @@ -224,7 +234,8 @@ class rcube_contacts extends rcube_addressbook " AND c.user_id=?" . ($this->group_id ? " AND m.contactgroup_id=?" : ""). ($this->filter ? " AND (".$this->filter.")" : "") . - " ORDER BY ". $this->db->concat('c.name', 'c.email'), + " ORDER BY ". $this->db->concat($order_cols) . + " " . $this->sort_order, $start_row, $length, $this->user_id, diff --git a/program/include/rcube_ldap.php b/program/include/rcube_ldap.php index 0d7b7d5c2..c3893d84c 100644 --- a/program/include/rcube_ldap.php +++ b/program/include/rcube_ldap.php @@ -4,7 +4,7 @@ | program/include/rcube_ldap.php | | | | This file is part of the Roundcube Webmail client | - | Copyright (C) 2006-2011, The Roundcube Dev Team | + | Copyright (C) 2006-2012, The Roundcube Dev Team | | Copyright (C) 2011, Kolab Systems AG | | | | Licensed under the GNU General Public License version 3 or | @@ -38,8 +38,6 @@ class rcube_ldap extends rcube_addressbook public $readonly = true; public $ready = false; public $group_id = 0; - public $list_page = 1; - public $page_size = 10; public $coltypes = array(); /** private properties */ @@ -50,7 +48,6 @@ class rcube_ldap extends rcube_addressbook protected $filter = ''; protected $result = null; protected $ldap_result = null; - protected $sort_col = ''; protected $mail_domain = ''; protected $debug = false; @@ -417,24 +414,15 @@ class rcube_ldap extends rcube_addressbook /** - * Set internal list page + * Set internal sort settings * - * @param number $page Page number to list + * @param string $sort_col Sort column + * @param string $sort_order Sort order */ - function set_page($page) + function set_sort_order($sort_col, $sort_order = null) { - $this->list_page = (int)$page; - } - - - /** - * Set internal page size - * - * @param number $size Number of messages to display on one page - */ - function set_pagesize($size) - { - $this->page_size = (int)$size; + if ($this->fieldmap[$sort_col]) + $this->sort_col = $this->fieldmap[$sort_col]; } diff --git a/program/include/rcube_mdb2.php b/program/include/rcube_mdb2.php index 5fd620f17..c103f9a61 100644 --- a/program/include/rcube_mdb2.php +++ b/program/include/rcube_mdb2.php @@ -636,6 +636,8 @@ class rcube_mdb2 { $func = ''; $args = func_get_args(); + if (is_array($args[0])) + $args = $args[0]; switch($this->db_provider) { case 'mysql': |