Skip VLV if a group is selected; show advanced search form if activating a ...

thomascube

2011-10-06 e2a8b4dd6d6d2160fcb6b03a54da848478eb9c75

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

 program/include/rcube_ldap.php

@@ -934,7 +934,7 @@
            $this->_debug("C: Search [$filter]");

            // 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))) {
                    $counts = ldap_get_entries($this->conn, $result_count);

 program/steps/addressbook/list.inc

@@ -74,8 +74,10 @@
    // get contacts for this user
    $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');
    }
}

// update message count display