summaryrefslogtreecommitdiff
path: root/program/steps/mail
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2008-09-02 07:42:46 +0000
committerthomascube <thomas@roundcube.net>2008-09-02 07:42:46 +0000
commitade8e117dfbb62f6dbd16b4aca81dfbdbd054579 (patch)
tree6d67359f797e4bdb976f7a446713499224ae02ee /program/steps/mail
parente7f85bd27474e1b1bbb9522dd019f8bbe3ca7bd1 (diff)
Let rcmail class create address book instances
Diffstat (limited to 'program/steps/mail')
-rw-r--r--program/steps/mail/addcontact.inc16
1 files changed, 2 insertions, 14 deletions
diff --git a/program/steps/mail/addcontact.inc b/program/steps/mail/addcontact.inc
index aefdd83de..d98d71faf 100644
--- a/program/steps/mail/addcontact.inc
+++ b/program/steps/mail/addcontact.inc
@@ -20,22 +20,10 @@
*/
$done = false;
+$CONTACTS = $RCMAIL->get_address_book(null, true);
-if (!empty($_POST['_address']))
+if (!empty($_POST['_address']) && is_object($CONTACTS))
{
- $CONTACTS = array();
- if (strtolower($CONFIG['address_book_type']) == 'ldap') {
- // Use the first writable LDAP address book.
- foreach ($CONFIG["ldap_public"] as $id => $prop) {
- if ($prop["writable"]) {
- $CONTACTS = new rcube_ldap($prop);
- break;
- } // end if
- } // end foreach
- } // end if
- else {
- $CONTACTS = new rcube_contacts($DB, $_SESSION['user_id']);
- } // end else
$contact_arr = $IMAP->decode_address_list(get_input_value('_address', RCUBE_INPUT_POST, true), 1, false);
if (!empty($contact_arr[1]['mailto']))