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 --- CHANGELOG | 4 ++ config/main.inc.php.dist | 10 +++ plugins/acl/acl.js | 2 +- plugins/acl/acl.php | 9 ++- plugins/newmail_notifier/localization/lv_LV.inc | 13 ++++ program/include/rcube_addressbook.php | 8 ++- program/include/rcube_contacts.php | 81 +++++++++++++++++++------ program/include/rcube_imap.php | 2 +- program/include/rcube_ldap.php | 52 ++++++++++++---- program/include/rcube_session.php | 7 ++- program/js/app.js | 12 +--- program/localization/en_US/labels.inc | 2 + program/localization/pl_PL/labels.inc | 2 + program/steps/addressbook/copy.inc | 4 +- program/steps/addressbook/import.inc | 4 +- program/steps/addressbook/mailto.inc | 2 +- program/steps/addressbook/save.inc | 2 +- program/steps/addressbook/search.inc | 5 +- program/steps/mail/addcontact.inc | 6 +- program/steps/mail/autocomplete.inc | 24 ++++++-- program/steps/mail/func.inc | 3 + program/steps/mail/show.inc | 52 ++++++++++++++-- program/steps/settings/func.inc | 10 +++ program/steps/settings/save_prefs.inc | 1 + skins/default/common.css | 12 ++-- skins/default/ie6hacks.css | 5 +- skins/default/mail.css | 7 +-- skins/default/templates/message.html | 3 +- skins/default/templates/messagepreview.html | 2 +- tests/mailfunc.php | 11 ++++ 30 files changed, 278 insertions(+), 79 deletions(-) create mode 100644 plugins/newmail_notifier/localization/lv_LV.inc diff --git a/CHANGELOG b/CHANGELOG index 2b5e7094b..909a9f3cf 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,10 @@ CHANGELOG Roundcube Webmail =========================== +- Add option to skip alternative email addresses in autocompletion +- Fix inconsistent behaviour of Compose button in Drafts folder, add Edit button for drafts +- Fix problem with parsing HTML message body with non-unicode characters (#1487813) +- Add option to define matching method for addressbook search (#1486564, #1487907) - Make email recipients separator configurable - Fix so folders with \Noinferiors attribute aren't listed in parent selector - Fix handling of curly brackets in URLs (#1488168) diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist index 9493b3057..fe58350be 100644 --- a/config/main.inc.php.dist +++ b/config/main.inc.php.dist @@ -627,6 +627,13 @@ $rcmail_config['autocomplete_max'] = 15; // available placeholders: {street}, {locality}, {zipcode}, {country}, {region} $rcmail_config['address_template'] = '{street}
{locality} {zipcode}
{country} {region}'; +// Matching mode for addressbook search (including autocompletion) +// 0 - partial (*abc*), default +// 1 - strict (abc) +// 2 - prefix (abc*) +// Note: For LDAP sources fuzzy_search must be enabled to use 'partial' or 'prefix' mode +$rcmail_config['addressbook_search_mode'] = 0; + // ---------------------------------- // USER PREFERENCES // ---------------------------------- @@ -774,4 +781,7 @@ $rcmail_config['default_addressbook'] = null; // Enables spell checking before sending a message. $rcmail_config['spellcheck_before_send'] = false; +// Skip alternative email addresses in autocompletion (show one address per contact) +$rcmail_config['autocomplete_single'] = false; + // end of config file diff --git a/plugins/acl/acl.js b/plugins/acl/acl.js index 488e72722..c4011a81c 100644 --- a/plugins/acl/acl.js +++ b/plugins/acl/acl.js @@ -1,7 +1,7 @@ /** * ACL plugin script * - * @version 0.6.2 + * @version 0.6.3 * @author Aleksander Machniak */ diff --git a/plugins/acl/acl.php b/plugins/acl/acl.php index fe7d0d5eb..1448fb088 100644 --- a/plugins/acl/acl.php +++ b/plugins/acl/acl.php @@ -3,7 +3,7 @@ /** * Folders Access Control Lists Management (RFC4314, RFC2086) * - * @version 0.6.2 + * @version 0.6.3 * @author Aleksander Machniak * * @@ -91,8 +91,11 @@ class acl extends rcube_plugin $users = array(); if ($this->init_ldap()) { - $this->ldap->set_pagesize((int)$this->rc->config->get('autocomplete_max', 15)); - $result = $this->ldap->search('*', $search); + $max = (int) $this->rc->config->get('autocomplete_max', 15); + $mode = (int) $this->rc->config->get('addressbook_search_mode'); + + $this->ldap->set_pagesize($max); + $result = $this->ldap->search('*', $search, $mode); foreach ($result->records as $record) { $user = $record['uid']; diff --git a/plugins/newmail_notifier/localization/lv_LV.inc b/plugins/newmail_notifier/localization/lv_LV.inc new file mode 100644 index 000000000..bab30f5ef --- /dev/null +++ b/plugins/newmail_notifier/localization/lv_LV.inc @@ -0,0 +1,13 @@ + diff --git a/program/include/rcube_addressbook.php b/program/include/rcube_addressbook.php index 7270f42fd..5f17f4a8a 100644 --- a/program/include/rcube_addressbook.php +++ b/program/include/rcube_addressbook.php @@ -96,12 +96,16 @@ abstract class rcube_addressbook * * @param array List of fields to search in * @param string Search value + * @param int Matching mode: + * 0 - partial (*abc*), + * 1 - strict (=), + * 2 - prefix (abc*) * @param boolean True if results are requested, False if count only * @param boolean True to skip the count query (select only) * @param array List of fields that cannot be empty * @return object rcube_result_set List of contact records and 'count' value */ - abstract function search($fields, $value, $strict=false, $select=true, $nocount=false, $required=array()); + abstract function search($fields, $value, $mode=0, $select=true, $nocount=false, $required=array()); /** * Count number of available contacts in database @@ -399,7 +403,7 @@ abstract class rcube_addressbook { $out = array(); foreach ($data as $c => $values) { - if (strpos($c, $col) === 0) { + if ($c === $col || strpos($c, $col.':') === 0) { if ($flat) { $out = array_merge($out, (array)$values); } diff --git a/program/include/rcube_contacts.php b/program/include/rcube_contacts.php index e822d2c24..fe600e008 100644 --- a/program/include/rcube_contacts.php +++ b/program/include/rcube_contacts.php @@ -177,12 +177,12 @@ class rcube_contacts extends rcube_addressbook " AND contactgroup_id=?". " AND user_id=?", $group_id, $this->user_id); - + if ($sql_result && ($sql_arr = $this->db->fetch_assoc($sql_result))) { $sql_arr['ID'] = $sql_arr['contactgroup_id']; return $sql_arr; } - + return null; } @@ -268,14 +268,17 @@ class rcube_contacts extends rcube_addressbook * * @param mixed $fields The field name of array of field names to search in * @param mixed $value Search value (or array of values when $fields is array) - * @param boolean $strict True for strict (=), False for partial (LIKE) matching + * @param int $mode Matching mode: + * 0 - partial (*abc*), + * 1 - strict (=), + * 2 - prefix (abc*) * @param boolean $select True if results are requested, False if count only * @param boolean $nocount True to skip the count query (select only) * @param array $required List of fields that cannot be empty * * @return object rcube_result_set Contact records and 'count' value */ - function search($fields, $value, $strict=false, $select=true, $nocount=false, $required=array()) + function search($fields, $value, $mode=0, $select=true, $nocount=false, $required=array()) { if (!is_array($fields)) $fields = array($fields); @@ -283,6 +286,7 @@ class rcube_contacts extends rcube_addressbook $required = array($required); $where = $and_where = array(); + $mode = intval($mode); foreach ($fields as $idx => $col) { // direct ID search @@ -295,26 +299,56 @@ class rcube_contacts extends rcube_addressbook // fulltext search in all fields else if ($col == '*') { $words = array(); - foreach (explode(" ", self::normalize_string($value)) as $word) - $words[] = $this->db->ilike('words', '%'.$word.'%'); + foreach (explode(" ", self::normalize_string($value)) as $word) { + switch ($mode) { + case 1: // strict + $words[] = '(' . $this->db->ilike('words', $word.' %') + . ' OR ' . $this->db->ilike('words', '% '.$word.' %') + . ' OR ' . $this->db->ilike('words', '% '.$word) . ')'; + break; + case 2: // prefix + $words[] = '(' . $this->db->ilike('words', $word.'%') + . ' OR ' . $this->db->ilike('words', '% '.$word.'%') . ')'; + break; + default: // partial + $words[] = $this->db->ilike('words', '%'.$word.'%'); + } + } $where[] = '(' . join(' AND ', $words) . ')'; } else { $val = is_array($value) ? $value[$idx] : $value; // table column if (in_array($col, $this->table_cols)) { - if ($strict) { + switch ($mode) { + case 1: // strict $where[] = $this->db->quoteIdentifier($col).' = '.$this->db->quote($val); - } - else { + break; + case 2: // prefix + $where[] = $this->db->ilike($col, $val.'%'); + break; + default: // partial $where[] = $this->db->ilike($col, '%'.$val.'%'); } } // vCard field else { if (in_array($col, $this->fulltext_cols)) { - foreach (explode(" ", self::normalize_string($val)) as $word) - $words[] = $this->db->ilike('words', '%'.$word.'%'); + foreach (explode(" ", self::normalize_string($val)) as $word) { + switch ($mode) { + case 1: // strict + $words[] = '(' . $this->db->ilike('words', $word.' %') + . ' OR ' . $this->db->ilike('words', '% '.$word.' %') + . ' OR ' . $this->db->ilike('words', '% '.$word) . ')'; + break; + case 2: // prefix + $words[] = '(' . $this->db->ilike('words', $word.'%') + . ' OR ' . $this->db->ilike('words', ' '.$word.'%') . ')'; + break; + default: // partial + $words[] = $this->db->ilike('words', '%'.$word.'%'); + } + } $where[] = '(' . join(' AND ', $words) . ')'; } if (is_array($value)) @@ -362,13 +396,24 @@ class rcube_contacts extends rcube_addressbook $search = $post_search[$colname]; foreach ((array)$row[$col] as $value) { // composite field, e.g. address - if (is_array($value)) { - $value = implode($value); - } - $value = mb_strtolower($value); - if (($strict && $value == $search) || (!$strict && strpos($value, $search) !== false)) { - $found[$colname] = true; - break; + foreach ((array)$value as $val) { + $val = mb_strtolower($val); + switch ($mode) { + case 1: + $got = ($val == $search); + break; + case 2: + $got = ($search == substr($val, 0, strlen($search))); + break; + default: + $got = (strpos($val, $search) !== false); + break; + } + + if ($got) { + $found[$colname] = true; + break 2; + } } } } diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php index 7508acda5..8c1fab8cf 100644 --- a/program/include/rcube_imap.php +++ b/program/include/rcube_imap.php @@ -478,7 +478,7 @@ class rcube_imap */ function get_mailbox_name() { - return $this->conn->connected() ? $this->mailbox : ''; + return $this->mailbox; } diff --git a/program/include/rcube_ldap.php b/program/include/rcube_ldap.php index 00ee1c87b..c1bff53ab 100644 --- a/program/include/rcube_ldap.php +++ b/program/include/rcube_ldap.php @@ -690,15 +690,20 @@ class rcube_ldap extends rcube_addressbook * * @param mixed $fields The field name of array of field names to search in * @param mixed $value Search value (or array of values when $fields is array) - * @param boolean $strict True for strict, False for partial (fuzzy) matching + * @param int $mode Matching mode: + * 0 - partial (*abc*), + * 1 - strict (=), + * 2 - prefix (abc*) * @param boolean $select True if results are requested, False if count only * @param boolean $nocount (Not used) * @param array $required List of fields that cannot be empty * * @return array Indexed list of contact records and 'count' value */ - function search($fields, $value, $strict=false, $select=true, $nocount=false, $required=array()) + function search($fields, $value, $mode=0, $select=true, $nocount=false, $required=array()) { + $mode = intval($mode); + // special treatment for ID-based search if ($fields == 'ID' || $fields == $this->primary_key) { @@ -730,13 +735,31 @@ class rcube_ldap extends rcube_addressbook array_values($this->fieldmap), 0, (int)$this->prop['sizelimit'], (int)$this->prop['timelimit']); // get all entries of this page and post-filter those that really match the query + $search = mb_strtolower($value); $this->result = new rcube_result_set(0); $entries = ldap_get_entries($this->conn, $this->ldap_result); + for ($i = 0; $i < $entries['count']; $i++) { $rec = $this->_ldap2result($entries[$i]); - if (stripos($rec['name'] . $rec['email'], $value) !== false) { - $this->result->add($rec); - $this->result->count++; + foreach (array('email', 'name') as $f) { + $val = mb_strtolower($rec[$f]); + switch ($mode) { + case 1: + $got = ($val == $search); + break; + case 2: + $got = ($search == substr($val, 0, strlen($search))); + break; + default: + $got = (strpos($val, $search) !== false); + break; + } + + if ($got) { + $this->result->add($rec); + $this->result->count++; + break; + } } } @@ -745,7 +768,14 @@ class rcube_ldap extends rcube_addressbook // use AND operator for advanced searches $filter = is_array($value) ? '(&' : '(|'; - $wc = !$strict && $this->prop['fuzzy_search'] ? '*' : ''; + // set wildcards + $wp = $ws = ''; + if (!empty($this->prop['fuzzy_search']) && $mode != 1) { + $ws = '*'; + if (!$mode) { + $wp = '*'; + } + } if ($fields == '*') { @@ -759,7 +789,7 @@ class rcube_ldap extends rcube_addressbook if (is_array($this->prop['search_fields'])) { foreach ($this->prop['search_fields'] as $field) { - $filter .= "($field=$wc" . $this->_quote_string($value) . "$wc)"; + $filter .= "($field=$wp" . $this->_quote_string($value) . "$ws)"; } } } @@ -768,7 +798,7 @@ class rcube_ldap extends rcube_addressbook foreach ((array)$fields as $idx => $field) { $val = is_array($value) ? $value[$idx] : $value; if ($f = $this->_map_field($field)) { - $filter .= "($f=$wc" . $this->_quote_string($val) . "$wc)"; + $filter .= "($f=$wp" . $this->_quote_string($val) . "$ws)"; } } } @@ -1417,9 +1447,9 @@ class rcube_ldap extends rcube_addressbook $groups = array(); if ($search) { - $search = strtolower($search); + $search = mb_strtolower($search); foreach ($group_cache as $group) { - if (strstr(strtolower($group['name']), $search)) + if (strpos(mb_strtolower($group['name']), $search) !== false) $groups[] = $group; } } @@ -1495,7 +1525,7 @@ class rcube_ldap extends rcube_addressbook $groups[$group_id]['email'][] = $ldap_data[$i][$email_attr][$j]; } - $group_sortnames[] = strtolower($ldap_data[$i][$sort_attr][0]); + $group_sortnames[] = mb_strtolower($ldap_data[$i][$sort_attr][0]); } // recursive call can exit here diff --git a/program/include/rcube_session.php b/program/include/rcube_session.php index dd28b098f..582b27efa 100644 --- a/program/include/rcube_session.php +++ b/program/include/rcube_session.php @@ -410,9 +410,12 @@ class rcube_session public function reload() { if ($this->key && $this->memcache) - $this->mc_read($this->key); + $data = $this->mc_read($this->key); else if ($this->key) - $this->db_read($this->key); + $data = $this->db_read($this->key); + + if ($data) + session_decode($data); } diff --git a/program/js/app.js b/program/js/app.js index 4ca19b7cd..5902b1d74 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -207,7 +207,7 @@ function rcube_webmail() 'moveto', 'copy', 'delete', 'open', 'mark', 'edit', 'viewsource', 'download', 'print', 'load-attachment', 'load-headers', 'forward-attachment']; - if (this.env.action=='show' || this.env.action=='preview') { + if (this.env.action == 'show' || this.env.action == 'preview') { this.enable_command(this.env.message_commands, this.env.uid); this.enable_command('reply-list', this.env.list_post); @@ -460,7 +460,7 @@ function rcube_webmail() } // check input before leaving compose step - if (this.task=='mail' && this.env.action=='compose' && $.inArray(command, this.env.compose_commands)<0) { + if (this.task == 'mail' && this.env.action == 'compose' && $.inArray(command, this.env.compose_commands)<0) { if (this.cmp_hash != this.compose_field_hash() && !confirm(this.get_label('notsentwarning'))) return false; } @@ -815,13 +815,7 @@ function rcube_webmail() if (this.task == 'mail') { url += '&_mbox='+urlencode(this.env.mailbox); - - if (this.env.mailbox == this.env.drafts_mailbox) { - var uid; - if (uid = this.get_single_uid()) - url += '&_draft_uid='+uid; - } - else if (props) + if (props) url += '&_to='+urlencode(props); } // modify url if we're in addressbook diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc index 5cf5acff1..6aefd6c4a 100644 --- a/program/localization/en_US/labels.inc +++ b/program/localization/en_US/labels.inc @@ -225,6 +225,7 @@ $labels['highest'] = 'Highest'; $labels['nosubject'] = '(no subject)'; $labels['showimages'] = 'Display images'; $labels['alwaysshow'] = 'Always show images from $sender'; +$labels['isdraft'] = 'This is a draft message.'; $labels['htmltoggle'] = 'HTML'; $labels['plaintoggle'] = 'Plain text'; @@ -430,6 +431,7 @@ $labels['reqmdn'] = 'Always request a return receipt'; $labels['reqdsn'] = 'Always request a delivery status notification'; $labels['replysamefolder'] = 'Place replies in the folder of the message being replied to'; $labels['defaultaddressbook'] = 'Add new contacts to the selected addressbook'; +$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion'; $labels['spellcheckbeforesend'] = 'Check spelling before sending a message'; $labels['spellcheckoptions'] = 'Spellcheck Options'; $labels['spellcheckignoresyms'] = 'Ignore words with symbols'; diff --git a/program/localization/pl_PL/labels.inc b/program/localization/pl_PL/labels.inc index 717c7c368..4ec33fd6f 100644 --- a/program/localization/pl_PL/labels.inc +++ b/program/localization/pl_PL/labels.inc @@ -432,5 +432,7 @@ $labels['spellcheckignorecaps'] = 'Ignoruj słowa pisane wielkimi literami'; $labels['addtodict'] = 'Dodaj do słownika'; $labels['dateformat'] = 'Format daty'; $labels['timeformat'] = 'Format czasu'; +$labels['isdraft'] = 'To jest kopia robocza wiadomości.'; +$labels['autocompletesingle'] = 'Nie pokazuj alternatywnych adresów przy autouzupełnianiu'; ?> diff --git a/program/steps/addressbook/copy.inc b/program/steps/addressbook/copy.inc index e07d62af9..5e526e1aa 100644 --- a/program/steps/addressbook/copy.inc +++ b/program/steps/addressbook/copy.inc @@ -60,9 +60,9 @@ foreach ($cids as $source => $cid) // Check if contact exists, if so, we'll need it's ID // Note: Some addressbooks allows empty email address field if (!empty($a_record['email'])) - $result = $TARGET->search('email', $a_record['email'], true, true, true); + $result = $TARGET->search('email', $a_record['email'], 1, true, true); else if (!empty($a_record['name'])) - $result = $TARGET->search('name', $a_record['name'], true, true, true); + $result = $TARGET->search('name', $a_record['name'], 1, true, true); else $result = new rcube_result_set(); diff --git a/program/steps/addressbook/import.inc b/program/steps/addressbook/import.inc index 1b9aea18a..63a6dae30 100644 --- a/program/steps/addressbook/import.inc +++ b/program/steps/addressbook/import.inc @@ -174,9 +174,9 @@ if ($_FILES['_file']['tmp_name'] && is_uploaded_file($_FILES['_file']['tmp_name' if (!$replace && $email) { // compare e-mail address - $existing = $CONTACTS->search('email', $email, false, false); + $existing = $CONTACTS->search('email', $email, 1, false); if (!$existing->count && $vcard->displayname) { // compare display name - $existing = $CONTACTS->search('name', $vcard->displayname, false, false); + $existing = $CONTACTS->search('name', $vcard->displayname, 1, false); } if ($existing->count) { $IMPORT_STATS->skipped++; diff --git a/program/steps/addressbook/mailto.inc b/program/steps/addressbook/mailto.inc index 99c022db2..c40ecdf72 100644 --- a/program/steps/addressbook/mailto.inc +++ b/program/steps/addressbook/mailto.inc @@ -31,7 +31,7 @@ foreach ($cids as $source => $cid) { $CONTACTS->set_page(1); $CONTACTS->set_pagesize(count($cid) + 2); // +2 to skip counting query - $recipients = $CONTACTS->search($CONTACTS->primary_key, $cid, false, true, true, 'email'); + $recipients = $CONTACTS->search($CONTACTS->primary_key, $cid, 0, true, true, 'email'); } } diff --git a/program/steps/addressbook/save.inc b/program/steps/addressbook/save.inc index ddbd630ef..0a2d6dbff 100644 --- a/program/steps/addressbook/save.inc +++ b/program/steps/addressbook/save.inc @@ -162,7 +162,7 @@ else { // show notice if existing contacts with same e-mail are found $existing = false; foreach ($CONTACTS->get_col_values('email', $a_record, true) as $email) { - if ($email && ($res = $CONTACTS->search('email', $email, false, false, true)) && $res->count) { + if ($email && ($res = $CONTACTS->search('email', $email, 1, false, true)) && $res->count) { $OUTPUT->show_message('contactexists', 'notice', null, false); break; } diff --git a/program/steps/addressbook/search.inc b/program/steps/addressbook/search.inc index ea9824727..643cc60a8 100644 --- a/program/steps/addressbook/search.inc +++ b/program/steps/addressbook/search.inc @@ -137,6 +137,9 @@ function rcmail_contact_search() } } + // Values matching mode + $mode = (int) $RCMAIL->config->get('addressbook_search_mode'); + // get sources list $sources = $RCMAIL->get_address_sources(); $search_set = array(); @@ -168,7 +171,7 @@ function rcmail_contact_search() $source->set_pagesize(9999); // get contacts count - $result = $source->search($fields, $search, false, false); + $result = $source->search($fields, $search, $mode, false); if (!$result->count) { continue; 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')) diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc index bb144d4cb..6ba524724 100644 --- a/program/steps/settings/func.inc +++ b/program/steps/settings/func.inc @@ -659,6 +659,16 @@ function rcmail_user_prefs($current=null) ); } + if (!isset($no_override['autocomplete_single'])) { + $field_id = 'rcmfd_autocomplete_single'; + $checkbox = new html_checkbox(array('name' => '_autocomplete_single', 'id' => $field_id, 'value' => 1)); + + $blocks['main']['options']['autocomplete_single'] = array( + 'title' => html::label($field_id, Q(rcube_label('autocompletesingle'))), + 'content' => $checkbox->show($config['autocomplete_single']?1:0), + ); + } + break; // Special IMAP folders diff --git a/program/steps/settings/save_prefs.inc b/program/steps/settings/save_prefs.inc index a32f5948c..d917e1157 100644 --- a/program/steps/settings/save_prefs.inc +++ b/program/steps/settings/save_prefs.inc @@ -93,6 +93,7 @@ switch ($CURR_SECTION) case 'addressbook': $a_user_prefs = array( 'default_addressbook' => get_input_value('_default_addressbook', RCUBE_INPUT_POST, true), + 'autocomplete_single' => isset($_POST['_autocomplete_single']) ? TRUE : FALSE, ); break; diff --git a/skins/default/common.css b/skins/default/common.css index 192de065a..6bf8e9032 100644 --- a/skins/default/common.css +++ b/skins/default/common.css @@ -230,7 +230,7 @@ img } #message div.notice, -#remote-objects-message +#message-objects div.notice { background: url(images/display/icons.png) 6px 3px no-repeat; background-color: #F7FDCB; @@ -238,21 +238,25 @@ img } #message div.error, -#message div.warning +#message div.warning, +#message-objects div.warning, +#message-objects div.error { background: url(images/display/icons.png) 6px -97px no-repeat; background-color: #EF9398; border: 1px solid #DC5757; } -#message div.confirmation +#message div.confirmation, +#message-objects div.confirmation { background: url(images/display/icons.png) 6px -47px no-repeat; background-color: #A6EF7B; border: 1px solid #76C83F; } -#message div.loading +#message div.loading, +#message-objects div.loading { background: url(images/display/loading.gif) 6px 3px no-repeat; background-color: #EBEBEB; diff --git a/skins/default/ie6hacks.css b/skins/default/ie6hacks.css index 5da6e7aa9..dc7f24a2e 100644 --- a/skins/default/ie6hacks.css +++ b/skins/default/ie6hacks.css @@ -20,7 +20,10 @@ img #message div.error, #message div.warning, #message div.confirmation, -#remote-objects-message +#message-objects div.notice, +#message-objects div.error, +#message-objects div.warning, +#message-objects div.confirmation { background-image: url(images/display/icons.gif); } diff --git a/skins/default/mail.css b/skins/default/mail.css index 9bc46d08a..3ea4fec6c 100644 --- a/skins/default/mail.css +++ b/skins/default/mail.css @@ -1197,21 +1197,20 @@ div.message-htmlpart div.rcmBody margin: 8px; } -#remote-objects-message +#message-objects div { - display: none; margin: 8px; min-height: 20px; padding: 10px 10px 6px 46px; } -#remote-objects-message a +#message-objects div a { color: #666666; padding-left: 10px; } -#remote-objects-message a:hover +#message-objects div a:hover { color: #333333; } diff --git a/skins/default/templates/message.html b/skins/default/templates/message.html index 8e2bb2cb3..714540b78 100644 --- a/skins/default/templates/message.html +++ b/skins/default/templates/message.html @@ -36,8 +36,7 @@ - - +
diff --git a/skins/default/templates/messagepreview.html b/skins/default/templates/messagepreview.html index bfd7d7d92..a606311e1 100644 --- a/skins/default/templates/messagepreview.html +++ b/skins/default/templates/messagepreview.html @@ -13,7 +13,7 @@
- + diff --git a/tests/mailfunc.php b/tests/mailfunc.php index 9d70befeb..6dc60ba04 100644 --- a/tests/mailfunc.php +++ b/tests/mailfunc.php @@ -99,6 +99,17 @@ class rcube_test_mailfunc extends UnitTestCase $this->assertNoPattern('/font-style:italic/', $washed, "Allow valid styles"); } + /** + * Test washtml class on non-unicode characters (#1487813) + */ + function test_washtml_utf8() + { + $part = $this->get_html_part('src/invalidchars.html'); + $washed = rcmail_print_body($part); + + $this->assertPattern('/

сОЌвПл<\/p>/', $washed, "Remove non-unicode characters from HTML message body"); + } + /** * Test links pattern replacements in plaintext messages */ -- cgit v1.2.3