From: x2003bruneau <x2003bruneau@9869982d-c50d-0410-be91-f2a2ec7c7c7b>
Date: Tue, 14 Mar 2006 10:14:48 +0000 (+0000)
Subject: Parce que certains clients news n'aiment pas les majuscules...
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=eeae3e3e402fa1fc39745a5455c86352982d929f;p=banana.git

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
---

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) {