From 829eb075807258f10aa2a961c1b50e92b59e0cae Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sat, 29 Aug 2015 22:10:10 -0400
Subject: [PATCH] Closes #323 Don't add additional line breaks in HTML messages

---
 admin/edit_post.php | 6 ++++--
 reply_ticket.php    | 2 +-
 submit_ticket.php   | 6 ++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/admin/edit_post.php b/admin/edit_post.php
index 2a399819..d2cdaf94 100644
--- a/admin/edit_post.php
+++ b/admin/edit_post.php
@@ -114,8 +114,10 @@ if (isset($_POST['save']))
 	    	hesk_error($myerror);
 	    }
 
-		$tmpvar['message'] = hesk_makeURL($tmpvar['message']);
-		$tmpvar['message'] = nl2br($tmpvar['message']);
+		if (!$modsForHesk_settings['rich_text_for_tickets']) {
+			$tmpvar['message'] = hesk_makeURL($tmpvar['message']);
+			$tmpvar['message'] = nl2br($tmpvar['message']);
+		}
 
     	hesk_dbQuery("UPDATE `".hesk_dbEscape($hesk_settings['db_pfix'])."replies` SET `message`='".hesk_dbEscape($tmpvar['message'])."' WHERE `id`='".intval($tmpvar['id'])."' AND `replyto`='".intval($ticket['id'])."' LIMIT 1");
     }
diff --git a/reply_ticket.php b/reply_ticket.php
index 435a345b..eaacd090 100644
--- a/reply_ticket.php
+++ b/reply_ticket.php
@@ -78,7 +78,7 @@ $my_email = hesk_getCustomerEmail();
 $message = hesk_input( hesk_POST('message') );
 
 // If the message was entered, further parse it
-if ( strlen($message) )
+if ( strlen($message) && !$modsForHesk_settings['rich_text_for_tickets_for_customers'] )
 {
 	// Make links clickable
 	$message = hesk_makeURL($message);
diff --git a/submit_ticket.php b/submit_ticket.php
index 5eedc331..3b10688f 100644
--- a/submit_ticket.php
+++ b/submit_ticket.php
@@ -412,8 +412,10 @@ if (count($hesk_error_buffer))
     hesk_process_messages($hesk_error_buffer, 'index.php?a=add');
 }
 
-$tmpvar['message']=hesk_makeURL($tmpvar['message']);
-$tmpvar['message']=nl2br($tmpvar['message']);
+if (!$modsForHesk_settings['rich_text_for_tickets_for_customers']) {
+    $tmpvar['message']=hesk_makeURL($tmpvar['message']);
+    $tmpvar['message']=nl2br($tmpvar['message']);
+}
 
 // Track suggested knowledgebase articles
 if ($hesk_settings['kb_enable'] && $hesk_settings['kb_recommendanswers'] && isset($_POST['suggested']) && is_array($_POST['suggested']) )