Changeset 04310ee in github

Timestamp:

Jul 23, 2011 5:07:28 AM (22 months ago)

Author:

thomascube <thomas@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

24f812dc

Parents:

f52c4f44

Message:

Better message if copying was rejected due to existing entries

File:

• program/steps/addressbook/copy.inc (modified) (3 diffs)

program/steps/addressbook/copy.inc

@@ -29 +29 @@
 $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)
@@ -79 +80 @@
             $record = $result->first();
             $ids[] = $record['ID'];
+            $errormsg = 'contactexists';
         }
     }
@@ -102 +104 @@
             $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));