- fix save/delete draft message with enabled threading (#1486596) - perform...

alecpl

2010-03-31 6f31b356b2b21882b439324d233aceec413f4737

 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-2007, RoundCube Dev. - Switzerland                 |
 | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 | PURPOSE:                                                              |
@@ -19,23 +19,15 @@

*/

$done = false;
// only process ajax requests
if (!$OUTPUT->ajax_call)
  return;

if (!empty($_POST['_address']))
$done = false;
$CONTACTS = $RCMAIL->get_address_book(null, true);

if (!empty($_POST['_address']) && is_object($CONTACTS))
{
  $CONTACTS = array();
  if (!$CONFIG["use_SQL_address_book"]) {
    // Use the first writable LDAP address book.
    foreach ($CONFIG["ldap_public"] as $id => $prop) {
      if ($prop["writable"]) {
        $CONTACTS = new rcube_ldap($prop);
        break;
      } // end if
    } // end foreach
  } // end if
  else {
    $CONTACTS = new rcube_contacts($DB, $_SESSION['user_id']);
  } // end else
  $contact_arr = $IMAP->decode_address_list(get_input_value('_address', RCUBE_INPUT_POST, true), 1, false);
  
  if (!empty($contact_arr[1]['mailto']))
@@ -53,8 +45,14 @@
    $existing = $CONTACTS->search('email', $contact['email'], true, false);
    if ($done = $existing->count)
      $OUTPUT->show_message('contactexists', 'warning');
    else if ($done = $CONTACTS->insert($contact))
      $OUTPUT->show_message('addedsuccessfully', 'confirmation');
    else
    {
      $plugin = $RCMAIL->plugins->exec_hook('create_contact', array('record' => $contact, 'source' => null));
      $contact = $plugin['record'];

      if (!$plugin['abort'] && ($done = $CONTACTS->insert($contact)))
        $OUTPUT->show_message('addedsuccessfully', 'confirmation');
    }
  }
}