pkgsrc/mail/squirrelmail/patches/patch-ca
taca fff65a0a96 Update squirrelmail to 1.4.23pre14345, snap shot from squirrelmail's
repository.  Approved by wiz@.

* Now work well with PHP 5.4 and later.

Version 1.4.23 - SVN
--------------------
  - Added capability to issue SEARCH commands in literal format (so that
    non-ASCII search terms are handled RFC-correctly).
  - Fixed hook name clash: new "smtp_auth" hook added in version 1.4.22
    has been renamed to "smtp_authenticate"
  - Added SASL PLAIN mechanism for IMAP logins; backported from version
    1.5.2.
  - Prevent syslog warning in call_user_func_array() call when no
    arguments given.  Patch from Jean-Philippe Guerard (#3309935).
  - Changed the read_body_menu_top hook from concat_hook_function to
    do_hook_function (plugin authors please note)
  - Always ensure that the Reply-To header is a full email address in
    outgoing messages
  - Fixed issue with Noselect mailboxes being clickable in folder list
  - Made performance improvements in mailbox listing
  - Attachment filename extensions changed from ".msg" to ".eml"
  - Unified address book searches somewhat: file-backed address books now
    search in each field individually; database-backed address books now
    search in fields other than first/last name (nickname, email); LDAP-
    backed address books now search in common name fields as well as by
    email address (cn, sn, givenname, mail)
  - You may now enable LDAP-backed address books to be listed (using
    the "List all" button on the address search screen accessed via
    the "Addresses" button on the compose screen) by adding
    "$ldap_abook_allow_listing = TRUE;" (without quotes) to
    config/config_local.php (previously, this required editing of a
    file).
  - Added ability to control browser rendering mode (quirks versus
    standards) - see the $browser_rendering_mode setting in
    config/config.php or the "4. General Options ==> 19. Browser
    rendering mode" setting in the configuration tool (#3240356).
  - Added "search_index_before" hook (analog of the "mailbox_index_before"
    hook)
  - Made performance improvements in security token handling
  - Improvements for compatibility with PHP 5.4.
  - Added option that allows users to have replies to their own
    messages sent to the recipient of the previous message (#3520988).
2012-12-28 04:03:34 +00:00

32 lines
1.2 KiB
Text

$NetBSD: patch-ca,v 1.2 2012/12/28 04:03:35 taca Exp $
* A care for Japanese language environment.
* Limit exploding.
--- plugins/filters/filters.php.orig 2009-07-27 10:40:44.000000000 +0900
+++ plugins/filters/filters.php
@@ -317,8 +317,14 @@ function filter_search_and_delete($imap,
if ($allow_charset_search &&
isset($languages[$squirrelmail_language]['CHARSET']) &&
$languages[$squirrelmail_language]['CHARSET']) {
+ if ($squirrelmail_language == 'ja_JP') {
+ $cs = 'euc-JP';
+ } else {
+ $cs = $languages[$squirrelmail_language]['CHARSET'];
+ }
+ $cs = strtoupper($cs);
$search_str = 'SEARCH CHARSET '
- . strtoupper($languages[$squirrelmail_language]['CHARSET'])
+ . $cs
. ' ' . $category;
} else {
$search_str = 'SEARCH CHARSET US-ASCII ' . $category;
@@ -552,7 +558,7 @@ function load_filters() {
$filters = array();
for ($i = 0; $fltr = getPref($data_dir, $username, 'filter' . $i); $i++) {
- $ary = explode(',', $fltr);
+ $ary = explode(',', $fltr, 3);
$filters[$i]['where'] = $ary[0];
$filters[$i]['what'] = str_replace('###COMMA###', ',', $ary[1]);
$filters[$i]['folder'] = $ary[2];