diff options
| author | zotlabs <mike@macgirvin.com> | 2019-03-14 21:19:56 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2019-03-14 21:19:56 -0700 |
| commit | 8ebc517b4174c400009300e1c13f2f95ba78353b (patch) | |
| tree | 70209e58fdf6a22e2df5d3d518d0cd9d5a260262 | |
| parent | 8769fa0156c470b533bdf23a0df5beb20bc1a4bd (diff) | |
| parent | 91b03e52f11375c3be5701a4ba6fb2d07d5b72c0 (diff) | |
| download | volse-hubzilla-8ebc517b4174c400009300e1c13f2f95ba78353b.tar.gz volse-hubzilla-8ebc517b4174c400009300e1c13f2f95ba78353b.tar.bz2 volse-hubzilla-8ebc517b4174c400009300e1c13f2f95ba78353b.zip | |
Merge branch 'dev' of ../hz into dev
| -rw-r--r-- | include/network.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/network.php b/include/network.php index 12f2ad4e9..3e8134a32 100644 --- a/include/network.php +++ b/include/network.php @@ -874,13 +874,16 @@ function xml2array($contents, $namespaces = true, $get_attributes=1, $priority = } -function email_header_encode($in_str, $charset = 'UTF-8') { +function email_header_encode($in_str, $charset = 'UTF-8', $header = 'Subject') { + + $out_str = $in_str; $need_to_convert = false; for($x = 0; $x < strlen($in_str); $x ++) { if((ord($in_str[$x]) == 0) || ((ord($in_str[$x]) > 128))) { $need_to_convert = true; + break; } } @@ -896,7 +899,7 @@ function email_header_encode($in_str, $charset = 'UTF-8') { // determine length of encoded text within chunks // and ensure length is even - $length = 75 - strlen($start) - strlen($end); + $length = 75 - strlen($start) - strlen($end) - (strlen($header) + 2); /* [EDIT BY danbrown AT php DOT net: The following |