From eeae3e3e402fa1fc39745a5455c86352982d929f Mon Sep 17 00:00:00 2001 From: x2003bruneau Date: Tue, 14 Mar 2006 10:14:48 +0000 Subject: [PATCH] Parce que certains clients news n'aiment pas les majuscules... git-svn-id: svn+ssh://murphy/home/svn/banana/trunk@43 9869982d-c50d-0410-be91-f2a2ec7c7c7b --- banana/misc.inc.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/banana/misc.inc.php b/banana/misc.inc.php index f8af7b2..5154b64 100644 --- a/banana/misc.inc.php +++ b/banana/misc.inc.php @@ -114,14 +114,14 @@ function richtextToHtml($source) */ function _headerdecode($charset, $c, $str) { - $s = ($c == 'Q') ? quoted_printable_decode($str) : base64_decode($str); + $s = ($c == 'Q' || $c == 'q') ? quoted_printable_decode($str) : base64_decode($str); $s = iconv($charset, 'iso-8859-15', $s); return str_replace('_', ' ', $s); } function headerDecode($value) { - $val = preg_replace('/(=\?[^?]*\?[BQ]\?[^?]*\?=) (=\?[^?]*\?[BQ]\?[^?]*\?=)/', '\1\2', $value); - return preg_replace('/=\?([^?]*)\?([BQ])\?([^?]*)\?=/e', '_headerdecode("\1", "\2", "\3")', $val); + $val = preg_replace('/(=\?[^?]*\?[BQbq]\?[^?]*\?=) (=\?[^?]*\?[BQbq]\?[^?]*\?=)/', '\1\2', $value); + return preg_replace('/=\?([^?]*)\?([BQbq])\?([^?]*)\?=/e', '_headerdecode("\1", "\2", "\3")', $val); } function headerEncode($value, $trim = 0) { -- 2.1.4