From ecfaed571b2c38f4bcc2b6a0fa39fba15a5126ce Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 11 Nov 2011 10:04:45 -0500
Subject: [PATCH] - Apply fixes fom trunk up to r5414
---
program/steps/addressbook/copy.inc | 121 +++++++++++++++++++++++++---------------
1 files changed, 75 insertions(+), 46 deletions(-)
diff --git a/program/steps/addressbook/copy.inc b/program/steps/addressbook/copy.inc
index 525f927..5e526e1 100644
--- a/program/steps/addressbook/copy.inc
+++ b/program/steps/addressbook/copy.inc
@@ -4,8 +4,8 @@
+-----------------------------------------------------------------------+
| program/steps/addressbook/copy.inc |
| |
- | This file is part of the RoundCube Webmail client |
- | Copyright (C) 2007, RoundCube Dev. - Switzerland |
+ | This file is part of the Roundcube Webmail client |
+ | Copyright (C) 2007, The Roundcube Dev Team |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
@@ -23,72 +23,101 @@
if (!$OUTPUT->ajax_call)
return;
-$cid = get_input_value('_cid', RCUBE_INPUT_POST);
-$target = get_input_value('_to', RCUBE_INPUT_POST);
+
+$cids = rcmail_get_cids();
+$target = get_input_value('_to', RCUBE_INPUT_POST);
$target_group = get_input_value('_togid', RCUBE_INPUT_POST);
-if ($cid && preg_match('/^[a-zA-Z0-9\+\/=_-]+(,[a-zA-Z0-9\+\/=_-]+)*$/', $cid) && strlen($target) && $target !== $source)
-{
- $success = 0;
- $TARGET = $RCMAIL->get_address_book($target);
+$success = 0;
+$errormsg = 'copyerror';
+$maxnum = $RCMAIL->config->get('max_group_members', 0);
- if ($TARGET && $TARGET->ready && !$TARGET->readonly) {
- $arr_cids = explode(',', $cid);
+foreach ($cids as $source => $cid)
+{
+ // Something wrong, target not specified
+ if (!strlen($target)) {
+ break;
+ }
+
+ // It maight happen when copying records from search result
+ // Do nothing, go to next source
+ if ((string)$target == (string)$source) {
+ continue;
+ }
+
+ $CONTACTS = $RCMAIL->get_address_book($source);
+ $TARGET = $RCMAIL->get_address_book($target);
+
+ if (!$TARGET || !$TARGET->ready || $TARGET->readonly) {
+ break;
+ }
+
$ids = array();
- foreach ($arr_cids as $cid) {
- $plugin = $RCMAIL->plugins->exec_hook('create_contact', array(
- 'record' => $CONTACTS->get_record($cid, true),
- 'source' => $target,
- 'group' => $target_group,
- ));
- $a_record = $plugin['record'];
+ foreach ($cid as $cid) {
+ $a_record = $CONTACTS->get_record($cid, true);
- if (!$plugin['abort']) {
- // 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'], 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) {
- if ($insert_id = $TARGET->insert($a_record, false)) {
- $ids[] = $insert_id;
- $success++;
- }
+ $plugin = $RCMAIL->plugins->exec_hook('contact_create', array(
+ 'record' => $a_record, 'source' => $target, 'group' => $target_group));
+
+ if (!$plugin['abort']) {
+ if ($insert_id = $TARGET->insert($plugin['record'], false)) {
+ $ids[] = $insert_id;
+ $success++;
+ }
+ }
+ else if ($plugin['result']) {
+ $ids = array_merge($ids, $plugin['result']);
+ $success++;
+ }
}
else {
- $record = $result->first();
- $ids[] = $record['ID'];
+ $record = $result->first();
+ $ids[] = $record['ID'];
+ $errormsg = empty($a_record['email']) ? 'contactnameexists' : 'contactexists';
}
- }
}
// assign to group
if ($target_group && $TARGET->groups && !empty($ids)) {
- $plugin = $RCMAIL->plugins->exec_hook('group_addmembers', array(
- 'group_id' => $target_group, 'ids' => $ids, 'source' => $target));
+ $plugin = $RCMAIL->plugins->exec_hook('group_addmembers', array(
+ 'group_id' => $target_group, 'ids' => $ids, 'source' => $target));
- if (!$plugin['abort']) {
- $TARGET->reset();
- $TARGET->set_group($target_group);
+ if (!$plugin['abort']) {
+ $TARGET->reset();
+ $TARGET->set_group($target_group);
- if (($maxnum = $RCMAIL->config->get('max_group_members', 0)) && ($TARGET->count()->count + count($plugin['ids']) > $maxnum)) {
- $OUTPUT->show_message('maxgroupmembersreached', 'warning', array('max' => $maxnum));
- $OUTPUT->send();
+ if ($maxnum && ($TARGET->count()->count + count($plugin['ids']) > $maxnum)) {
+ $OUTPUT->show_message('maxgroupmembersreached', 'warning', array('max' => $maxnum));
+ $OUTPUT->send();
+ }
+
+ if (($cnt = $TARGET->add_to_group($target_group, $plugin['ids'])) && $cnt > $success)
+ $success = $cnt;
+ }
+ else if ($plugin['result']) {
+ $success = $plugin['result'];
}
- if (($cnt = $TARGET->add_to_group($target_group, $plugin['ids'])) && $cnt > $success)
- $success = $cnt;
- }
+ $errormsg = $plugin['message'] ? $plugin['message'] : 'copyerror';
}
- }
-
- if ($success == 0)
- $OUTPUT->show_message('copyerror', 'error');
- else
- $OUTPUT->show_message('copysuccess', 'notice', array('nr' => $success));
}
+
+if ($success == 0)
+ $OUTPUT->show_message($errormsg, 'error');
+else
+ $OUTPUT->show_message('copysuccess', 'notice', array('nr' => $success));
// send response
$OUTPUT->send();
-
-?>
--
Gitblit v1.9.1