diff options
Diffstat (limited to 'program/include')
| -rw-r--r-- | program/include/rcube_ldap.php | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/program/include/rcube_ldap.php b/program/include/rcube_ldap.php index 61c66f340..9f8086bd9 100644 --- a/program/include/rcube_ldap.php +++ b/program/include/rcube_ldap.php @@ -1284,7 +1284,7 @@ class rcube_ldap extends rcube_addressbook // 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'])) { $this->set_error(self::ERROR_SAVING, 'errorsaving'); @@ -1315,6 +1315,23 @@ class rcube_ldap extends rcube_addressbook /** + * 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); + } + } + + + /** * Execute the LDAP search based on the stored credentials */ private function _exec_search($count = false) @@ -2172,7 +2189,7 @@ class rcube_ldap extends rcube_addressbook /** * Wrapper for ldap_list() */ - protected function ldap_list($dn, $filter, $attrs) + protected function ldap_list($dn, $filter, $attrs = array('')) { $list = array(); $this->_debug("C: List [dn: $dn] [{$filter}]"); |