From 939f470666b5b8a936c5e777ed6e08a32d2738c4 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Fri, 22 Sep 2017 08:08:16 -0400
Subject: [PATCH] Updated some more audit trails

---
 admin/priority.php          | 17 +++++++++++++++--
 inc/admin_functions.inc.php |  7 +++++--
 language/en/text.php        |  2 +-
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/admin/priority.php b/admin/priority.php
index e10c0605..b2fe75e5 100644
--- a/admin/priority.php
+++ b/admin/priority.php
@@ -47,9 +47,22 @@ $options = array(
 	3 => $hesklang['low']
 );
 
-$revision = sprintf($hesklang['thist8'],hesk_date(),$options[$priority],$_SESSION['name'].' ('.$_SESSION['user'].')');
+$plain_options = array(
+    0 => 'critical',
+    1 => 'high',
+    2 => 'medium',
+    3 => 'low'
+);
 
-hesk_dbQuery("UPDATE `".hesk_dbEscape($hesk_settings['db_pfix'])."tickets` SET `priority`='{$priority}', `history`=CONCAT(`history`,'".hesk_dbEscape($revision)."') WHERE `trackid`='".hesk_dbEscape($trackingID)."'");
+$ticketRs = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "tickets` WHERE `trackid` = '" . hesk_dbEscape($trackingID) . "'");
+$ticket = hesk_dbFetchAssoc($ticketRs);
+
+mfh_insert_audit_trail_record($ticket['id'], 'TICKET', 'audit_priority', hesk_date(), array(
+	0 => $_SESSION['name'].' ('.$_SESSION['user'].')',
+	1 => $plain_options[$priority]
+));
+
+hesk_dbQuery("UPDATE `".hesk_dbEscape($hesk_settings['db_pfix'])."tickets` SET `priority`='{$priority}' WHERE `trackid`='".hesk_dbEscape($trackingID)."'");
 if (hesk_dbAffectedRows() != 1)
 {
 	hesk_process_messages($hesklang['inpr'],'admin_ticket.php?track='.$trackingID.'&Refresh='.mt_rand(10000,99999),'NOTICE');
diff --git a/inc/admin_functions.inc.php b/inc/admin_functions.inc.php
index f2edf27a..2420f648 100644
--- a/inc/admin_functions.inc.php
+++ b/inc/admin_functions.inc.php
@@ -201,7 +201,10 @@ function hesk_mergeTickets($merge_these, $merge_into)
         hesk_dbQuery("DELETE FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "tickets` WHERE `id`='" . intval($row['id']) . "'");
 
         /* Log that ticket has been merged */
-        $history .= sprintf($hesklang['thist13'], hesk_date(), $row['trackid'], $_SESSION['name'] . ' (' . $_SESSION['user'] . ')');
+        mfh_insert_audit_trail_record($merge_into, 'TICKET', 'audit_merged', hesk_date(), array(
+            0 => $_SESSION['name'] . ' (' . $_SESSION['user'] . ')',
+            1 => $row['trackid']
+        ));
 
         /* Add old ticket ID to target ticket "merged" field */
         $merged .= '#' . $row['trackid'];
@@ -234,7 +237,7 @@ function hesk_mergeTickets($merge_these, $merge_into)
     }
 
     /* Update history (log) and merged IDs of target ticket */
-    hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "tickets` SET $replies_sql `time_worked`=ADDTIME(`time_worked`, '" . hesk_dbEscape($sec_worked) . "'), `merged`=CONCAT(`merged`,'" . hesk_dbEscape($merged . '#') . "'), `history`=CONCAT(`history`,'" . hesk_dbEscape($history) . "') WHERE `id`='" . intval($merge_into) . "'");
+    hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "tickets` SET $replies_sql `time_worked`=ADDTIME(`time_worked`, '" . hesk_dbEscape($sec_worked) . "'), `merged`=CONCAT(`merged`,'" . hesk_dbEscape($merged . '#') . "') WHERE `id`='" . intval($merge_into) . "'");
 
     return true;
 
diff --git a/language/en/text.php b/language/en/text.php
index 97fb10d0..353988ab 100644
--- a/language/en/text.php
+++ b/language/en/text.php
@@ -2206,7 +2206,7 @@ $hesklang['audit_status']='%s changed status to %s'; // %s = date, new status, u
 $hesklang['audit_autoassigned']='%s automatically assigned to ticket'; //thist10
 $hesklang['audit_submitted_via_piping']='Ticket submitted via e-mail piping';
 $hesklang['audit_attachment_deleted']='%s deleted attachment %s'; // %s = date, deleted attachment, user making change
-$hesklang['audit_merged']='%s merged ticket with ticket %s'; // %s = date, merged ticket ID, user making change
+$hesklang['audit_merged']='%s merged ticket %s with this ticket'; // %s = date, merged ticket ID, user making change, thist13
 $hesklang['audit_time_worked']='%s updated time worked to %s'; // %s = date, new time worked, user making change
 $hesklang['audit_submitted_by']='%s submitted ticket';
 $hesklang['audit_submitted_via_pop']='Ticket submitted via POP3 fetching';