Changeset 6055 in subversion

Timestamp:

Apr 10, 2012 3:47:15 AM (14 months ago)

Author:

alec

Message:

• Fix removing all folders on import to LDAP addressbook (added rcube_ldap::delete_all())
• Fix removing sub-entries in delete()

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/include/rcube_ldap.php (modified) (3 diffs)

trunk/roundcubemail/CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Fix removing all folders on import to LDAP addressbook
 - Fix so "Back" from compose/show doesn't reset search request (#1488238)
 - Add option to delete messages instead of moving to Trash when in Junk folder (#1486686)

trunk/roundcubemail/program/include/rcube_ldap.php

@@ -1285 +1285 @@
             // Need to delete all sub-entries first
             if ($this->sub_filter) {
-                if ($entries = $this->ldap_list($dn, $this->sub_filter, array_keys($this->props['sub_fields']))) {
+                if ($entries = $this->ldap_list($dn, $this->sub_filter)) {
                     foreach ($entries as $entry) {
                         if (!$this->ldap_delete($entry['dn'])) {
@@ -1312 +1312 @@
 
         return count($ids);
+    }
+
+
+    /**
+     * Remove all contact records
+     */
+    function delete_all()
+    {
+        //searching for contact entries
+        $dn_list = $this->ldap_list($this->base_dn, $this->prop['filter'] ? $this->prop['filter'] : '(objectclass=*)');
+
+        if (!empty($dn_list)) {
+            foreach ($dn_list as $idx => $entry) {
+                $dn_list[$idx] = self::dn_encode($entry['dn']);
+            }
+            $this->delete($dn_list);
+        }
     }
 
@@ -2173 +2190 @@
      * Wrapper for ldap_list()
      */
-    protected function ldap_list($dn, $filter, $attrs)
+    protected function ldap_list($dn, $filter, $attrs = array(''))
     {
         $list = array();