From c133b11bf6251ca2d02600af84baeed0eebed1ca Mon Sep 17 00:00:00 2001
From: Mike Koch <Mike.Koch@emerson.com>
Date: Fri, 18 May 2018 12:42:25 -0400
Subject: [PATCH] HESK 2.8.1 update

---
 inc/email_functions.inc.php | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/inc/email_functions.inc.php b/inc/email_functions.inc.php
index 7f539ac4..62d93059 100644
--- a/inc/email_functions.inc.php
+++ b/inc/email_functions.inc.php
@@ -531,6 +531,7 @@ function hesk_mail($to, $subject, $message, $htmlMessage, $modsForHesk_settings,
         $headers .= "Reply-To: $hesk_settings[from_header]\n";
         $headers .= "Return-Path: $hesk_settings[webmaster_mail]\n";
         $headers .= "Date: " . date(DATE_RFC2822) . "\n";
+        $headers .= "Message-ID: " . hesk_generateMessageID() . "\n";
         $headers .= "Content-Type: multipart/mixed;boundary=\"" . $outerboundary . "\"";
 
         // Add attachments if necessary
@@ -569,7 +570,8 @@ function hesk_mail($to, $subject, $message, $htmlMessage, $modsForHesk_settings,
         "Reply-To: $hesk_settings[from_header]",
         "Return-Path: $hesk_settings[webmaster_mail]",
         "Subject: " . $subject,
-        "Date: " . date(DATE_RFC2822)
+        "Date: " . date(DATE_RFC2822),
+        "Message-ID: " . hesk_generateMessageID() . "\n",
     );
     array_push($headersArray, "MIME-Version: 1.0");
     array_push($headersArray, "Content-Type: multipart/mixed;boundary=\"" . $outerboundary . "\"");
@@ -999,4 +1001,14 @@ function checkForHtml($ticket) {
     }
     $reply = hesk_dbFetchAssoc($repliesRs);
     return $reply['html'];
-}
\ No newline at end of file
+}
+
+function hesk_generateMessageID() {
+    if (function_exists('openssl_random_pseudo_bytes')) {
+        $id = base_convert(bin2hex(openssl_random_pseudo_bytes(8)), 16, 36);
+    } else {
+        $id = uniqid('', true);
+    }
+
+    return '<' . $id . '.' . gmdate('YmdHis') . '@' . $_SERVER['SERVER_NAME'] . '>';
+} // END hesk_generateMessageID()