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

Merge pull request #333 from mkoch227/fix-extra-line-breaks

Browse Source 
Fix extra line breaks in HTML templates
This commit is contained in:
Mike Koch 2015-08-30 21:59:47 -04:00
commit 36d7d08d1d
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
admin/edit_post.php
View File

@ -114,8 +114,10 @@ if (isset($_POST['save']))
hesk_error($myerror); hesk_error($myerror);
} }
$tmpvar['message'] = hesk_makeURL($tmpvar['message']); if (!$modsForHesk_settings['rich_text_for_tickets']) {
$tmpvar['message'] = nl2br($tmpvar['message']); $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"); 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");
} }

2
reply_ticket.php
View File

@ -78,7 +78,7 @@ $my_email = hesk_getCustomerEmail();
$message = hesk_input( hesk_POST('message') ); $message = hesk_input( hesk_POST('message') );
// If the message was entered, further parse it // 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 // Make links clickable
$message = hesk_makeURL($message); $message = hesk_makeURL($message);

6
submit_ticket.php
View File

@ -412,8 +412,10 @@ if (count($hesk_error_buffer))
hesk_process_messages($hesk_error_buffer, 'index.php?a=add'); hesk_process_messages($hesk_error_buffer, 'index.php?a=add');
} }
$tmpvar['message']=hesk_makeURL($tmpvar['message']); if (!$modsForHesk_settings['rich_text_for_tickets_for_customers']) {
$tmpvar['message']=nl2br($tmpvar['message']); $tmpvar['message']=hesk_makeURL($tmpvar['message']);
$tmpvar['message']=nl2br($tmpvar['message']);
}
// Track suggested knowledgebase articles // Track suggested knowledgebase articles
if ($hesk_settings['kb_enable'] && $hesk_settings['kb_recommendanswers'] && isset($_POST['suggested']) && is_array($_POST['suggested']) ) if ($hesk_settings['kb_enable'] && $hesk_settings['kb_recommendanswers'] && isset($_POST['suggested']) && is_array($_POST['suggested']) )