From 04310ee1bf2448ebd04b4b8af50f1b97fea1b598 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Sat, 23 Jul 2011 05:07:28 -0400
Subject: [PATCH] Better message if copying was rejected due to existing entries
---
program/steps/addressbook/copy.inc | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/program/steps/addressbook/copy.inc b/program/steps/addressbook/copy.inc
index 1e4e753..5bfe5b4 100644
--- a/program/steps/addressbook/copy.inc
+++ b/program/steps/addressbook/copy.inc
@@ -28,8 +28,9 @@
$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 @@
else {
$record = $result->first();
$ids[] = $record['ID'];
+ $errormsg = 'contactexists';
}
}
@@ -101,11 +103,13 @@
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));
--
Gitblit v1.9.1