Netsyms/Mods-for-HESK-Netsyms
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes #214 always append outer boundary on sent emails

Browse Source
This commit is contained in:
Mike Koch 2015-04-18 15:51:40 -04:00
parent 6c92977f4a
commit 2f33ec794c
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
inc/email_functions.inc.php
View File

@ -463,6 +463,7 @@ function hesk_mail($to,$subject,$message,$htmlMessage,$cc=array(),$bcc=array())
{ {
$message .= processDirectAttachments('phpmail', NULL, $outerboundary); $message .= processDirectAttachments('phpmail', NULL, $outerboundary);
} }
$message .= "\n\n".'--'.$outerboundary.'--';
// Send using PHP mail() function // Send using PHP mail() function
ob_start(); ob_start();
@ -515,6 +516,7 @@ function hesk_mail($to,$subject,$message,$htmlMessage,$cc=array(),$bcc=array())
{ {
$message .= processDirectAttachments('smtp', NULL, $outerboundary); $message .= processDirectAttachments('smtp', NULL, $outerboundary);
} }
$message .= "\n\n".'--'.$outerboundary.'--';
if ( ! $smtp->SendMessage($hesk_settings['noreply_mail'], $to_arr, $headersArray, $message)) if ( ! $smtp->SendMessage($hesk_settings['noreply_mail'], $to_arr, $headersArray, $message))
{ {
@ -874,7 +876,6 @@ function processDirectAttachments($emailMethod, $postfields = NULL, $boundary =
$attcontents = chunk_split(base64_encode($attachmentBinary)); $attcontents = chunk_split(base64_encode($attachmentBinary));
$attachments .= $attcontents."\n\n"; $attachments .= $attcontents."\n\n";
} }
$attachments .= "--".$boundary."--";
return $attachments; return $attachments;
} }
} }