- On contact copy check for existing record by name if email field is empty

2 files changed, 12 insertions, 5 deletions

diff --git a/program/localization/en_US/messages.inc b/program/localization/en_US/messages.inc
index 25796cc71..befaa25b6 100644
--- a/program/localization/en_US/messages.inc
+++ b/program/localization/en_US/messages.inc
@@ -42,7 +42,8 @@ $messages['savingmessage'] = 'Saving message...';
 $messages['messagesaved'] = 'Message saved to Drafts.';
 $messages['successfullysaved'] = 'Successfully saved.';
 $messages['addedsuccessfully'] = 'Contact added successfully to address book.';
-$messages['contactexists'] = 'A contact with this e-mail address already exists.';
+$messages['contactexists'] = 'A contact with the same e-mail address already exists.';
+$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'To protect your privacy, remote images are blocked in this message.';
 $messages['encryptedmessage'] = 'This is an encrypted message and can not be displayed. Sorry!';
 $messages['nocontactsfound'] = 'No contacts found.';
diff --git a/program/steps/addressbook/copy.inc b/program/steps/addressbook/copy.inc
index 5bfe5b400..e07d62af9 100644
--- a/program/steps/addressbook/copy.inc
+++ b/program/steps/addressbook/copy.inc
@@ -57,8 +57,14 @@ foreach ($cids as $source => $cid)
     foreach ($cid as $cid) {
         $a_record = $CONTACTS->get_record($cid, true);
 
-        // check if contact exists, if so, we'll need it's ID
-        $result = $TARGET->search('email', $a_record['email'], true, true);
+        // Check if contact exists, if so, we'll need it's ID
+        // Note: Some addressbooks allows empty email address field
+        if (!empty($a_record['email']))
+            $result = $TARGET->search('email', $a_record['email'], true, true, true);
+        else if (!empty($a_record['name']))
+            $result = $TARGET->search('name', $a_record['name'], true, true, true);
+        else
+            $result = new rcube_result_set();
 
         // insert contact record
         if (!$result->count) {
@@ -79,7 +85,7 @@ foreach ($cids as $source => $cid)
         else {
             $record = $result->first();
             $ids[] = $record['ID'];
-            $errormsg = 'contactexists';
+            $errormsg = empty($a_record['email']) ? 'contactnameexists' : 'contactexists';
         }
     }
 
@@ -103,7 +109,7 @@ foreach ($cids as $source => $cid)
         else if ($plugin['result']) {
             $success = $plugin['result'];
         }
-        
+
         $errormsg = $plugin['message'] ? $plugin['message'] : 'copyerror';
     }
 }