Fix priority icon(s) position

Aleksander Machniak

2016-05-22 0344b168276f80189e2254c75a762aff5b517b6b

 program/steps/mail/addcontact.inc

@@ -1,12 +1,15 @@
<?php

/*
/**
 +-----------------------------------------------------------------------+
 | program/steps/mail/addcontact.inc                                     |
 |                                                                       |
 | This file is part of the RoundCube Webmail client                     |
 | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
 | Licensed under the GNU GPL                                            |
 | This file is part of the Roundcube Webmail client                     |
 | 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,54 +17,77 @@
 +-----------------------------------------------------------------------+
 | Author: Thomas Bruederli <roundcube@gmail.com>                        |
 +-----------------------------------------------------------------------+

 $Id$

*/

$REMOTE_REQUEST = TRUE;
// only process ajax requests
if (!$OUTPUT->ajax_call) {
    return;
}

if (!empty($_GET['_address']))
  {
  $contact_arr = $IMAP->decode_address_list(get_input_value('_address', RCUBE_INPUT_GET));
  if (sizeof($contact_arr))
    {
    $contact = $contact_arr[1];
// Get default addressbook
$CONTACTS = $RCMAIL->get_address_book(-1, true);

    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']);
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);

    // contact entry with this mail address exists
    if ($sql_result && $DB->num_rows($sql_result))
      $existing_contact = TRUE;
    if (!empty($contact_arr[1]['mailto'])) {
        $contact = array(
            'email' => $contact_arr[1]['mailto'],
            'name'  => $contact_arr[1]['name'],
        );

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

      $added = $DB->insert_id(get_sequence_name('contacts'));
      }
        $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'] ?: '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');
            }
        }
    }
}

  if ($added)
    $commands = show_message('addedsuccessfully', 'confirmation');
  else if ($existing_contact)
    $commands = show_message('contactexists', 'warning');
  }
if (!$done) {
    $OUTPUT->show_message($plugin['message'] ?: 'errorsavingcontact', 'error');
}


if (!$commands)
  $commands = show_message('errorsavingcontact', 'warning');

rcube_remote_response($commands);  
exit;
?>
$OUTPUT->send();