fix mbstring overloading issue with passwords (#929644).

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@9151 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/ChangeLog b/ChangeLog
index d121673288a5e5fb8a83d106cbe0d557a63090b1..af4c086fcc15e8637fc26ccf7fb27db6d573666c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -287,6 +287,8 @@ Version 1.5.1 -- CVS
     initialization.
   - Fixed wrapping of multibyte strings in message view and replies 
     (#1043576).
+  - mbstring internal encoding is switched to ASCII, if mbstring.func_overload
+    is enabled (#929644).
   
 Version 1.5.0
 --------------------

diff --git a/functions/i18n.php b/functions/i18n.php
index 7b0c3813b38a1cb26c1c76b5beccd7209009cfbf..8c53b5900cdb9f7376a4c9bb4cee7cbdeed848dd 100644 (file)
--- a/functions/i18n.php
+++ b/functions/i18n.php
@@ -413,6 +413,27 @@ function set_up_language($sm_language, $do_search = false, $default = false) {
         } else {
             header( 'Content-Type: text/html; charset=' . $languages[$sm_notAlias]['CHARSET'] );
         }
+
+        /**
+         * mbstring.func_overload fix (#929644).
+         *
+         * php mbstring extension can replace standard string functions with their multibyte 
+         * equivalents. See http://www.php.net/ref.mbstring#mbstring.overload.
+         *
+         * Some SquirrelMail functions work with 8bit strings in bytes. If interface is forced
+         * to use mbstring functions and mbstring internal encoding is set to multibyte charset,
+         * interface can't trust regular string functions. Due to mbstring overloading design 
+         * limits php scripts can't control this setting.
+         *
+         * This hack should fix some issues related to 8bit strings in passwords. Correct fix is
+         * to disable mbstring overloading. Japanese translation uses different internal encoding.
+         */
+        if ($squirrelmail_language != 'ja_JP' && 
+            function_exists('mb_internal_encoding') &&
+            check_php_version(4,2,0) &&
+            (int)ini_get('mbstring.func_overload')!=0) {
+            mb_internal_encoding('ASCII');
+        }
     }
     return 0;
 }