From 1b1735d1af257179f690aa1f84621f37075cf874 Mon Sep 17 00:00:00 2001 From: robert Date: Sat, 18 Nov 2006 12:26:35 +0000 Subject: [PATCH] don't use base64 encoding on text or message attachments, var name for end boundary --- include/classes/email.php-class | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/include/classes/email.php-class b/include/classes/email.php-class index bf7273c..a2defce 100755 --- a/include/classes/email.php-class +++ b/include/classes/email.php-class @@ -247,12 +247,20 @@ class email { foreach ($this->attachments as $attach) { $mtxt .= "\n".'--'.$boundary."\n"; $mtxt .= 'Content-Type: '.$attach['type'].'; name="'.$attach['name'].'";'."\n"; - $mtxt .= 'Content-Transfer-Encoding: base64'."\n"; - $mtxt .= 'Content-Disposition: attachment'."\n\n"; - $mtxt .= rtrim(chunk_split(base64_encode($attach['content']), 76)); ; - $mtxt .= "\n"; + if (preg_match('/^(text|message)\//', $attach['type'])) { + $mtxt .= 'Content-Transfer-Encoding: 8bit'."\n"; + $mtxt .= 'Content-Disposition: attachment'."\n\n"; + $mtxt .= $attach['content']; + $mtxt .= "\n"; + } + else { + $mtxt .= 'Content-Transfer-Encoding: base64'."\n"; + $mtxt .= 'Content-Disposition: attachment'."\n\n"; + $mtxt .= rtrim(chunk_split(base64_encode($attach['content']), 76)); ; + $mtxt .= "\n"; + } } - $mtext .= '--'.$boundary.'--'."\n"; + $mtxt .= '--'.$boundary.'--'."\n"; } if (strlen($this->debug_toSingleAddress)) { -- 2.35.3