From 0a483cf13ae85b726ba7605c951b33517f5c39fa Mon Sep 17 00:00:00 2001 From: Marcus Hill Date: Sat, 16 Apr 2022 12:32:23 +0100 Subject: [PATCH 1/4] Only show active/non-archived agents for new ticket assignment --- ticket.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ticket.php b/ticket.php index 656bd826..36245b3b 100644 --- a/ticket.php +++ b/ticket.php @@ -560,7 +560,7 @@ if(isset($_GET['ticket_id'])){ Date: Sat, 16 Apr 2022 12:51:15 +0100 Subject: [PATCH 2/4] Fix contact title & improve logging on client portal Hyperlink ticket on client overview page --- client_overview.php | 2 +- portal/check_login.php | 1 + portal/index.php | 5 ++--- portal/portal_post.php | 4 ++-- portal/ticket.php | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/client_overview.php b/client_overview.php index 65da814d..7312c8a1 100644 --- a/client_overview.php +++ b/client_overview.php @@ -191,7 +191,7 @@ $sql_tickets_stale = mysqli_query($mysqli,"SELECT * FROM tickets ?> - + diff --git a/portal/check_login.php b/portal/check_login.php index 963fb30b..8b82da8a 100644 --- a/portal/check_login.php +++ b/portal/check_login.php @@ -38,6 +38,7 @@ $contact = mysqli_fetch_array($contact_sql); $session_contact_name = $contact['contact_name']; $session_contact_initials = initials($session_contact_name); +$session_contact_title = $contact['contact_title']; $session_contact_email = $contact['contact_email']; $session_contact_photo = $contact['contact_photo']; diff --git a/portal/index.php b/portal/index.php index 9f2a3638..60e49b6c 100644 --- a/portal/index.php +++ b/portal/index.php @@ -56,9 +56,8 @@ $total_tickets = $row['total_tickets'];
-
-
-
+
+
diff --git a/portal/portal_post.php b/portal/portal_post.php index 7bffe456..793694c5 100644 --- a/portal/portal_post.php +++ b/portal/portal_post.php @@ -42,7 +42,7 @@ if(isset($_POST['add_ticket'])){ $id = mysqli_insert_id($mysqli); // Logging - mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Ticket', log_action = 'Create', log_description = 'Client contact $session_contact_name created ticket $subject', log_created_at = NOW(), log_client_id = $client_id, company_id = $session_company_id"); + mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Ticket', log_action = 'Create', log_description = 'Client contact $session_contact_name created ticket $subject', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_created_at = NOW(), log_client_id = $client_id, company_id = $session_company_id"); header("Location: ticket.php?id=" . $id); @@ -126,7 +126,7 @@ if(isset($_GET['close_ticket'])){ mysqli_query($mysqli,"INSERT INTO ticket_replies SET ticket_reply = 'Ticket closed by $session_contact_name.', ticket_reply_type = 'Client', ticket_reply_created_at = NOW(), ticket_reply_by = '$session_contact_id', ticket_reply_ticket_id = '$ticket_id', company_id = $session_company_id"); //Logging - mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Ticket', log_action = 'Closed', log_description = '$ticket_id Closed by client', log_created_at = NOW(), company_id = $session_company_id"); + mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Ticket', log_action = 'Closed', log_description = '$ticket_id Closed by client', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_created_at = NOW(), company_id = $session_company_id"); header("Location: ticket.php?id=" . $ticket_id); } diff --git a/portal/ticket.php b/portal/ticket.php index 13bcfa56..532e3260 100644 --- a/portal/ticket.php +++ b/portal/ticket.php @@ -27,7 +27,7 @@ if(isset($_GET['id']) && intval($_GET['id'])) { + if($ticket['ticket_status'] !== "Closed"){ ?> @@ -94,7 +94,7 @@ if(isset($_GET['id']) && intval($_GET['id'])) { Date: Sat, 16 Apr 2022 13:38:45 +0100 Subject: [PATCH 3/4] Replace
tags with CSS --- setup.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/setup.php b/setup.php index 2d1f875b..2f9eb9dd 100644 --- a/setup.php +++ b/setup.php @@ -1182,7 +1182,7 @@ if(isset($_POST['add_telemetry'])){
  • Upload is readable and writeable
  • PHP 7+ Installed
    • -
    Install
    +
    Install
    @@ -1519,7 +1519,9 @@ if(isset($_POST['add_telemetry'])){ } ?>
    -
    Begin Setup
    +
    + Begin Setup +
    From 467784cb2a6bd31380761b26f067188137a23f55 Mon Sep 17 00:00:00 2001 From: Marcus Hill Date: Sun, 17 Apr 2022 23:30:10 +0100 Subject: [PATCH 4/4] Define the number regex as a constant and use that instead --- api/v1/contacts/contact_model.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/api/v1/contacts/contact_model.php b/api/v1/contacts/contact_model.php index fb35f365..5d8e3da6 100644 --- a/api/v1/contacts/contact_model.php +++ b/api/v1/contacts/contact_model.php @@ -1,10 +1,12 @@