diff options
Diffstat (limited to 'program/include')
| -rw-r--r-- | program/include/main.inc | 5 | ||||
| -rw-r--r-- | program/include/rcube_contacts.inc | 7 | ||||
| -rw-r--r-- | program/include/rcube_ldap.inc | 13 |
3 files changed, 22 insertions, 3 deletions
diff --git a/program/include/main.inc b/program/include/main.inc index f938174d6..bd4ebd0ef 100644 --- a/program/include/main.inc +++ b/program/include/main.inc @@ -299,7 +299,7 @@ function rcmail_set_imap_prop() */ function rcmail_shutdown() { - global $IMAP; + global $IMAP, $CONTACTS; if (is_object($IMAP)) { @@ -307,6 +307,9 @@ function rcmail_shutdown() $IMAP->write_cache(); } + if (is_object($CONTACTS)) + $CONTACTS->close(); + // before closing the database connection, write session data session_write_close(); } diff --git a/program/include/rcube_contacts.inc b/program/include/rcube_contacts.inc index 9ba965e2f..f01d22279 100644 --- a/program/include/rcube_contacts.inc +++ b/program/include/rcube_contacts.inc @@ -128,6 +128,13 @@ class rcube_contacts /** + * Close connection to source + * Called on script shutdown + */ + function close(){} + + + /** * List the current set of contact records * * @param array List of cols to show diff --git a/program/include/rcube_ldap.inc b/program/include/rcube_ldap.inc index 976b73d2b..e6a15d9dc 100644 --- a/program/include/rcube_ldap.inc +++ b/program/include/rcube_ldap.inc @@ -58,7 +58,6 @@ class rcube_ldap if (preg_match('/^(.+)_field$/', $prop, $matches)) $this->fieldmap[$matches[1]] = $value; - // $this->filter = "(dn=*)"; $this->connect(); } @@ -142,7 +141,10 @@ class rcube_ldap function close() { if ($this->conn) + { @ldap_unbind($this->conn); + $this->conn = null; + } } @@ -212,6 +214,13 @@ class rcube_ldap */ function list_records($cols=null, $subset=0) { + // add general filter to query + if (!empty($this->prop['filter'])) + { + $filter = $this->prop['filter']; + $this->set_search_set($filter); + } + // exec LDAP search if no result resource is stored if ($this->conn && !$this->ldap_result) $this->_exec_search(); @@ -442,4 +451,4 @@ class rcube_ldap } -?>
\ No newline at end of file +?> |