Changeset fd89754 in github

Timestamp:

Jun 14, 2011 8:09:23 PM (2 years ago)

Author:

thomascube <thomas@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

ca7dda4

Parents:

ecf295f

Message:

Allow to specify multiple sort columns as array (currently only used for VLV)

File:

• program/include/rcube_ldap.php (modified) (2 diffs)

program/include/rcube_ldap.php

@@ -114 +114 @@
             $this->prop['required_fields'][$key] = $this->_attr_name(strtolower($val));
 
-        $this->sort_col = $p['sort'];
+        $this->sort_col = is_array($p['sort']) ? $p['sort'][0] : $p['sort'];
         $this->debug = $debug;
         $this->mail_domain = $mail_domain;
@@ -901 +901 @@
     private function _vlv_set_controls()
     {
-        $sort_ctrl = array('oid' => "1.2.840.113556.1.4.473",  'value' => $this->_sort_ber_encode(array($this->sort_col)));
+        $sort_ctrl = array('oid' => "1.2.840.113556.1.4.473",  'value' => $this->_sort_ber_encode((array)$this->prop['sort']));
         $vlv_ctrl  = array('oid' => "2.16.840.1.113730.3.4.9", 'value' => $this->_vlv_ber_encode(($offset = ($this->list_page-1) * $this->page_size + 1), $this->page_size), 'iscritical' => true);