Merged branch devel-addressbook from r443 back to trunk

1 files changed, 29 insertions, 41 deletions

diff --git a/program/steps/mail/addcontact.inc b/program/steps/mail/addcontact.inc
index b040581aa..484b0d4ba 100644
--- a/program/steps/mail/addcontact.inc
+++ b/program/steps/mail/addcontact.inc
@@ -5,7 +5,7 @@
  | program/steps/mail/addcontact.inc                                     |
  |                                                                       |
  | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
+ | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
@@ -19,49 +19,37 @@
 
 */
 
-$REMOTE_REQUEST = TRUE;
+require_once('include/rcube_contacts.inc');
 
-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 (?, ".$DB->now().", 0, ?, ?)",
-                  $_SESSION['user_id'],
-                  $contact['name'],
-                  $contact['mailto']);
+$done = false;
 
-      $added = $DB->insert_id(get_sequence_name('contacts'));
-      }
-    }
-
-  if ($added)
-    $commands = show_message('addedsuccessfully', 'confirmation');
-  else if ($existing_contact)
-    $commands = show_message('contactexists', 'warning');
+if (!empty($_POST['_address']))
+{
+  $CONTACTS = new rcube_contacts($DB, $_SESSION['user_id']);
+  $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']
+    );
+    
+    // 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'], false);
+    if ($done = $existing->count)
+      $OUTPUT->show_message('contactexists', 'warning');
+    else if ($done = $CONTACTS->insert($contact))
+      $OUTPUT->show_message('addedsuccessfully', 'confirmation');
   }
+}
 
+if (!$done)
+  $OUTPUT->show_message('errorsavingcontact', 'warning');
 
-if (!$commands)
-  $commands = show_message('errorsavingcontact', 'warning');
-
-rcube_remote_response($commands);  
-exit;
+$OUTPUT->send();
 ?>
\ No newline at end of file