Imported Upstream version 0.5.1

[roundcube.git] / program / steps / mail / addcontact.inc

diff --git a/program/steps/mail/addcontact.inc b/program/steps/mail/addcontact.inc
index afb327982528b3c98865fb82a84f274c09ecc842..bdd93ecff9c5dfe2ead1c8230aec64abc1f7deda 100644 (file)
--- a/program/steps/mail/addcontact.inc
+++ b/program/steps/mail/addcontact.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/mail/addcontact.inc                                     |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2009, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
@@ -15,53 +15,62 @@
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
 
- $Id: addcontact.inc 160 2006-03-03 16:36:22Z roundcube $
+ $Id: addcontact.inc 4509 2011-02-09 10:51:50Z thomasb $
 
 */
 
-$REMOTE_REQUEST = TRUE;
-
-if (!empty($_GET['_address']))
-  {
-  $contact_arr = $IMAP->decode_address_list(get_input_value('_address', RCUBE_INPUT_GET, TRUE));
-  if (sizeof($contact_arr))
-    {
-    $contact = $contact_arr[1];
-
-    if ($contact['mailto'])
-      $sql_result = $DB->query("SELECT 1 FROM ".get_table_name('contacts')."
-                                WHERE  user_id=?
-                                AND    email=?
-                                AND    del<>1",
-                                $_SESSION['user_id'],$contact['mailto']);
-
-    // contact entry with this mail address exists
-    if ($sql_result && $DB->num_rows($sql_result))
-      $existing_contact = TRUE;
-
-    else if ($contact['mailto'])
-      {
-      $DB->query("INSERT INTO ".get_table_name('contacts')."
-                  (user_id, changed, del, name, email)
-                  VALUES (?, now(), 0, ?, ?)",
-                  $_SESSION['user_id'],
-                  $contact['name'],
-                  $contact['mailto']);
-
-      $added = $DB->insert_id(get_sequence_name('contacts'));
-      }
+// only process ajax requests
+if (!$OUTPUT->ajax_call)
+  return;
+
+$done = false;
+$CONTACTS = $RCMAIL->get_address_book(null, true);
+
+if (!empty($_POST['_address']) && is_object($CONTACTS))
+{
+  $contact_arr = $IMAP->decode_address_list(get_input_value('_address', RCUBE_INPUT_POST, true), 1, false);
+
+  if (!empty($contact_arr[1]['mailto'])) {
+    $contact = array(
+      'email' => $contact_arr[1]['mailto'],
+      'name' => $contact_arr[1]['name']
+    );
+
+    // Validity checks
+    if (empty($contact['email'])) {
+      $OUTPUT->show_message('errorsavingcontact', 'error');
+      $OUTPUT->send();
+    }
+    else if (!check_email($contact['email'], false)) {
+      $OUTPUT->show_message('emailformaterror', 'error', array('email' => $contact['email']));
+      $OUTPUT->send();
     }
 
-  if ($added)
-    $commands = show_message('addedsuccessfully', 'confirmation');
-  else if ($existing_contact)
-    $commands = show_message('contactexists', 'warning');
+    $contact['email'] = rcube_idn_to_utf8($contact['email']);
+
+    // use email address part for name
+    if (empty($contact['name']) || $contact['name'] == $contact['email'])
+      $contact['name'] = ucfirst(preg_replace('/[\.\-]/', ' ', substr($contact['email'], 0, strpos($contact['email'], '@'))));
+
+    // check for existing contacts
+    $existing = $CONTACTS->search('email', $contact['email'], true, false);
+
+    if ($done = $existing->count)
+      $OUTPUT->show_message('contactexists', 'warning');
+    else {
+      $plugin = $RCMAIL->plugins->exec_hook('contact_create', array('record' => $contact, 'source' => null));
+      $contact = $plugin['record'];
+
+      $done = !$plugin['abort'] ? $CONTACTS->insert($contact) : $plugin['result'];
+
+      if ($done)
+        $OUTPUT->show_message('addedsuccessfully', 'confirmation');
+    }
   }
+}
 
+if (!$done)
+  $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : 'errorsavingcontact', 'error');
 
-if (!$commands)
-  $commands = show_message('errorsavingcontact', 'warning');
+$OUTPUT->send();
 
-rcube_remote_response($commands);  
-exit;
-?>
\ No newline at end of file