summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2011-10-06 12:31:38 +0000
committerthomascube <thomas@roundcube.net>2011-10-06 12:31:38 +0000
commite2a8b4dd6d6d2160fcb6b03a54da848478eb9c75 (patch)
tree2475d1c7427c08c53a6e32893ac5a2534880ccba
parent66a7c100847dd3a712f3377d9996cf5e9024b3e3 (diff)
Skip VLV if a group is selected; show advanced search form if activating a 'searchonly' address book
-rw-r--r--program/include/rcube_ldap.php2
-rw-r--r--program/steps/addressbook/list.inc4
2 files changed, 4 insertions, 2 deletions
diff --git a/program/include/rcube_ldap.php b/program/include/rcube_ldap.php
index d1a6c802e..97b0e7ee2 100644
--- a/program/include/rcube_ldap.php
+++ b/program/include/rcube_ldap.php
@@ -934,7 +934,7 @@ class rcube_ldap extends rcube_addressbook
$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);
diff --git a/program/steps/addressbook/list.inc b/program/steps/addressbook/list.inc
index 313b52ea1..b4b7306a6 100644
--- a/program/steps/addressbook/list.inc
+++ b/program/steps/addressbook/list.inc
@@ -74,8 +74,10 @@ else {
// 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