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

alecpl

2011-07-24 2d761bbbefecf1aefe7815cff7a6ed5a43dcf960

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

 program/localization/en_US/messages.inc

@@ -42,7 +42,8 @@
$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.';

 program/steps/addressbook/copy.inc

@@ -57,8 +57,14 @@
    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 @@
        else {
            $record = $result->first();
            $ids[] = $record['ID'];
            $errormsg = 'contactexists';
            $errormsg = empty($a_record['email']) ? 'contactnameexists' : 'contactexists';
        }
    }