X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=program%2Fsteps%2Faddressbook%2Fcopy.inc;fp=program%2Fsteps%2Faddressbook%2Fcopy.inc;h=8a8379078a761346d26dfe1c8e023f2faf39318c;hb=4212156c5c79d2f58342feb0d3ed1893f177bcab;hp=bc082b67586b18cc6cf02287c6ff0998b4e98214;hpb=e8a0682b96f5b7f297e58d101735ba20a0cc3a89;p=roundcube.git

diff --git a/program/steps/addressbook/copy.inc b/program/steps/addressbook/copy.inc
index bc082b6..8a83790 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, Roundcube Dev. - Switzerland                      |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
@@ -25,21 +25,64 @@ if (!$OUTPUT->ajax_call)
 
 $cid = get_input_value('_cid', RCUBE_INPUT_POST);
 $target = get_input_value('_to', RCUBE_INPUT_POST);
+$target_group = get_input_value('_togid', RCUBE_INPUT_POST);
 
-if ($cid && preg_match('/^[a-z0-9\-_=]+(,[a-z0-9\-_=]+)*$/i', $cid) && strlen($target) && $target !== $source)
+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);
 
   if ($TARGET && $TARGET->ready && !$TARGET->readonly) {
-    $arr_cids = split(',', $cid);
+    $arr_cids = explode(',', $cid);
+    $ids = array();
+
     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'];
+      $a_record = $CONTACTS->get_record($cid, true);
+
+      // check if contact exists, if so, we'll need it's ID
+      $result = $TARGET->search('email', $a_record['email'], true, true);
 
-    if (!$plugin['abort'])
-        if ($TARGET->insert($a_record, true))
+      // insert contact record
+      if (!$result->count) {
+        $plugin = $RCMAIL->plugins->exec_hook('contact_create', array(
+          'record' => $a_record, 'source' => $target, 'group' => $target_group));
+
+        if (!$plugin['abort']) {
+          if ($insert_id = $TARGET->insert($a_record, false)) {
+            $ids[] = $insert_id;
+            $success++;
+          }
+        }
+        else if ($plugin['result']) {
+          $ids = array_merge($ids, $plugin['result']);
           $success++;
+        }
+      }
+      else {
+        $record = $result->first();
+        $ids[] = $record['ID'];
+      }
+    }
+
+    // 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));
+
+      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 (($cnt = $TARGET->add_to_group($target_group, $plugin['ids'])) && $cnt > $success)
+          $success = $cnt;
+      }
+      else if ($plugin['result'])
+        $success = $plugin['result'];
     }
   }
 
@@ -47,12 +90,8 @@ if ($cid && preg_match('/^[a-z0-9\-_=]+(,[a-z0-9\-_=]+)*$/i', $cid) && strlen($t
     $OUTPUT->show_message('copyerror', 'error');
   else
     $OUTPUT->show_message('copysuccess', 'notice', array('nr' => $success));
-    
-  // close connection to second address directory
-  $TARGET->close();
 }
 
 // send response
 $OUTPUT->send();
 
-?>