summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2011-07-23 09:07:28 +0000
committerthomascube <thomas@roundcube.net>2011-07-23 09:07:28 +0000
commit04310ee1bf2448ebd04b4b8af50f1b97fea1b598 (patch)
treefe3707c9f7f8acdf4aaa13b3d011f86c4ee14d1d /program
parentf52c4f441fdbb2e2ca882e85ce4c162452186f05 (diff)
Better message if copying was rejected due to existing entries
Diffstat (limited to 'program')
-rw-r--r--program/steps/addressbook/copy.inc10
1 files changed, 7 insertions, 3 deletions
diff --git a/program/steps/addressbook/copy.inc b/program/steps/addressbook/copy.inc
index 1e4e753b6..5bfe5b400 100644
--- a/program/steps/addressbook/copy.inc
+++ b/program/steps/addressbook/copy.inc
@@ -28,8 +28,9 @@ $cids = rcmail_get_cids();
$target = get_input_value('_to', RCUBE_INPUT_POST);
$target_group = get_input_value('_togid', RCUBE_INPUT_POST);
-$success = 0;
-$maxnum = $RCMAIL->config->get('max_group_members', 0);
+$success = 0;
+$errormsg = 'copyerror';
+$maxnum = $RCMAIL->config->get('max_group_members', 0);
foreach ($cids as $source => $cid)
{
@@ -78,6 +79,7 @@ foreach ($cids as $source => $cid)
else {
$record = $result->first();
$ids[] = $record['ID'];
+ $errormsg = 'contactexists';
}
}
@@ -101,11 +103,13 @@ foreach ($cids as $source => $cid)
else if ($plugin['result']) {
$success = $plugin['result'];
}
+
+ $errormsg = $plugin['message'] ? $plugin['message'] : 'copyerror';
}
}
if ($success == 0)
- $OUTPUT->show_message('copyerror', 'error');
+ $OUTPUT->show_message($errormsg, 'error');
else
$OUTPUT->show_message('copysuccess', 'notice', array('nr' => $success));