makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.3.x'

Browse source
This commit is contained in:
Marc Alexander 2021-08-23 21:23:45 +02:00
commit 3d5d16ee4f
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
phpBB/includes/functions_messenger.php
View file

@ -1851,14 +1851,22 @@ class smtp_class
*/ */
function mail_encode($str, $eol = "\r\n") function mail_encode($str, $eol = "\r\n")
{ {
// define start delimimter, end delimiter and spacer // Check if string contains ASCII only characters
$start = "=?UTF-8?B?"; $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?";
$end = "?="; $end = "?=";
$delimiter = "$eol "; $delimiter = "$eol ";
// Maximum length is 75. $split_length *must* be a multiple of 4, but <= 75 - strlen($start . $delimiter . $end)!!! // Maximum encoded-word length is 75 as per RFC 2047 section 2.
$split_length = 60; // $split_length *must* be a multiple of 4, but <= 75 - strlen($start . $delimiter . $end)!!!
$encoded_str = base64_encode($str); $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);
// If encoded string meets the limits, we just return with the correct data. // If encoded string meets the limits, we just return with the correct data.
if (strlen($encoded_str) <= $split_length) if (strlen($encoded_str) <= $split_length)
@ -1867,7 +1875,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 there is only ASCII data, we just return what we want, correctly splitting the lines.
if (strlen($str) === utf8_strlen($str)) if ($is_ascii)
{ {
return $start . implode($end . $delimiter . $start, str_split($encoded_str, $split_length)) . $end; return $start . implode($end . $delimiter . $start, str_split($encoded_str, $split_length)) . $end;
} }