- Applied fixes from trunk

1 files changed, 59 insertions, 21 deletions

diff --git a/plugins/vcard_attachments/vcard_attachments.php b/plugins/vcard_attachments/vcard_attachments.php
index c321e84aa..1400cd581 100644
--- a/plugins/vcard_attachments/vcard_attachments.php
+++ b/plugins/vcard_attachments/vcard_attachments.php
@@ -66,7 +66,7 @@ class vcard_attachments extends rcube_plugin
         $icon = 'plugins/vcard_attachments/' .$this->local_skin_path(). '/vcard_add_contact.png';
 
         foreach ($this->vcard_parts as $part) {
-            $vcards = rcube_vcard::import($this->message->get_part_content($part));
+            $vcards = rcube_vcard::import($this->message->get_part_content($part, null, true));
 
             // successfully parsed vcards?
             if (empty($vcards))
@@ -114,46 +114,59 @@ class vcard_attachments extends rcube_plugin
         $mbox = get_input_value('_mbox', RCUBE_INPUT_POST);
         $mime_id = get_input_value('_part', RCUBE_INPUT_POST);
 
-        $rcmail = rcmail::get_instance();
+        $rcmail  = rcmail::get_instance();
+        $storage = $rcmail->get_storage();
+        $storage->set_folder($mbox);
 
         if ($uid && $mime_id) {
             list($mime_id, $index) = explode(':', $mime_id);
-            $part = $rcmail->storage->get_message_part($uid, $mime_id);
+            $part = $storage->get_message_part($uid, $mime_id, null, null, null, true);
         }
 
         $error_msg = $this->gettext('vcardsavefailed');
 
         if ($part && ($vcards = rcube_vcard::import($part))
-            && ($vcard = $vcards[$index]) && $vcard->displayname && $vcard->email) {
-
-            $contacts = $rcmail->get_address_book(null, true);
-
-            // check for existing contacts
-            $existing = $contacts->search('email', $vcard->email[0], true, false);
-            if ($existing->count) {
-                $rcmail->output->command('display_message', $this->gettext('contactexists'), 'warning');
+            && ($vcard = $vcards[$index]) && $vcard->displayname && $vcard->email
+        ) {
+            $CONTACTS = $this->get_address_book();
+            $email    = $vcard->email[0];
+            $contact  = $vcard->get_assoc();
+            $valid    = true;
+
+            // skip entries without an e-mail address or invalid
+            if (empty($email) || !$CONTACTS->validate($contact, true)) {
+                $valid = false;
             }
             else {
-                // add contact
-                $contact = array(
-                    'name'      => $vcard->displayname,
-                    'firstname' => $vcard->firstname,
-                    'surname'   => $vcard->surname,
-                    'email'     => $vcard->email[0],
-                    'vcard'     => $vcard->export(),
-                );
+                // We're using UTF8 internally
+                $email = rcube_idn_to_utf8($email);
+
+                // compare e-mail address
+                $existing = $CONTACTS->search('email', $email, 1, false);
+                // compare display name
+                if (!$existing->count && $vcard->displayname) {
+                    $existing = $CONTACTS->search('name', $vcard->displayname, 1, false);
+                }
+
+                if ($existing->count) {
+                    $rcmail->output->command('display_message', $this->gettext('contactexists'), 'warning');
+                    $valid = false;
+                }
+            }
 
+            if ($valid) {
                 $plugin = $rcmail->plugins->exec_hook('contact_create', array('record' => $contact, 'source' => null));
                 $contact = $plugin['record'];
 
-                if (!$plugin['abort'] && ($done = $contacts->insert($contact)))
+                if (!$plugin['abort'] && $CONTACTS->insert($contact))
                     $rcmail->output->command('display_message', $this->gettext('addedsuccessfully'), 'confirmation');
                 else
                     $rcmail->output->command('display_message', $error_msg, 'error');
             }
         }
-        else
+        else {
             $rcmail->output->command('display_message', $error_msg, 'error');
+        }
 
         $rcmail->output->send();
     }
@@ -182,4 +195,29 @@ class vcard_attachments extends rcube_plugin
             )
         );
     }
+
+    /**
+     * Getter for default (writable) addressbook
+     */
+    private function get_address_book()
+    {
+        if ($this->abook) {
+            return $this->abook;
+        }
+
+        $rcmail = rcmail::get_instance();
+        $abook  = $rcmail->config->get('default_addressbook');
+
+        // Get configured addressbook
+        $CONTACTS = $rcmail->get_address_book($abook, true);
+
+        // Get first writeable addressbook if the configured doesn't exist
+        // This can happen when user deleted the addressbook (e.g. Kolab folder)
+        if ($abook === null || $abook === '' || !is_object($CONTACTS)) {
+            $source   = reset($rcmail->get_address_sources(true));
+            $CONTACTS = $rcmail->get_address_book($source['id'], true);
+        }
+
+        return $this->abook = $CONTACTS;
+    }
 }