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

#208 Fix rendering of HTML and for signatures

Browse Source
This commit is contained in:
Mike Koch 2015-07-09 22:13:16 -04:00
parent 9dd83e9f41
commit f75cc87c10
5 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
admin/admin_reply_ticket.php
View File

@ -138,15 +138,21 @@ if (strlen($message))
// Attach signature to the message? // Attach signature to the message?
if ( ! $submit_as_customer && ! empty($_POST['signature'])) if ( ! $submit_as_customer && ! empty($_POST['signature']))
{ {
if ($modsForHesk_settings['rich_text_for_tickets']) {
$message .= "<br><br>" . nl2br($_SESSION['signature']) . "<br>";
} else {
$message .= "\n\n" . addslashes($_SESSION['signature']) . "\n"; $message .= "\n\n" . addslashes($_SESSION['signature']) . "\n";
} }
}
if (!$modsForHesk_settings['rich_text_for_tickets']) {
// Make links clickable // Make links clickable
$message = hesk_makeURL($message); $message = hesk_makeURL($message);
// Turn newlines into <br /> tags // Turn newlines into <br /> tags
$message = nl2br($message); $message = nl2br($message);
} }
}
else else
{ {
$hesk_error_buffer[] = $hesklang['enter_message']; $hesk_error_buffer[] = $hesklang['enter_message'];

3
admin/admin_submit_ticket.php
View File

@ -37,6 +37,7 @@ define('HESK_PATH','../');
// Get all the required files and functions // Get all the required files and functions
require(HESK_PATH . 'hesk_settings.inc.php'); require(HESK_PATH . 'hesk_settings.inc.php');
require(HESK_PATH . 'modsForHesk_settings.inc.php');
require(HESK_PATH . 'inc/common.inc.php'); require(HESK_PATH . 'inc/common.inc.php');
require(HESK_PATH . 'inc/admin_functions.inc.php'); require(HESK_PATH . 'inc/admin_functions.inc.php');
hesk_load_database_functions(); hesk_load_database_functions();
@ -269,8 +270,10 @@ if ($hesk_settings['attachments']['use'] && !empty($attachments))
} }
} }
if (!$modsForHesk_settings['rich_text_for_tickets']) {
$tmpvar['message']=hesk_makeURL($tmpvar['message']); $tmpvar['message']=hesk_makeURL($tmpvar['message']);
$tmpvar['message']=nl2br($tmpvar['message']); $tmpvar['message']=nl2br($tmpvar['message']);
}
$tmpvar['latitude'] = hesk_POST('latitude', 'E-4'); $tmpvar['latitude'] = hesk_POST('latitude', 'E-4');
$tmpvar['longitude'] = hesk_POST('longitude', 'E-4'); $tmpvar['longitude'] = hesk_POST('longitude', 'E-4');

2
admin/admin_ticket.php
View File

@ -1395,7 +1395,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
<div class="ticketMessageBottom"> <div class="ticketMessageBottom">
<!-- Message --> <!-- Message -->
<p><b><?php echo $hesklang['message']; ?>:</b></p> <p><b><?php echo $hesklang['message']; ?>:</b></p>
<p class="message"><?php echo hesk_html_entity_decode($ticket['message']); ?><br />&nbsp;</p> <div class="message"><?php echo hesk_html_entity_decode($ticket['message']); ?></div>
</div> </div>
<div class="ticketMessageTop"> <div class="ticketMessageTop">
<!-- Custom Fields after Message --> <!-- Custom Fields after Message -->

7
css/hesk_newStyle.php
View File

@ -193,11 +193,16 @@
font-size: 15px; font-size: 15px;
background-color: #fff; background-color: #fff;
} }
.ticketMessageBottom > p.message { .ticketMessageBottom > .message {
margin-bottom: 0px; margin-bottom: 0px;
} }
.message > ul {
margin-top: 0;
margin-bottom: 0;
}
.ticketMessage { .ticketMessage {
margin-left: 238px; margin-left: 238px;
background: #fff; background: #fff;

7
css/hesk_newStyleRTL.php
View File

@ -196,11 +196,16 @@
font-size: 15px; font-size: 15px;
background-color: #fff; background-color: #fff;
} }
.ticketMessageBottom > p.message { .ticketMessageBottom > .message {
margin-bottom: 0px; margin-bottom: 0px;
} }
.ticketMessageBottom > ul {
margin-top: 0;
margin-bottom: 0;
}
.ticketMessage { .ticketMessage {
margin-right: 238px; margin-right: 238px;
background: #fff; background: #fff;