Changeset 7551896 in github

Timestamp:

Aug 12, 2011 3:01:47 AM (22 months ago)

Author:

alecpl <alec@…>

Branches:

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

Children:

f4c3649

Parents:

a170304

Message:

• Add debug for operations on groups

File:

• program/include/rcube_ldap.php (modified) (16 diffs)

program/include/rcube_ldap.php

@@ -893 +893 @@
             $function = $this->prop['scope'] == 'sub' ? 'ldap_search' : ($this->prop['scope'] == 'base' ? 'ldap_read' : 'ldap_list');
 
-            $this->_debug("C: Search [".$filter."]");
+            $this->_debug("C: Search [$filter]");
 
             // when using VLV, we get the total count by...
@@ -906 +906 @@
                 else  // ...or by fetching all records dn and count them
                     $this->vlv_count = $this->_exec_search(true);
-                
+
                 $this->vlv_active = $this->_vlv_set_controls();
             }
@@ -1097 +1097 @@
         $filter = $this->prop['groups']['filter'];
 
+        $this->_debug("C: Search [$filter][dn: $base_dn]");
+
         $res = ldap_search($this->conn, $base_dn, $filter, array('cn','member'));
         if ($res === false)
@@ -1104 +1106 @@
             return array();
         }
+
         $ldap_data = ldap_get_entries($this->conn, $res);
+        $this->_debug("S: ".ldap_count_entries($this->conn, $res)." record(s)");
 
         $groups = array();
@@ -1147 +1151 @@
         );
 
+        $this->_debug("C: Add [dn: $new_dn]: ".print_r($new_entry, true));
+
         $res = ldap_add($this->conn, $new_dn, $new_entry);
         if ($res === false)
@@ -1154 +1160 @@
             return false;
         }
+
+        $this->_debug("S: OK");
+
         return array('id' => $new_gid, 'name' => $group_name);
     }
@@ -1170 +1179 @@
         $base_dn = $this->groups_base_dn;
         $group_name = $this->group_cache[$group_id]['name'];
-
         $del_dn = "cn=$group_name,$base_dn";
+
+        $this->_debug("C: Delete [dn: $del_dn]");
+
         $res = ldap_delete($this->conn, $del_dn);
         if ($res === false)
@@ -1179 +1190 @@
             return false;
         }
+
+        $this->_debug("S: OK");
+
         return true;
     }
@@ -1201 +1215 @@
         $new_gid = base64_encode($new_name);
 
+        $this->_debug("C: Rename [dn: $old_dn] [dn: $new_rdn]");
+
         $res = ldap_rename($this->conn, $old_dn, $new_rdn, NULL, TRUE);
         if ($res === false)
@@ -1208 +1224 @@
             return false;
         }
+
+        $this->_debug("S: OK");
+
         return $new_name;
     }
@@ -1231 +1250 @@
             $new_attrs['member'][] = base64_decode($id);
 
+        $this->_debug("C: Add [dn: $group_dn]: ".print_r($new_attrs, true));
+
         $res = ldap_mod_add($this->conn, $group_dn, $new_attrs);
         if ($res === false)
@@ -1238 +1259 @@
             return 0;
         }
+
+        $this->_debug("S: OK");
+
         return count($new_attrs['member']);
     }
@@ -1261 +1285 @@
             $del_attrs['member'][] = base64_decode($id);
 
+        $this->_debug("C: Delete [dn: $group_dn]: ".print_r($del_attrs, true));
+
         $res = ldap_mod_del($this->conn, $group_dn, $del_attrs);
         if ($res === false)
@@ -1268 +1294 @@
             return 0;
         }
+
+        $this->_debug("S: OK");
+
         return count($del_attrs['member']);
     }
@@ -1288 +1317 @@
         $filter = "(member=$contact_dn)";
 
+        $this->_debug("C: Search [$filter][dn: $base_dn]");
+
         $res = ldap_search($this->conn, $base_dn, $filter, array('cn'));
         if ($res === false)
@@ -1296 +1327 @@
         }
         $ldap_data = ldap_get_entries($this->conn, $res);
+        $this->_debug("S: ".ldap_count_entries($this->conn, $res)." record(s)");
 
         $groups = array();