Permalink
Browse files

- Add option to hide selected LDAP addressbook on the list

  • Loading branch information...
1 parent fe0cb65 commit 5c9d1ffe8eb4d53c378720e745e54f2a4bdecb28 @alecpl alecpl committed Aug 16, 2011
Showing with 23 additions and 11 deletions.
  1. +1 −0 CHANGELOG
  2. +3 −0 config/main.inc.php.dist
  3. +9 −7 program/include/rcmail.php
  4. +10 −4 program/steps/addressbook/func.inc
View
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- Add option to hide selected LDAP addressbook on the list
- Add client-side checking of uploaded files size
- Add newlines between organization, department, jobtitle (#1488028)
- Recalculate date when replying to a message and localize the cite header (#1487675)
View
@@ -513,6 +513,9 @@ $rcmail_config['ldap_public']['Verisign'] = array(
'auth_cid' => '',
// SASL authentication method (for proxy auth), e.g. DIGEST-MD5
'auth_method' => '',
+ // Indicates if the addressbook shall be displayed on the list.
+ // With this option enabled you can still search/view contacts.
+ 'hidden' => false,
// Indicates if we can write to the LDAP directory or not.
// If writable is true then these fields need to be populated:
// LDAP_Object_Classes, required_fields, LDAP_rdn
View
@@ -439,6 +439,7 @@ public function get_address_book($id, $writeable = false)
* Return address books list
*
* @param boolean True if the address book needs to be writeable
+ *
* @return array Address books array
*/
public function get_address_sources($writeable = false)
@@ -453,9 +454,9 @@ public function get_address_sources($writeable = false)
if (!isset($this->address_books['0']))
$this->address_books['0'] = new rcube_contacts($this->db, $this->user->ID);
$list['0'] = array(
- 'id' => '0',
- 'name' => rcube_label('personaladrbook'),
- 'groups' => $this->address_books['0']->groups,
+ 'id' => '0',
+ 'name' => rcube_label('personaladrbook'),
+ 'groups' => $this->address_books['0']->groups,
'readonly' => $this->address_books['0']->readonly,
'autocomplete' => in_array('sql', $autocomplete)
);
@@ -465,11 +466,12 @@ public function get_address_sources($writeable = false)
$ldap_config = (array) $ldap_config;
foreach ($ldap_config as $id => $prop)
$list[$id] = array(
- 'id' => $id,
- 'name' => $prop['name'],
- 'groups' => is_array($prop['groups']),
+ 'id' => $id,
+ 'name' => $prop['name'],
+ 'groups' => is_array($prop['groups']),
'readonly' => !$prop['writable'],
- 'autocomplete' => in_array('sql', $autocomplete)
+ 'hidden' => $prop['hidden'],
+ 'autocomplete' => in_array($id, $autocomplete)
);
}
@@ -68,12 +68,18 @@ if (!$RCMAIL->action && !$OUTPUT->ajax_call) {
if (!strlen($source) || !isset($js_list[$source]))
$source = $js_list[key($js_list)]['id'];
- // count writeable sources
+ // count all/writeable sources
$writeable = 0;
- foreach ($js_list as $s) {
+ $count = 0;
+ foreach ($js_list as $sid => $s) {
+ $count++;
if (!$s['readonly']) {
$writeable++;
}
+ // unset hidden sources
+ if ($s['hidden']) {
+ unset($js_list[$sid]);
+ }
}
$search_mods = $RCMAIL->config->get('addressbook_search_mods', $SEARCH_MODS_DEFAULT);
@@ -82,9 +88,9 @@ if (!$RCMAIL->action && !$OUTPUT->ajax_call) {
$OUTPUT->set_env('writable_source', $writeable);
$OUTPUT->set_pagetitle(rcube_label('addressbook'));
- $_SESSION['addressbooks_count'] = count($js_list);
+ $_SESSION['addressbooks_count'] = $count;
$_SESSION['addressbooks_count_writeable'] = $writeable;
-
+
if (!strlen($source))
$source = strval(key($js_list));

0 comments on commit 5c9d1ff

Please sign in to comment.