From e07fb9ce505763b4cc8f4193718c0628e5781a98 Mon Sep 17 00:00:00 2001
From: johnnyq <johnny@pittpc.com>
Date: Mon, 15 Jan 2024 22:59:39 -0500
Subject: [PATCH] Expanded timeAgo function to incoude time ahead, added this
 functionality to client overview

---
 client_overview.php | 15 ++++++++++-----
 functions.php       | 15 ++++++++++-----
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/client_overview.php b/client_overview.php
index 6f7fc1c4..2e1dd0ff 100644
--- a/client_overview.php
+++ b/client_overview.php
@@ -180,12 +180,13 @@ $sql_asset_retire = mysqli_query(
                             $domain_id = intval($row['domain_id']);
                             $domain_name = nullable_htmlentities($row['domain_name']);
                             $domain_expire = nullable_htmlentities($row['domain_expire']);
+                            $domain_expire_human = timeAgo($row['domain_expire']);
 
                             ?>
                             <p class="mb-1">
                                 <i class="fa fa-fw fa-globe text-secondary mr-1"></i>
                                 <a href="client_domains.php?client_id=<?php echo $client_id; ?>&q=<?php echo $domain_name; ?>"><?php echo $domain_name; ?></a>
-                                <span class="text-warning">-- <?php echo $domain_expire; ?></span>
+                                <span>-- <?php echo $domain_expire_human; ?> <small class="text-muted"><?php echo $domain_expire; ?></small></span>
                             </p>
                             <?php
                         }
@@ -197,12 +198,13 @@ $sql_asset_retire = mysqli_query(
                             $asset_id = intval($row['asset_id']);
                             $asset_name = nullable_htmlentities($row['asset_name']);
                             $asset_warranty_expire = nullable_htmlentities($row['asset_warranty_expire']);
+                            $asset_warranty_expire_human = timeAgo($row['asset_warranty_expire']);
 
                             ?>
                             <p class="mb-1">
                                 <i class="fa fa-fw fa-laptop text-secondary mr-1"></i>
                                 <a href="client_assets.php?client_id=<?php echo $client_id; ?>&q=<?php echo $asset_name; ?>"><?php echo $asset_name; ?></a>
-                                <span class="text-warning">-- <?php echo $asset_warranty_expire; ?></span>
+                                <span>-- <?php echo $asset_warranty_expire_human; ?> <small class="text-muted"><?php echo $asset_warranty_expire; ?></small></span>
                             </p>
 
 
@@ -216,12 +218,13 @@ $sql_asset_retire = mysqli_query(
                             $asset_id = intval($row['asset_id']);
                             $asset_name = nullable_htmlentities($row['asset_name']);
                             $asset_install_date = nullable_htmlentities($row['asset_install_date']);
+                            $asset_install_date_human = timeAgo($row['asset_install_date']);
 
                             ?>
                             <p class="mb-1">
                                 <i class="fa fa-fw fa-laptop text-secondary mr-1"></i>
                                 <a href="client_assets.php?client_id=<?php echo $client_id; ?>&q=<?php echo $asset_name; ?>"><?php echo $asset_name; ?></a>
-                                <span class="text-warning">-- <?php echo $asset_install_date; ?></span>
+                                <span>-- <?php echo $asset_install_date_human; ?> <small class="text-muted"><?php echo $asset_install_date; ?></small></span>
                             </p>
 
                             <?php
@@ -234,12 +237,13 @@ $sql_asset_retire = mysqli_query(
                             $software_id = intval($row['software_id']);
                             $software_name = nullable_htmlentities($row['software_name']);
                             $software_expire = nullable_htmlentities($row['software_expire']);
+                            $software_expire_human = timeAgo($row['software_expire']);
 
                             ?>
                             <p class="mb-1">
                                 <i class="fa fa-fw fa-cube text-secondary mr-1"></i>
                                 <a href="client_software.php?client_id=<?php echo $client_id; ?>&q=<?php echo $software_name; ?>"><?php echo $software_name; ?></a>
-                                <span class="text-warning">-- <?php echo $software_expire; ?></span>
+                                <span>-- <?php echo $software_expire_human; ?> <small class="text-muted"><?php echo $software_expire; ?></small></span>
                             </p>
 
                             <?php
@@ -274,12 +278,13 @@ $sql_asset_retire = mysqli_query(
                                 $ticket_number = intval($row['ticket_number']);
                                 $ticket_subject = nullable_htmlentities($row['ticket_subject']);
                                 $ticket_created_at = nullable_htmlentities($row['ticket_created_at']);
+                                $ticket_created_at_human = timeAgo($row['ticket_created_at']);
 
                                 ?>
                                 <tr>
                                     <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>
+                                    <td><?php echo $ticket_created_at_human; ?> <small class="text-muted"><?php echo $ticket_created_at; ?></small></td>
                                 </tr>
 
                                 <?php
diff --git a/functions.php b/functions.php
index 47aa7edf..9ae2a62d 100644
--- a/functions.php
+++ b/functions.php
@@ -681,12 +681,16 @@ function sanitizeForEmail($data) {
 
 function timeAgo($datetime) {
     $time = strtotime($datetime);
-    $difference = time() - $time;
+    $difference = $time - time(); // Changed to handle future dates
 
-    if ($difference < 1) {
-        return 'just now';
+    if ($difference == 0) {
+        return 'right now';
     }
-    $timeRules = array (
+
+    $isFuture = $difference > 0; // Check if the date is in the future
+    $difference = abs($difference); // Absolute value for calculation
+
+    $timeRules = array(
         31536000 => 'year',
         2592000 => 'month',
         604800 => 'week',
@@ -700,7 +704,8 @@ function timeAgo($datetime) {
         $div = $difference / $secs;
         if ($div >= 1) {
             $t = round($div);
-            return $t . ' ' . $str . ($t > 1 ? 's' : '') . ' ago';
+            $timeStr = $t . ' ' . $str . ($t > 1 ? 's' : '');
+            return $isFuture ? 'in ' . $timeStr : $timeStr . ' ago';
         }
     }
 }