From 53092fe9cae658e044690fdbdff435d940faad76 Mon Sep 17 00:00:00 2001
From: johnnyq <johnny@pittpc.com>
Date: Mon, 17 Apr 2023 16:15:22 -0400
Subject: [PATCH] Updated Ticket email / replies  with ##- Please type your
 reply above this line -##

---
 cron_ticket_email_parser.php | 4 ++--
 post.php                     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cron_ticket_email_parser.php b/cron_ticket_email_parser.php
index 1622030f..20ed9bb3 100644
--- a/cron_ticket_email_parser.php
+++ b/cron_ticket_email_parser.php
@@ -82,7 +82,7 @@ function addTicket($contact_id, $contact_name, $contact_email, $client_id, $date
     if ($config_ticket_client_general_notifications == 1) {
 
         $email_subject = "Ticket created - [$config_ticket_prefix$ticket_number] - $subject";
-        $email_body    = "<i style='color: #808080'>#--itflow--#</i><br><br>Hello, $contact_name<br><br>Thank you for your email. A ticket regarding \"$subject\" has been automatically created for you.<br><br>Ticket: $config_ticket_prefix$ticket_number<br>Subject: $subject<br>Status: Open<br>https://$config_base_url/portal/ticket.php?id=$id<br><br>~<br>$company_name<br>Support Department<br>$config_ticket_from_email<br>$company_phone";
+        $email_body    = "<i style='color: #808080'>##- Please type your reply above this line -##</i><br><br>Hello, $contact_name<br><br>Thank you for your email. A ticket regarding \"$subject\" has been automatically created for you.<br><br>Ticket: $config_ticket_prefix$ticket_number<br>Subject: $subject<br>Status: Open<br>https://$config_base_url/portal/ticket.php?id=$id<br><br>~<br>$company_name<br>Support Department<br>$config_ticket_from_email<br>$company_phone";
 
         $mail = sendSingleEmail(
             $config_smtp_host,
@@ -120,7 +120,7 @@ function addReply($from_email, $date, $subject, $ticket_number, $message) {
 
     // Capture just the latest/most recent email reply content
     //  based off the "#--itflow#" line that we prepend the outgoing emails with (similar to the old school --reply above this line--)
-    $message = explode("#--itflow--#", $message);
+    $message = explode("##- Please type your reply above this line -##", $message);
     $message = nl2br(htmlentities(strip_tags($message[0])));
     $message = "<i>Email from: $from_email at $date:-</i> <br><br>$message";
 
diff --git a/post.php b/post.php
index e0130870..4ddae1fe 100644
--- a/post.php
+++ b/post.php
@@ -6175,7 +6175,7 @@ if(isset($_POST['add_ticket'])){
         if(filter_var($contact_email, FILTER_VALIDATE_EMAIL)){
 
             $subject = "Ticket created - [$ticket_prefix$ticket_number] - $ticket_subject";
-            $body    = "<i style='color: #808080'>#--itflow--#</i><br><br>Hello, $contact_name<br><br>A ticket regarding \"$ticket_subject\" has been created for you.<br><br>--------------------------------<br>$details--------------------------------<br><br>Ticket: $ticket_prefix$ticket_number<br>Subject: $ticket_subject<br>Status: Open<br>Portal: https://$config_base_url/portal/ticket.php?id=$id<br><br>~<br>$session_company_name<br>Support Department<br>$config_ticket_from_email<br>$company_phone";
+            $body    = "<i style='color: #808080'>##- Please type your reply above this line -##</i><br><br>Hello, $contact_name<br><br>A ticket regarding \"$ticket_subject\" has been created for you.<br><br>--------------------------------<br>$details--------------------------------<br><br>Ticket: $ticket_prefix$ticket_number<br>Subject: $ticket_subject<br>Status: Open<br>Portal: https://$config_base_url/portal/ticket.php?id=$id<br><br>~<br>$session_company_name<br>Support Department<br>$config_ticket_from_email<br>$company_phone";
 
             $mail = sendSingleEmail($config_smtp_host, $config_smtp_username, $config_smtp_password, $config_smtp_encryption, $config_smtp_port,
                 $config_ticket_from_email, $config_ticket_from_name,
@@ -6398,7 +6398,7 @@ if(isset($_POST['add_ticket_reply'])){
 
             } else {
                 $subject = "Ticket update - [$ticket_prefix$ticket_number] - $ticket_subject";
-                $body    = "<i style='color: #808080'>#--itflow--#</i><br><br>Hello, $contact_name<br><br>Your ticket regarding \"$ticket_subject\" has been updated.<br><br>--------------------------------<br>$ticket_reply--------------------------------<br><br>Ticket: $ticket_prefix$ticket_number<br>Subject: $ticket_subject<br>Status: $ticket_status<br>Portal: https://$config_base_url/portal/ticket.php?id=$ticket_id<br><br>~<br>$session_company_name<br>Support Department<br>$config_ticket_from_email<br>$company_phone";
+                $body    = "<i style='color: #808080'>##- Please type your reply above this line -##</i><br><br>Hello, $contact_name<br><br>Your ticket regarding \"$ticket_subject\" has been updated.<br><br>--------------------------------<br>$ticket_reply--------------------------------<br><br>Ticket: $ticket_prefix$ticket_number<br>Subject: $ticket_subject<br>Status: $ticket_status<br>Portal: https://$config_base_url/portal/ticket.php?id=$ticket_id<br><br>~<br>$session_company_name<br>Support Department<br>$config_ticket_from_email<br>$company_phone";
 
             }