From 3ef8494b2a0b7b19518cdaca93f0327da09445fc Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Thu, 17 May 2018 20:01:02 -0400
Subject: [PATCH] Fixed print page, fixed flipped audit replacement values'

---
 admin/delete_tickets.php   | 9 ++++++---
 inc/print_template.inc.php | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/admin/delete_tickets.php b/admin/delete_tickets.php
index 115a0173..8f51e9b8 100644
--- a/admin/delete_tickets.php
+++ b/admin/delete_tickets.php
@@ -153,8 +153,8 @@ if ( isset($_POST['assign']) && $_POST['assign'] == $hesklang['assi']) {
 		}
 		if ($owner_data['isadmin'] || in_array($ticket['category'],$owner_data['categories'])) {
             hesk_dbQuery("UPDATE `".hesk_dbEscape($hesk_settings['db_pfix'])."tickets` SET `owner`={$owner}, `assignedby`=".intval($_SESSION['id'])." WHERE `id`={$this_id} LIMIT 1");
-            mfh_insert_audit_trail_record($this_id, 'TICKET', 'audit_assigned', hesk_date(), array(0 => $owner_data['name'].' ('.$owner_data['user'].')',
-                1 => $_SESSION['name'].' ('.$_SESSION['user'].')'));
+            mfh_insert_audit_trail_record($this_id, 'TICKET', 'audit_assigned', hesk_date(), array(0 => $_SESSION['name'].' ('.$_SESSION['user'].')',
+                1 => $owner_data['name'].' ('.$owner_data['user'].')'));
 
             $end_message[] = sprintf($hesklang['assign_4'], $ticket['trackid'], $owner_data['name']);
             $num_assigned++;
@@ -463,7 +463,10 @@ elseif ($_POST['a']=='print') {
         }
 
         $this_id = intval($this_id) or hesk_error($hesklang['id_not_valid']);
-        $result = hesk_dbQuery("SELECT * FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."tickets` WHERE `id`='".intval($this_id)."' LIMIT 1");
+        $result = hesk_dbQuery("SELECT `t1`.* , `ticketStatus`.`IsClosed` AS `isClosed`, `ticketStatus`.`Key` AS `statusKey`, `t2`.name AS `repliername`
+					FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "tickets` AS `t1` LEFT JOIN `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` AS `t2` ON `t1`.`replierid` = `t2`.`id`
+					INNER JOIN `" . hesk_dbEscape($hesk_settings['db_pfix']) . "statuses` AS `ticketStatus` ON `t1`.`status` = `ticketStatus`.`ID`
+					WHERE `t1`.`id`='{$this_id}' LIMIT 1");
         if (hesk_dbNumRows($result) != 1) {
             continue;
         }
diff --git a/inc/print_template.inc.php b/inc/print_template.inc.php
index b18d5567..27060669 100644
--- a/inc/print_template.inc.php
+++ b/inc/print_template.inc.php
@@ -50,7 +50,7 @@ echo '
 <table border="1" bordercolor="#FFFFFF" cellspacing="0" cellpadding="2" width="100%">
 
 <tr>
-	<td bgcolor="#EEE"><b>' . $hesklang['trackID'] . ':</b></td><td bgcolor="#DDD">' . $trackingID . '</td>
+	<td bgcolor="#EEE"><b>' . $hesklang['trackID'] . ':</b></td><td bgcolor="#DDD">' . $ticket['trackid'] . '</td>
 	<td bgcolor="#EEE"><b>' . $hesklang['ticket_status'] . ':</b></td><td bgcolor="#DDD">' . $hesklang[$ticket['statusKey']] . '</td>
 	<td bgcolor="#EEE"><b>' . $hesklang['created_on'] . ':</b></td><td bgcolor="#DDD">' . $ticket['dt'] . '</td>
 </tr>
@@ -148,4 +148,4 @@ while ($reply = hesk_dbFetchAssoc($res)) {
 }
 
 // Print "end of ticket" message
-echo '<span style="page-break-after: always;">' . $hesklang['end_ticket'] . "</span>";
+echo '<div style="page-break-after: always">' . $hesklang['end_ticket'] . "</div>";