From 5f5e023afeb7a31a46cbf2cfbad6656419e7bfbf Mon Sep 17 00:00:00 2001
From: Marcus Hill <bcf8c9f2@opayq.com>
Date: Sat, 16 Apr 2022 12:51:15 +0100
Subject: [PATCH] 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
 
               ?>
               <tr>
-                <td><?php echo "$ticket_prefix$ticket_number"; ?></td>
+                <td><a href="ticket.php?ticket_id=<?php echo $ticket_id?>"><?php echo "$ticket_prefix$ticket_number"; ?></a</td>
                 <td><?php echo $ticket_subject; ?></td>
                 <td class="text-danger"><?php echo $ticket_created_at; ?></td>
               </tr>
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'];
       <br>
               
       <?php } ?>
-      <div class="text-dark"><?php echo $contact_name; ?></div>
-      <div><?php echo $contact_title_display; ?></div>
-      <div><?php echo $primary_contact_display; ?></div>
+      <div class="text-dark"><?php echo $session_contact_name; ?></div>
+      <div><?php echo $session_contact_title; ?></div>
     </th>
     <th>
       <div class="">
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'])) {
       
     <span class="navbar-text">
       <?php
-    if($ticket_status !== "Closed"){ ?>
+    if($ticket['ticket_status'] !== "Closed"){ ?>
       <button class="btn btn-sm btn-outline-success my-2 my-sm-0 form-inline my-2 my-lg-0" type="submit"><a href="portal_post.php?close_ticket=<?php echo $ticket_id; ?>"><i class="fas fa-fw fa-check text-secondary text-success"></i>  Close ticket</a></button>
     <?php } ?>
     </span>
@@ -94,7 +94,7 @@ if(isset($_GET['id']) && intval($_GET['id'])) {
     <?php
     $sql = mysqli_query($mysqli,"SELECT * FROM ticket_replies LEFT JOIN users ON ticket_reply_by = user_id LEFT JOIN contacts ON ticket_reply_by = contact_id WHERE ticket_reply_ticket_id = $ticket_id AND ticket_reply_archived_at IS NULL AND ticket_reply_type != 'Internal' ORDER BY ticket_reply_id DESC");
 
-    while($row = mysqli_fetch_array($sql)){;
+    while($row = mysqli_fetch_array($sql)){
       $ticket_reply_id = $row['ticket_reply_id'];
       $ticket_reply = $row['ticket_reply'];
       $ticket_reply_created_at = $row['ticket_reply_created_at'];