email notification

- revert to utf8 encoding as in phpBB 3.3.4

Author: jayrm

includes/functions_messenger.php

@@ -1848,27 +1848,18 @@ function digest_md5($username, $password)
 *
 * Please note that this version fully supports RFC 2045 section 6.8.
 *
-* @param string $str
 * @param string $eol End of line we are using (optional to be backwards compatible)
 */
 function mail_encode($str, $eol = "\r\n")
 {
-	// Check if string contains ASCII only characters
-	$is_ascii = strlen($str) === utf8_strlen($str);
-
-	// Define start delimimter, end delimiter and spacer
-	// Use the Quoted-Printable encoding for ASCII strings to avoid unnecessary encoding in Base64
-	$start = $is_ascii ? "=?US-ASCII?Q?" : "=?UTF-8?B?";
+	// define start delimimter, end delimiter and spacer
+	$start = "=?UTF-8?B?";
 	$end = "?=";
 	$delimiter = "$eol ";
 
-	// Maximum encoded-word length is 75 as per RFC 2047 section 2.
-	// $split_length *must* be a multiple of 4, but <= 75 - strlen($start . $delimiter . $end)!!!
-	$split_length = 75 - strlen($start . $delimiter . $end);
-	$split_length = $split_length - $split_length % 4;
-
-	// Use the Quoted-Printable encoding for ASCII strings to avoid unnecessary encoding in Base64
-	$encoded_str = $is_ascii ? quoted_printable_encode($str) : base64_encode($str);
+	// Maximum length is 75. $split_length *must* be a multiple of 4, but <= 75 - strlen($start . $delimiter . $end)!!!
+	$split_length = 60;
+	$encoded_str = base64_encode($str);
 
 	// If encoded string meets the limits, we just return with the correct data.
 	if (strlen($encoded_str) <= $split_length)
@@ -1877,7 +1868,7 @@ function mail_encode($str, $eol = "\r\n")
 	}
 
 	// If there is only ASCII data, we just return what we want, correctly splitting the lines.
-	if ($is_ascii)
+	if (strlen($str) === utf8_strlen($str))
 	{
 		return $start . implode($end . $delimiter . $start, str_split($encoded_str, $split_length)) . $end;
 	}