Only add zen-mode text labels in compose step

Thomas Bruederli

2014-08-18 3ebac0167bf20104fb7a2a55934765117760264c

 program/steps/mail/addcontact.inc

@@ -5,8 +5,11 @@
 | program/steps/mail/addcontact.inc                                     |
 |                                                                       |
 | This file is part of the Roundcube Webmail client                     |
 | Copyright (C) 2005-2009, The Roundcube Dev Team                       |
 | Licensed under the GNU GPL                                            |
 | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
 |                                                                       |
 | 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,71 +17,77 @@
 +-----------------------------------------------------------------------+
 | 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);
if (!$OUTPUT->ajax_call) {
    return;
}

if (!empty($_POST['_address']) && is_object($CONTACTS))
{
  $contact_arr = $IMAP->decode_address_list(get_input_value('_address', RCUBE_INPUT_POST, true), 1, false);
// Get default addressbook
$CONTACTS = $RCMAIL->get_address_book(-1, true);

  if (!empty($contact_arr[1]['mailto'])) {
    $contact = array(
      'email' => $contact_arr[1]['mailto'],
      'name' => $contact_arr[1]['name']
    );
if (!empty($_POST['_address']) && is_object($CONTACTS)) {
    $address = rcube_utils::get_input_value('_address', rcube_utils::INPUT_POST, true);
    $contact_arr = rcube_mime::decode_address_list($address, 1, false);

    // Validity checks
    if (empty($contact['email'])) {
      $OUTPUT->show_message('errorsavingcontact', 'error');
      $OUTPUT->send();
    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();
        }

        $email = rcube_utils::idn_to_ascii($contact['email']);
        if (!rcube_utils::check_email($email, false)) {
            $OUTPUT->show_message('emailformaterror', 'error', array('email' => $contact['email']));
            $OUTPUT->send();
        }

        $contact['email'] = rcube_utils::idn_to_utf8($contact['email']);

        $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)) {
            $error = $CONTACTS->get_error();
            // TODO: show dialog to complete record
            // if ($error['type'] == rcube_addressbook::ERROR_VALIDATE) { }

            $OUTPUT->show_message($error['message'] ? $error['message'] : 'errorsavingcontact', 'error');
            $OUTPUT->send();
        }

        // check for existing contacts
        $existing = $CONTACTS->search('email', $contact['email'], 1, 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');
            }
        }
    }
    
    $email = rcube_idn_to_ascii($contact['email']);
    if (!check_email($email, false)) {
      $OUTPUT->show_message('emailformaterror', 'error', array('email' => $contact['email']));
      $OUTPUT->send();
    }

    $contact['email'] = rcube_idn_to_utf8($contact['email']);
    $contact['name'] = rcube_addressbook::compose_display_name($contact);

    // 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 (!$done) {
    $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : 'errorsavingcontact', 'error');
}

$OUTPUT->send();