Changeset 5c9d1ff in github

Timestamp:

Aug 16, 2011 9:41:52 AM (21 months ago)

Author:

alecpl <alec@…>

Branches:

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

Children:

5c2ac5f

Parents:

fe0cb65

Message:

• Add option to hide selected LDAP addressbook on the list

Files:

• CHANGELOG (modified) (1 diff)
• config/main.inc.php.dist (modified) (1 diff)
• program/include/rcmail.php (modified) (3 diffs)
• program/steps/addressbook/func.inc (modified) (2 diffs)

CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- 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)

config/main.inc.php.dist

@@ -514 +514 @@
   // 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:

program/include/rcmail.php

@@ -440 +440 @@
    *
    * @param boolean True if the address book needs to be writeable
+   *
    * @return array  Address books array
    */
@@ -454 +455 @@
         $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)
@@ -466 +467 @@
       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)
         );
     }

program/steps/addressbook/func.inc

@@ -69 +69 @@
         $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]);
         }
     }
@@ -83 +89 @@
 
     $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));