From ecfaed571b2c38f4bcc2b6a0fa39fba15a5126ce Mon Sep 17 00:00:00 2001 From: alecpl Date: Fri, 11 Nov 2011 15:04:45 +0000 Subject: - Apply fixes fom trunk up to r5414 --- program/steps/mail/addcontact.inc | 6 ++--- program/steps/mail/autocomplete.inc | 24 ++++++++++++----- program/steps/mail/func.inc | 3 +++ program/steps/mail/show.inc | 52 ++++++++++++++++++++++++++++++++++--- 4 files changed, 72 insertions(+), 13 deletions(-) (limited to 'program/steps/mail') diff --git a/program/steps/mail/addcontact.inc b/program/steps/mail/addcontact.inc index dafb2763c..a4feb7b58 100644 --- a/program/steps/mail/addcontact.inc +++ b/program/steps/mail/addcontact.inc @@ -50,7 +50,7 @@ if (!empty($_POST['_address']) && is_object($CONTACTS)) $OUTPUT->show_message('errorsavingcontact', 'error'); $OUTPUT->send(); } - + $email = rcube_idn_to_ascii($contact['email']); if (!check_email($email, false)) { $OUTPUT->show_message('emailformaterror', 'error', array('email' => $contact['email'])); @@ -65,13 +65,13 @@ if (!empty($_POST['_address']) && is_object($CONTACTS)) $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'], true, false); + $existing = $CONTACTS->search('email', $contact['email'], 1, false); if ($done = $existing->count) $OUTPUT->show_message('contactexists', 'warning'); diff --git a/program/steps/mail/autocomplete.inc b/program/steps/mail/autocomplete.inc index 8b13f574d..e40bb76c3 100644 --- a/program/steps/mail/autocomplete.inc +++ b/program/steps/mail/autocomplete.inc @@ -40,7 +40,9 @@ if ($RCMAIL->action == 'group-expand') { } -$MAXNUM = (int)$RCMAIL->config->get('autocomplete_max', 15); +$MAXNUM = (int) $RCMAIL->config->get('autocomplete_max', 15); +$mode = (int) $RCMAIL->config->get('addressbook_search_mode'); +$single = (bool) $RCMAIL->config->get('autocomplete_single'); $search = get_input_value('_search', RCUBE_INPUT_GPC, true); $source = get_input_value('_source', RCUBE_INPUT_GPC); $sid = get_input_value('_id', RCUBE_INPUT_GPC); @@ -51,38 +53,48 @@ else $book_types = (array) $RCMAIL->config->get('autocomplete_addressbooks', 'sql'); if (!empty($book_types) && strlen($search)) { - $contacts = array(); + $contacts = array(); $books_num = count($book_types); + $search_lc = mb_strtolower($search); foreach ($book_types as $id) { $abook = $RCMAIL->get_address_book($id); $abook->set_pagesize($MAXNUM); - if ($result = $abook->search(array('email','name'), $search, false, true, true, 'email')) { + if ($result = $abook->search(array('email','name'), $search, $mode, true, true, 'email')) { while ($sql_arr = $result->iterate()) { // Contact can have more than one e-mail address $email_arr = (array)$abook->get_col_values('email', $sql_arr, true); $email_cnt = count($email_arr); foreach ($email_arr as $email) { - if (empty($email)) + if (empty($email)) { continue; + } + $contact = format_email_recipient($email, $sql_arr['name']); + // skip entries that don't match - if ($email_cnt > 1 && stripos($contact, $search) === false) { + if ($email_cnt > 1 && strpos(mb_strtolower($contact), $search_lc) === false) { continue; } + // skip duplicates if (!in_array($contact, $contacts)) { $contacts[] = $contact; if (count($contacts) >= $MAXNUM) break 2; } + + // skip redundant entries (show only first email address) + if ($single) { + break; + } } } } // also list matching contact groups - if ($abook->groups) { + if ($abook->groups && count($contacts) < $MAXNUM) { foreach ($abook->list_groups($search) as $group) { $abook->reset(); $abook->set_group($group['ID']); diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index 39c25f19c..8407b06cd 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -639,6 +639,9 @@ function rcmail_wash_html($html, $p = array(), $cid_replaces) if (!$p['skip_washer_style_callback']) $washer->add_callback('style', 'rcmail_washtml_callback'); + // Remove non-UTF8 characters (#1487813) + $html = rc_utf8_clean($html); + $html = $washer->wash($html); $REMOTE_OBJECTS = $washer->extlinks; diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc index 97cac5822..8976e863a 100644 --- a/program/steps/mail/show.inc +++ b/program/steps/mail/show.inc @@ -150,12 +150,13 @@ function rcmail_message_attachments($attrib) return $out; } -function rcmail_remote_objects_msg($attrib) +function rcmail_remote_objects_msg() { global $MESSAGE, $RCMAIL; - if (!$attrib['id']) - $attrib['id'] = 'rcmremoteobjmsg'; + $attrib['id'] = 'remote-objects-message'; + $attrib['class'] = 'notice'; + $attrib['style'] = 'display: none'; $msg = Q(rcube_label('blockedimages')) . ' '; $msg .= html::a(array('href' => "#loadimages", 'onclick' => JS_OBJECT_NAME.".command('load-images')"), Q(rcube_label('showimages'))); @@ -170,6 +171,48 @@ function rcmail_remote_objects_msg($attrib) return html::div($attrib, $msg); } +function rcmail_message_buttons() +{ + global $MESSAGE, $RCMAIL, $CONFIG; + + $mbox = $RCMAIL->imap->get_mailbox_name(); + $delim = $RCMAIL->imap->get_hierarchy_delimiter(); + $dbox = $CONFIG['drafts_mbox']; + + // the message is not a draft + if ($mbox != $dbox && strpos($mbox, $dbox.$delim) !== 0) { + return ''; + } + + $attrib['id'] = 'message-buttons'; + $attrib['class'] = 'notice'; + + $msg = Q(rcube_label('isdraft')) . ' '; + $msg .= html::a(array('href' => "#edit", 'onclick' => JS_OBJECT_NAME.".command('edit')"), Q(rcube_label('edit'))); + + return html::div($attrib, $msg); +} + +function rcmail_message_objects($attrib) +{ + global $RCMAIL, $MESSAGE; + + if (!$attrib['id']) + $attrib['id'] = 'message-objects'; + + $content = array( + rcmail_message_buttons(), + rcmail_remote_objects_msg(), + ); + + $plugin = $RCMAIL->plugins->exec_hook('message_objects', + array('content' => $content, 'message' => $MESSAGE)); + + $content = implode("\n", $plugin['content']); + + return html::div($attrib, $content); +} + function rcmail_contact_exists($email) { global $RCMAIL; @@ -189,7 +232,8 @@ function rcmail_contact_exists($email) $OUTPUT->add_handlers(array( 'messageattachments' => 'rcmail_message_attachments', 'mailboxname' => 'rcmail_mailbox_name_display', - 'blockedobjects' => 'rcmail_remote_objects_msg')); + 'messageobjects' => 'rcmail_message_objects', +)); if ($RCMAIL->action=='print' && $OUTPUT->template_exists('messageprint')) -- cgit v1.2.3