From 052d418bad598c35d2ee834c2ca2fc4f066f5f80 Mon Sep 17 00:00:00 2001
From: "AFTECH.RO" <38830718+aftechro@users.noreply.github.com>
Date: Sat, 13 May 2023 02:30:34 +0100
Subject: [PATCH 1/3] Update ticket.php

Re-make of Related tickets (total open and closed) and contact card, showing previous ticket and status of it. Also, made the contact mobile and contact phone clickable (tel:$contact_phone)
---
 ticket.php | 63 ++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 57 insertions(+), 6 deletions(-)

diff --git a/ticket.php b/ticket.php
index f2f0dda9..556dc739 100644
--- a/ticket.php
+++ b/ticket.php
@@ -468,10 +468,27 @@ if (isset($_GET['ticket_id'])) {
                     <div class="card card-body card-outline card-dark mb-3">
                         <div>
                             <h4 class="text-secondary">Contact</h4>
-                            <i class="fa fa-fw fa-user text-secondary ml-1 mr-2 mb-2"></i><strong><?php echo $contact_name; ?></strong>
-                            <br>
-                            <span class="ml-1">Related tickets: Open <strong><?php echo $ticket_related_open; ?></strong> | Closed <strong><?php echo $ticket_related_closed; ?></strong> | Total <strong><?php echo $ticket_related_total; ?></strong></span>
-                            <hr>
+                            <span class="">
+ 							 <i class="fa fa-fw fa-user text-secondary ml-1 mr-2 mb-2"></i>
+  								<a href="client_contact_details.php?client_id=<?php echo $client_id; ?>&contact_id=<?php echo $contact_id; ?>" class="text-dark">
+    							<strong><?php echo strtoupper($contact_name); ?></strong>
+ 								 </a>
+							</span>
+
+
+ 							<span class="ml-1">
+ 							 <a href="#" tabindex="0" role="button" data-toggle="popover" title="Related Tickets" data-html="true" data-content="
+    							Open tickets: <strong><a href='tickets.php?contact_id=<?php echo $contact_id; ?>&status=Open'><?php echo $ticket_related_open; ?></a></strong><br>
+    							Closed tickets: <strong><a href='tickets.php?contact_id=<?php echo $contact_id; ?>&status=Closed'><?php echo $ticket_related_closed; ?></a></strong>
+  							">
+    						<span class="badge bg-secondary"><?php echo $ticket_related_total; ?></span>
+  							</a>
+						</span>
+ 
+
+						<br>
+
+
                             <?php
 
                             if (!empty($location_name)) { ?>
@@ -485,14 +502,48 @@ if (isset($_GET['ticket_id'])) {
                             <?php }
 
                             if (!empty($contact_phone)) { ?>
-                                <i class="fa fa-fw fa-phone text-secondary ml-1 mr-2 mb-2"></i><?php echo $contact_phone; ?>
+                                <i class="fa fa-fw fa-phone text-secondary ml-1 mr-2 mb-2"></i><a href="tel:<?php echo $contact_phone; ?>"><?php echo $contact_phone; ?></a>
                                 <br>
                             <?php }
 
                             if (!empty($contact_mobile)) { ?>
-                                <i class="fa fa-fw fa-mobile-alt text-secondary ml-1 mr-2 mb-2"></i><?php echo $contact_mobile; ?>
+                                 <i class="fa fa-fw fa-mobile-alt text-secondary ml-1 mr-2 mb-2"></i><a href="tel:<?php echo $contact_mobile; ?>"><?php echo $contact_mobile; ?></a>
                                 <br>
                             <?php } ?>
+                            
+                            <hr>
+                            
+                            
+                            
+                            <?php
+
+  							  	$sql_prev_ticket = "SELECT ticket_id, ticket_created_at, ticket_subject, ticket_status, ticket_assigned_to FROM tickets WHERE ticket_contact_id = $contact_id AND ticket_id < $ticket_id ORDER BY ticket_id DESC LIMIT 1";
+    							$row = mysqli_fetch_assoc(mysqli_query($mysqli, $sql_prev_ticket));
+
+   								 if ($row) {
+        							$prev_ticket_id = $row['ticket_id'];
+    								//    $prev_ticket_created_at = $row['ticket_created_at'];
+        							$prev_ticket_subject = $row['ticket_subject'];
+        							$prev_ticket_status = $row['ticket_status'];
+    								//    $prev_ticket_assigned_to = $row['ticket_assigned_to'];
+    							}
+							?>
+
+
+						<div class="row">
+   							 <div class="col-sm-12"> 
+        						<i class="fa fa-history text-secondary ml-1 mr-2 mb-2"></i> <b>Previous ticket:</b>
+	        					<a href="ticket.php?ticket_id=<?php echo $prev_ticket_id; ?>"><?php echo $prev_ticket_subject; ?></a> 
+								<br>
+								<i class="fa fa-hourglass-start text-secondary ml-1 mr-2 mb-2"></i> <b>Status:</b> <?php if ($prev_ticket_status == 'Open') { ?>
+            					<span class="text-danger"><?php echo $prev_ticket_status; ?></span>
+        						<?php } else { ?>
+            					<span class="text-success"><?php echo $prev_ticket_status; ?></span>
+        			<?php } ?>
+
+    						</div>
+					</div>
+                            
 
                         </div>
                     </div>

From ffe4061429274e84f2eaa72a36dfc2a33a1f9859 Mon Sep 17 00:00:00 2001
From: "AFTECH.RO" <38830718+aftechro@users.noreply.github.com>
Date: Sat, 13 May 2023 09:42:48 +0100
Subject: [PATCH 2/3] Update ticket.php

Hide Previous ticket if none exists
---
 ticket.php | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/ticket.php b/ticket.php
index 556dc739..0fd0f96e 100644
--- a/ticket.php
+++ b/ticket.php
@@ -531,18 +531,21 @@ if (isset($_GET['ticket_id'])) {
 
 
 						<div class="row">
-   							 <div class="col-sm-12"> 
-        						<i class="fa fa-history text-secondary ml-1 mr-2 mb-2"></i> <b>Previous ticket:</b>
-	        					<a href="ticket.php?ticket_id=<?php echo $prev_ticket_id; ?>"><?php echo $prev_ticket_subject; ?></a> 
-								<br>
-								<i class="fa fa-hourglass-start text-secondary ml-1 mr-2 mb-2"></i> <b>Status:</b> <?php if ($prev_ticket_status == 'Open') { ?>
-            					<span class="text-danger"><?php echo $prev_ticket_status; ?></span>
-        						<?php } else { ?>
-            					<span class="text-success"><?php echo $prev_ticket_status; ?></span>
-        			<?php } ?>
-
+   							 <div class="col-sm-12">
+        						<?php if (!empty($prev_ticket_id)) { ?>
+            					<i class="fa fa-history text-secondary ml-1 mr-2 mb-2"></i> <b>Previous ticket:</b>
+            					<a href="ticket.php?ticket_id=<?php echo $prev_ticket_id; ?>"><?php echo $prev_ticket_subject; ?></a>
+            					<br>
+            					<?php if ($prev_ticket_status == 'Open') { ?>
+                				<i class="fa fa-hourglass-start text-secondary ml-1 mr-2 mb-2"></i> <b>Status:</b>
+                				<span class="text-danger"><?php echo $prev_ticket_status; ?></span>
+            					<?php } else { ?>
+                				<i class="fa fa-hourglass-start text-secondary ml-1 mr-2 mb-2"></i> <b>Status:</b>
+                				<span class="text-success"><?php echo $prev_ticket_status; ?></span>
+            					<?php } ?>
+        						<?php } ?>
     						</div>
-					</div>
+						</div>
                             
 
                         </div>

From 4183583ef50967f04fadcffaf3df1a7b9c67feef Mon Sep 17 00:00:00 2001
From: "AFTECH.RO" <38830718+aftechro@users.noreply.github.com>
Date: Sat, 13 May 2023 23:30:33 +0100
Subject: [PATCH 3/3] Update ticket.php

changed the sql for previous ticket to prevent XSS attacks.
---
 ticket.php | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/ticket.php b/ticket.php
index 0fd0f96e..18ee5ee4 100644
--- a/ticket.php
+++ b/ticket.php
@@ -517,16 +517,16 @@ if (isset($_GET['ticket_id'])) {
                             
                             <?php
 
-  							  	$sql_prev_ticket = "SELECT ticket_id, ticket_created_at, ticket_subject, ticket_status, ticket_assigned_to FROM tickets WHERE ticket_contact_id = $contact_id AND ticket_id < $ticket_id ORDER BY ticket_id DESC LIMIT 1";
-    							$row = mysqli_fetch_assoc(mysqli_query($mysqli, $sql_prev_ticket));
+								$sql_prev_ticket = "SELECT ticket_id, ticket_created_at, ticket_subject, ticket_status, ticket_assigned_to FROM tickets WHERE ticket_contact_id = " . intval($contact_id) . " AND ticket_id < " . intval($ticket_id) . " ORDER BY ticket_id DESC LIMIT 1";
+								$row = mysqli_fetch_assoc(mysqli_query($mysqli, $sql_prev_ticket));
 
-   								 if ($row) {
-        							$prev_ticket_id = $row['ticket_id'];
-    								//    $prev_ticket_created_at = $row['ticket_created_at'];
-        							$prev_ticket_subject = $row['ticket_subject'];
-        							$prev_ticket_status = $row['ticket_status'];
-    								//    $prev_ticket_assigned_to = $row['ticket_assigned_to'];
-    							}
+								if ($row) {
+    								$prev_ticket_id = intval($row['ticket_id']);
+   									$prev_ticket_subject = htmlentities($row['ticket_subject']);
+    								$prev_ticket_status = htmlentities($row['ticket_status']);
+								}
+    								
+    						
 							?>
 
 
@@ -546,6 +546,7 @@ if (isset($_GET['ticket_id'])) {
         						<?php } ?>
     						</div>
 						</div>
+
                             
 
                         </div>