[Svn] r3016 - trunk/roundcubemail/program/steps/addressbook

trac at roundcube.net trac at roundcube.net
Mon Oct 5 09:20:36 CEST 2009


Author: alec
Date: 2009-10-05 02:20:36 -0500 (Mon, 05 Oct 2009)
New Revision: 3016

Modified:
   trunk/roundcubemail/program/steps/addressbook/copy.inc
Log:
- Fix bugs in unused  addressbook copy contact function (#1486199)


Modified: trunk/roundcubemail/program/steps/addressbook/copy.inc
===================================================================
--- trunk/roundcubemail/program/steps/addressbook/copy.inc	2009-10-04 08:16:20 UTC (rev 3015)
+++ trunk/roundcubemail/program/steps/addressbook/copy.inc	2009-10-05 07:20:36 UTC (rev 3016)
@@ -25,23 +25,28 @@
 
 $cid = get_input_value('_cid', RCUBE_INPUT_POST);
 $target = get_input_value('_to', RCUBE_INPUT_POST);
-if ($cid && preg_match('/^[a-z0-9\-_=]+(,[a-z0-9\-_=]+)*$/i', $cid) && strlen($target) && $target != $source)
+
+if ($cid && preg_match('/^[a-z0-9\-_=]+(,[a-z0-9\-_=]+)*$/i', $cid) && strlen($target) && $target !== $source)
 {
-  $success = false;
+  $success = 0;
   $TARGET = $RCMAIL->get_address_book($target);
 
   if ($TARGET && $TARGET->ready && !$TARGET->readonly) {
-    $plugin = $RCMAIL->plugins->exec_hook('create_contact', array('record' => $CONTACTS->search($CONTACTS->primary_key, $cid), 'source' => $target));
+    $arr_cids = split(',', $cid);
+    foreach ($arr_cids as $cid) {
+      $plugin = $RCMAIL->plugins->exec_hook('create_contact', array('record' => $CONTACTS->get_record($cid, true), 'source' => $target));
     $a_record = $plugin['record'];
 
     if (!$plugin['abort'])
-      $success = $TARGET->insert($CONTACTS->search($a_record, true));
+        if ($TARGET->insert($a_record, true))
+          $success++;
+    }
   }
 
-  if (empty($success))
+  if ($success == 0)
     $OUTPUT->show_message('copyerror', 'error');
   else
-    $OUTPUT->show_message('copysuccess', 'notice', array('nr' => count($success)));
+    $OUTPUT->show_message('copysuccess', 'notice', array('nr' => $success));
     
   // close connection to second address directory
   $TARGET->close();

_______________________________________________
http://lists.roundcube.net/mailman/listinfo/svn



More information about the Svn mailing list