Changeset 5315 in subversion

Timestamp:

Oct 6, 2011 8:31:38 AM (20 months ago)

Author:

thomasb

Message:

Skip VLV if a group is selected; show advanced search form if activating a 'searchonly' address book

Location:

trunk/roundcubemail/program

Files:

• include/rcube_ldap.php (modified) (1 diff)
• steps/addressbook/list.inc (modified) (1 diff)

trunk/roundcubemail/program/include/rcube_ldap.php

@@ -935 +935 @@
 
             // when using VLV, we get the total count by...
-            if (!$count && $function != 'ldap_read' && $this->prop['vlv']) {
+            if (!$count && $function != 'ldap_read' && $this->prop['vlv'] && !$this->group_id) {
                 // ...either reading numSubOrdinates attribute
                 if ($this->prop['numsub_filter'] && ($result_count = @$function($this->conn, $this->base_dn, $this->prop['numsub_filter'], array('numSubOrdinates'), 0, 0, 0))) {

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

@@ -75 +75 @@
     $result = $CONTACTS->list_records(array('name'));
     
-    if (!$result->count && $result->searchonly)
+    if (!$result->count && $result->searchonly) {
         $OUTPUT->show_message('contactsearchonly', 'notice');
+        $OUTPUT->command('command', 'advanced-search');
+    }
 }