From dc4eb3997c4fe15a1a8c90ccca2f7ecad01cefcf Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Sun, 12 Apr 2015 15:53:06 -0400 Subject: [PATCH] #146 Get Mailgun to properly send the attachments --- inc/email_functions.inc.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/inc/email_functions.inc.php b/inc/email_functions.inc.php index 2aadd23b..afc14e95 100644 --- a/inc/email_functions.inc.php +++ b/inc/email_functions.inc.php @@ -399,9 +399,9 @@ function hesk_mail($to,$subject,$message,$htmlMessage,$cc=array(),$bcc=array()) { $postfields['html'] = $htmlMessage; } - if ($hesk_settings['attachments']['use'] && isset($ticket['attachments']) && strlen($ticket['attachments']) && $ticket['attachments'] != '' ) + if ($modsForHesk_settings['attachments'] && $hesk_settings['attachments']['use'] && isset($ticket['attachments']) && strlen($ticket['attachments'])) { - processDirectAttachments('mailgun', $postfields); + $postfields = processDirectAttachments('mailgun', $postfields); } curl_setopt($ch, CURLOPT_POSTFIELDS, $postfields); @@ -856,6 +856,7 @@ function processDirectAttachments($emailMethod, $postfields = NULL, $boundary = $postfields['attachment['.$i.']'] = '@'.HESK_PATH.$hesk_settings['attach_dir'].'/'.$saved_name; $i++; } + return $postfields; } else { $attachments = ''; foreach ($att as $myatt) {