Contacts drag-n-drop default action is to move contacts (#1488751) Added po...

Aleksander Machniak

2013-07-01 a45f9b7bf58475ccc812e819f159638403c00419

 program/steps/addressbook/copy.inc

@@ -6,7 +6,10 @@
 |                                                                       |
 | This file is part of the Roundcube Webmail client                     |
 | Copyright (C) 2007, The Roundcube Dev Team                            |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
 | See the README file for a full license statement.                     |
 |                                                                       |
 | PURPOSE:                                                              |
 |   Copy a contact record from one direcotry to another                 |
@@ -14,9 +17,6 @@
 +-----------------------------------------------------------------------+
 | Author: Thomas Bruederli <roundcube@gmail.com>                        |
 +-----------------------------------------------------------------------+

 $Id: copy.inc 471 2007-02-09 21:25:50Z thomasb $

*/

// only process ajax requests
@@ -57,8 +57,18 @@
    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);
        // avoid copying groups
        if ($a_record['_type'] == 'group')
            continue;

        // 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'], 1, true, true);
        else if (!empty($a_record['name']))
            $result = $TARGET->search('name', $a_record['name'], 1, true, true);
        else
            $result = new rcube_result_set();

        // insert contact record
        if (!$result->count) {
@@ -79,7 +89,7 @@
        else {
            $record = $result->first();
            $ids[] = $record['ID'];
            $errormsg = 'contactexists';
            $errormsg = empty($a_record['email']) ? 'contactnameexists' : 'contactexists';
        }
    }

@@ -103,12 +113,12 @@
        else if ($plugin['result']) {
            $success = $plugin['result'];
        }
        

        $errormsg = $plugin['message'] ? $plugin['message'] : 'copyerror';
    }
}

if ($success == 0)
if (!$success)
    $OUTPUT->show_message($errormsg, 'error');
else
    $OUTPUT->show_message('copysuccess', 'notice', array('nr' => $success));