diff options
| author | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-09-02 07:42:46 +0000 |
|---|---|---|
| committer | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-09-02 07:42:46 +0000 |
| commit | d6bef1e39f44faa270dee193f05ae649605a1ad2 (patch) | |
| tree | 44e05839ce96b6decb8681aa06368f5ad74220fe /roundcubemail/program/steps/mail | |
| parent | 13b4725150912f49837c3d2bc7412a3ee1df757a (diff) | |
Let rcmail class create address book instances
git-svn-id: https://svn.roundcube.net/trunk@1712 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/steps/mail')
| -rw-r--r-- | roundcubemail/program/steps/mail/addcontact.inc | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/roundcubemail/program/steps/mail/addcontact.inc b/roundcubemail/program/steps/mail/addcontact.inc index aefdd83de..d98d71faf 100644 --- a/roundcubemail/program/steps/mail/addcontact.inc +++ b/roundcubemail/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'])) |