[Fusionforge-commits] r8202 - branches/Branch_4_8/gforge/common/include

Roland Mas lolando at libremir.placard.fr.eu.org
Mon Sep 28 14:35:23 CEST 2009


Author: lolando
Date: 2009-09-28 14:35:23 +0200 (Mon, 28 Sep 2009)
New Revision: 8202

Modified:
   branches/Branch_4_8/gforge/common/include/utils.php
Log:
Encode email subject in quoted-printable rather than Base64, patch
from Thorsten Glaser <t.glaser at tarent.de>.


Modified: branches/Branch_4_8/gforge/common/include/utils.php
===================================================================
--- branches/Branch_4_8/gforge/common/include/utils.php	2009-09-28 09:32:05 UTC (rev 8201)
+++ branches/Branch_4_8/gforge/common/include/utils.php	2009-09-28 12:35:23 UTC (rev 8202)
@@ -113,7 +113,7 @@
 		$body2 .= "\nBCC: $BCC";
 	}
 	$send_html_email?$type="html":$type="plain";
-	$body2 .= "\nSubject: ".util_encode_mimeheader($subject, $charset).
+	$body2 .= "\n".util_encode_mimeheader("Subject", $subject, $charset).
 		"\nContent-type: text/$type; charset=$charset".
 		"\n\n".
 		util_convert_body($body, $charset);
@@ -155,17 +155,28 @@
 /**
  * util_encode_mimeheader() - Encode mimeheader
  *
+ * @param		string	The name of the header (e.g. "Subject")
  * @param		string	The email subject
  * @param		string	The converting charset (like ISO-2022-JP)
  * @return		string	The MIME encoded subject
  *
  */
-function util_encode_mimeheader($str,$charset) {
+function util_encode_mimeheader($headername,$str,$charset) {
+	if (function_exists('mb_internal_encoding') &&
+	    function_exists('mb_encode_mimeheader')) {
+		$x = mb_internal_encoding();
+		mb_internal_encoding("UTF-8");
+		$y = mb_encode_mimeheader($headername . ": " . $str,
+					  $charset, "Q");
+		mb_internal_encoding($x);
+		return $y;
+	}
+
 	if (!function_exists('mb_convert_encoding')) {
-		return $str;
+		return $headername . ": " . $str;
 	}
 
-	return "=?".$charset."?B?".
+	return $headername . ": " . "=?".$charset."?B?".
 		base64_encode(mb_convert_encoding(
 			$str,$charset,"UTF-8")).
 		"?=";




More information about the Fusionforge-commits mailing list