Fix merge error that disabled contact drag'n'drop

Thomas Bruederli

2014-08-19 fc52af24f1418d6590a2d37a0d8cc31b123e38f6

 program/steps/mail/addcontact.inc

@@ -6,7 +6,10 @@
 |                                                                       |
 | This file is part of the Roundcube Webmail client                     |
 | Copyright (C) 2005-2009, The Roundcube Dev Team                       |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
 | See the README file for a full license statement.                     |
 |                                                                       |
 | PURPOSE:                                                              |
 |   Add the submitted contact to the users address book                 |
@@ -14,30 +17,18 @@
 +-----------------------------------------------------------------------+
 | Author: Thomas Bruederli <roundcube@gmail.com>                        |
 +-----------------------------------------------------------------------+

 $Id$

*/

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

$abook = $RCMAIL->config->get('default_addressbook');

// Get configured addressbook
$CONTACTS = $RCMAIL->get_address_book($abook, true);

// Get first writeable addressbook if the configured doesn't exist
// This can happen when user deleted the addressbook (e.g. Kolab folder)
if ($abook == null || !is_object($CONTACTS)) {
  $source = reset($RCMAIL->get_address_sources(true));
  $CONTACTS = $RCMAIL->get_address_book($source['id'], true);
}
// Get default addressbook
$CONTACTS = $RCMAIL->get_address_book(-1, true);

if (!empty($_POST['_address']) && is_object($CONTACTS))
{
  $contact_arr = $RCMAIL->imap->decode_address_list(get_input_value('_address', RCUBE_INPUT_POST, true), 1, false);
  $contact_arr = rcube_mime::decode_address_list(get_input_value('_address', RCUBE_INPUT_POST, true), 1, false);

  if (!empty($contact_arr[1]['mailto'])) {
    $contact = array(
@@ -58,7 +49,10 @@
    }

    $contact['email'] = rcube_idn_to_utf8($contact['email']);
    $contact['name'] = rcube_addressbook::compose_display_name($contact);
    $contact = $RCMAIL->plugins->exec_hook('contact_displayname', $contact);

    if (empty($contact['firstname']) || empty($contact['surname']))
      $contact['name'] = rcube_addressbook::compose_display_name($contact);

    // validate contact record
    if (!$CONTACTS->validate($contact, true)) {