Skip to content

Commit 56361c7

Browse files
committed
Partially Updated ticket post to use new logAction function, added some ticket history updates, tidy and added more details to logging
1 parent 47a4fa7 commit 56361c7

File tree

2 files changed

+30
-11
lines changed

2 files changed

+30
-11
lines changed

post/user/task.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@
139139
// Logging
140140
logAction("Task", "Edit", "$session_name marked task $task_name as incomplete", $client_id, $task_id);
141141

142+
$_SESSION['alert_type'] = "error";
142143
$_SESSION['alert_message'] = "Task <strong>$task_name</strong> marked as incomplete";
143144

144145
header("Location: " . $_SERVER["HTTP_REFERER"]);

post/user/ticket.php

Lines changed: 29 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
}
7878

7979
// Add Watchers
80-
if (!empty($_POST['watchers'])) {
80+
if (isset($_POST['watchers'])) {
8181
foreach ($_POST['watchers'] as $watcher) {
8282
$watcher_email = sanitizeInput($watcher);
8383
mysqli_query($mysqli, "INSERT INTO ticket_watchers SET watcher_email = '$watcher_email', watcher_ticket_id = $ticket_id");
@@ -157,11 +157,11 @@
157157
customAction('ticket_create', $ticket_id);
158158

159159
// Logging
160-
mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Ticket', log_action = 'Create', log_description = '$session_name created ticket $config_ticket_prefix$ticket_number - $ticket_subject', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $ticket_id");
160+
logAction("Ticket", "Create", "$session_name created ticket $config_ticket_prefix$ticket_number - $ticket_subject", $client_id, $ticket_id);
161161

162-
$_SESSION['alert_message'] = "You created Ticket $ticket_subject <strong>$config_ticket_prefix$ticket_number</strong>";
162+
$_SESSION['alert_message'] = "Ticket <strong>$config_ticket_prefix$ticket_number</strong> created";
163163

164-
header("Location: ticket.php?ticket_id=" . $ticket_id);
164+
header("Location: ticket.php?ticket_id=$ticket_id");
165165
}
166166

167167
if (isset($_POST['edit_ticket'])) {
@@ -183,6 +183,7 @@
183183
$project_id = intval($_POST['project']);
184184
$client_id = intval($_POST['client_id']);
185185
$ticket_number = sanitizeInput($_POST['ticket_number']);
186+
$ticket_prefix = sanitizeInput($config_ticket_prefix);
186187

187188
mysqli_query($mysqli, "UPDATE tickets SET ticket_category = $category, ticket_subject = '$subject', ticket_priority = '$priority', ticket_billable = $billable, ticket_details = '$details', ticket_vendor_ticket_number = '$vendor_ticket_number', ticket_contact_id = $contact_id, ticket_vendor_id = $vendor_id, ticket_location_id = $location_id, ticket_asset_id = $asset_id, ticket_project_id = $project_id WHERE ticket_id = $ticket_id");
188189

@@ -193,7 +194,7 @@
193194
$sql = mysqli_query($mysqli, "SELECT contact_name, contact_email, ticket_prefix, ticket_number, ticket_category, ticket_subject, ticket_details, ticket_priority, ticket_status_name, ticket_created_by, ticket_assigned_to, ticket_client_id FROM tickets
194195
LEFT JOIN clients ON ticket_client_id = client_id
195196
LEFT JOIN contacts ON ticket_contact_id = contact_id
196-
LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id
197+
LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id
197198
WHERE ticket_id = $ticket_id
198199
AND ticket_closed_at IS NULL");
199200
$row = mysqli_fetch_array($sql);
@@ -242,10 +243,10 @@
242243
// Custom action/notif handler
243244
customAction('ticket_update', $ticket_id);
244245

245-
//Logging
246-
mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Ticket', log_action = 'Modify', log_description = '$session_name modified ticket $ticket_number - $subject', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $ticket_id");
246+
// Logging
247+
logAction("Ticket", "Edit", "$session_name edited ticket $ticket_prefix$ticket_number", $client_id, $ticket_id);
247248

248-
$_SESSION['alert_message'] = "Ticket <strong>$ticket_number</strong> updated";
249+
$_SESSION['alert_message'] = "Ticket <strong>$ticket_prefix$ticket_number</strong> updated";
249250

250251
header("Location: " . $_SERVER["HTTP_REFERER"]);
251252
}
@@ -258,14 +259,31 @@
258259
$priority = sanitizeInput($_POST['priority']);
259260
$client_id = intval($_POST['client_id']);
260261

262+
// Get ticket details
263+
$sql = mysqli_query($mysqli, "SELECT
264+
ticket_prefix, ticket_number ticket_priority, ticket_status_name, ticket_client_id
265+
FROM tickets
266+
LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id
267+
WHERE ticket_id = $ticket_id"
268+
);
269+
$row = mysqli_fetch_array($sql);
270+
$ticket_prefix = sanitizeInput($row['ticket_prefix']);
271+
$ticket_number = intval($row['ticket_number']);
272+
$original_priority = sanitizeInput($row['ticket_priority']);
273+
$ticket_status = sanitizeInput($row['ticket_status_name']);
274+
$client_id = intval($row['ticket_client_id']);
275+
261276
mysqli_query($mysqli, "UPDATE tickets SET ticket_priority = '$priority' WHERE ticket_id = $ticket_id");
262277

263-
//Logging
264-
mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Ticket', log_action = 'Modify', log_description = '$session_name edited ticket priority', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $ticket_id");
278+
// Update Ticket History
279+
mysqli_query($mysqli, "INSERT INTO ticket_history SET ticket_history_status = '$ticket_status', ticket_history_description = '$session_name changed priority from $original_priority to $priority', ticket_history_ticket_id = $ticket_id");
280+
281+
// Logging
282+
logAction("Ticket", "Edit", "$session_name changed priority from $original_priority to $priority for ticket $ticket_prefix$ticket_number", $client_id, $ticket_id);
265283

266284
customAction('ticket_update', $ticket_id);
267285

268-
$_SESSION['alert_message'] = "Ticket priority updated";
286+
$_SESSION['alert_message'] = "Priority updated <strong>$original_priority</strong> to <strong>$priority</strong>";
269287

270288
header("Location: " . $_SERVER["HTTP_REFERER"]);
271289
}

0 commit comments

Comments
 (0)