Changeset 5248 in subversion

Timestamp:

Sep 20, 2011 4:09:52 AM (20 months ago)

Author:

alec

Message:

• Make group's "member" attibute name configurable

Location:

trunk/roundcubemail

Files:

• config/main.inc.php.dist (modified) (1 diff)
• program/include/rcube_ldap.php (modified) (8 diffs)

trunk/roundcubemail/config/main.inc.php.dist

@@ -589 +589 @@
   // -> in this case, assure that groups and contacts are separated due to the concernig filters! 
   'groups'        => array(
-    'base_dn'     => '',   
+    'base_dn'     => '',
     'filter'      => '(objectClass=groupOfNames)',
     'object_classes' => array("top", "groupOfNames"),
+    // name of the member attribute, e.g. uniqueMember
+    'member_attr'    => 'member',
   ),
 );

trunk/roundcubemail/program/include/rcube_ldap.php

@@ -74 +74 @@
 
         // check if groups are configured
-        if (is_array($p['groups']) and count($p['groups']))
+        if (is_array($p['groups']) && count($p['groups'])) {
             $this->groups = true;
+            // set member field
+            if (!empty($p['groups']['member_attr']))
+                $this->prop['member_attr'] = $p['groups']['member_attr'];
+            else if (empty($p['member_attr']))
+                $this->prop['member_attr'] = 'member';
+        }
 
         // fieldmap property is given
@@ -116 +122 @@
             $this->prop['required_fields'][$key] = $this->_attr_name(strtolower($val));
 
-        $this->sort_col = is_array($p['sort']) ? $p['sort'][0] : $p['sort'];
-        $this->debug = $debug;
+        $this->sort_col    = is_array($p['sort']) ? $p['sort'][0] : $p['sort'];
+        $this->debug       = $debug;
         $this->mail_domain = $mail_domain;
 
@@ -1106 +1112 @@
         $this->_debug("C: Search [$filter][dn: $base_dn]");
 
-        $res = @ldap_search($this->conn, $base_dn, $filter, array('cn','member'));
+        $res = @ldap_search($this->conn, $base_dn, $filter, array('cn', $this->prop['member_attr']));
         if ($res === false)
         {
@@ -1126 +1132 @@
                 $groups[$group_id]['ID'] = $group_id;
                 $groups[$group_id]['name'] = $group_name;
-                $groups[$group_id]['members'] = $ldap_data[$i]['member'];
+                $groups[$group_id]['members'] = $ldap_data[$i][$this->prop['member_attr']];
                 $group_sortnames[] = strtolower($group_name);
             }
@@ -1154 +1160 @@
             'objectClass' => $this->prop['groups']['object_classes'],
             'cn' => $group_name,
-            'member' => '',
+            $this->prop['member_attr'] => '',
         );
 
@@ -1248 +1254 @@
             $this->list_groups();
 
-        $base_dn = $this->groups_base_dn;
-        $group_name = $this->group_cache[$group_id]['name'];
-        $group_dn = "cn=$group_name,$base_dn";
+        $base_dn     = $this->groups_base_dn;
+        $group_name  = $this->group_cache[$group_id]['name'];
+        $member_attr = $this->prop['member_attr'];
+        $group_dn    = "cn=$group_name,$base_dn";
 
         $new_attrs = array();
         foreach (explode(",", $contact_ids) as $id)
-            $new_attrs['member'][] = self::dn_decode($id);
+            $new_attrs[$member_attr][] = self::dn_decode($id);
 
         $this->_debug("C: Add [dn: $group_dn]: ".print_r($new_attrs, true));
@@ -1283 +1290 @@
             $this->list_groups();
 
-        $base_dn = $this->groups_base_dn;
-        $group_name = $this->group_cache[$group_id]['name'];
-        $group_dn = "cn=$group_name,$base_dn";
+        $base_dn     = $this->groups_base_dn;
+        $group_name  = $this->group_cache[$group_id]['name'];
+        $member_attr = $this->prop['member_attr'];
+        $group_dn    = "cn=$group_name,$base_dn";
 
         $del_attrs = array();
         foreach (explode(",", $contact_ids) as $id)
-            $del_attrs['member'][] = self::dn_decode($id);
+            $del_attrs[$member_attr][] = self::dn_decode($id);
 
         $this->_debug("C: Delete [dn: $group_dn]: ".print_r($del_attrs, true));
@@ -1319 +1327 @@
             return array();
 
-        $base_dn = $this->groups_base_dn;
-        $contact_dn = self::dn_decode($contact_id);
-        $filter = strtr("(member=$contact_dn)", array('\\' => '\\\\'));
+        $base_dn     = $this->groups_base_dn;
+        $contact_dn  = self::dn_decode($contact_id);
+        $member_attr = $this->prop['member_attr'];
+        $filter      = strtr("($member_attr=$contact_dn)", array('\\' => '\\\\'));
 
         $this->_debug("C: Search [$filter][dn: $base_dn]");