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

Update print and reply_ticket

Browse Source
This commit is contained in:
Mike Koch 2016-10-25 12:38:34 -04:00
parent 7d7e1bd1c4
commit 1224ea8d23
2 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
print.php
View File

@ -55,6 +55,9 @@ $trackingID = hesk_cleanID('p_track') or die("$hesklang[int_error]: $hesklang[no
/* Connect to database */ /* Connect to database */
hesk_dbConnect(); hesk_dbConnect();
// Load custom fields
require_once(HESK_PATH . 'inc/custom_fields.inc.php');
// Perform additional checks for customers // Perform additional checks for customers
if (empty($_SESSION['id'])) { if (empty($_SESSION['id'])) {
// Are we in maintenance mode? // Are we in maintenance mode?
@ -218,15 +221,17 @@ echo '</tr>';
$num_cols = 0; $num_cols = 0;
echo '<tr>'; echo '<tr>';
foreach ($hesk_settings['custom_fields'] as $k => $v) { foreach ($hesk_settings['custom_fields'] as $k => $v) {
if ($v['use']) { if (($v['use'] == 1 || (! empty($_SESSION['id']) && $v['use'] == 2)) && hesk_is_custom_field_in_category($k, $ticket['category'])) {
if ($modsForHesk_settings['custom_field_setting']) {
$v['name'] = $hesklang[$v['name']];
}
if ($num_cols == 3) { if ($num_cols == 3) {
echo '</tr><tr>'; echo '</tr><tr>';
$num_cols = 0; $num_cols = 0;
} }
switch ($v['type']) {
case 'date':
$ticket[$k] = hesk_custom_date_display_format($ticket[$k], $v['value']['date_format']);
break;
}
?> ?>
<td bgcolor="#EEE"><b><?php echo $v['name']; ?>:</b></td> <td bgcolor="#EEE"><b><?php echo $v['name']; ?>:</b></td>
<td bgcolor="#DDD"><?php echo hesk_unhortenUrl($ticket[$k]); ?></td> <td bgcolor="#DDD"><?php echo hesk_unhortenUrl($ticket[$k]); ?></td>
@ -239,11 +244,14 @@ foreach ($hesk_settings['custom_fields'] as $k => $v) {
echo '</table><br>'; echo '</table><br>';
// Print initial ticket message // Print initial ticket message
$newMessage = hesk_unhortenUrl($ticket['message']); if ($ticket['message'] != '') {
if ($ticket['html']) { $newMessage = hesk_unhortenUrl($ticket['message']);
$newMessage = hesk_html_entity_decode($newMessage); if ($ticket['html']) {
$newMessage = hesk_html_entity_decode($newMessage);
}
echo '<p>' . $newMessage . '</p>';
} }
echo '<p>' . $newMessage . '</p>';
// Print replies // Print replies
while ($reply = hesk_dbFetchAssoc($res)) { while ($reply = hesk_dbFetchAssoc($res)) {

18
reply_ticket.php
View File

@ -185,17 +185,19 @@ if ($hesk_settings['attachments']['use'] && !empty($attachments)) {
} }
// If staff hasn't replied yet, don't change the status; otherwise set it to the status for customer replies. // If staff hasn't replied yet, don't change the status; otherwise set it to the status for customer replies.
$customerReplyStatusQuery = 'SELECT `ID` FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'statuses` WHERE `IsCustomerReplyStatus` = 1'; if (hesk_can_customer_change_status($ticket['status'])) {
$defaultNewTicketStatusQuery = 'SELECT `ID` FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'statuses` WHERE `IsNewTicketStatus` = 1'; $customerReplyStatusQuery = 'SELECT `ID` FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'statuses` WHERE `IsCustomerReplyStatus` = 1';
$newStatusRs = hesk_dbQuery($customerReplyStatusQuery); $defaultNewTicketStatusQuery = 'SELECT `ID` FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'statuses` WHERE `IsNewTicketStatus` = 1';
$newStatus = hesk_dbFetchAssoc($newStatusRs); $newStatusRs = hesk_dbQuery($customerReplyStatusQuery);
$defaultNewTicketStatusRs = hesk_dbQuery($defaultNewTicketStatusQuery); $newStatus = hesk_dbFetchAssoc($newStatusRs);
$defaultNewTicketStatus = hesk_dbFetchAssoc($defaultNewTicketStatusRs); $defaultNewTicketStatusRs = hesk_dbQuery($defaultNewTicketStatusQuery);
$defaultNewTicketStatus = hesk_dbFetchAssoc($defaultNewTicketStatusRs);
$ticket['status'] = $ticket['status'] == $defaultNewTicketStatus['ID'] ? $defaultNewTicketStatus['ID'] : $newStatus['ID']; $ticket['status'] = $ticket['status'] == $defaultNewTicketStatus['ID'] ? $defaultNewTicketStatus['ID'] : $newStatus['ID'];
}
/* Update ticket as necessary */ /* Update ticket as necessary */
$res = hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "tickets` SET `lastchange`=NOW(), `status`='{$ticket['status']}', `replies`=`replies`+1, `lastreplier`='0' WHERE `id`='{$ticket['id']}' LIMIT 1"); $res = hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "tickets` SET `lastchange`=NOW(), `status`='{$ticket['status']}', `replies`=`replies`+1, `lastreplier`='0' WHERE `id`='{$ticket['id']}'");
// Insert reply into database // Insert reply into database
$modsForHesk_settings = mfh_getSettings(); $modsForHesk_settings = mfh_getSettings();