From 2cbb2522bac2b317c06fa288e9dc51a04887a93e Mon Sep 17 00:00:00 2001
From: Jordan Cook <jordan@jc.me.uk>
Date: Sat, 23 Jul 2022 17:27:45 +0100
Subject: [PATCH] Fix issue where warning is displayed that CAT data from radio
 is out of date due to using default timezone

---
 application/controllers/Radio.php | 6 +++---
 application/models/Cat.php        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/controllers/Radio.php b/application/controllers/Radio.php
index 1b582b83..fa794999 100755
--- a/application/controllers/Radio.php
+++ b/application/controllers/Radio.php
@@ -32,7 +32,7 @@
 			// user is not logged in
 			redirect('user/login');
 		}
-		
+
 		$this->load->model('cat');
 		$query = $this->cat->status();
 		if ($query->num_rows() > 0)
@@ -138,8 +138,8 @@
 				}
 
 				// Calculate how old the data is in minutes
-				$datetime1 = new DateTime(); // Today's Date/Time
-				$datetime2 = new DateTime($row->newtime);
+				$datetime1 = new DateTime("now", new DateTimeZone('UTC')); // Today's Date/Time
+				$datetime2 = new DateTime($row->timestamp, new DateTimeZone('UTC'));
 				$interval = $datetime1->diff($datetime2);
 
 				$minutes = $interval->days * 24 * 60;
diff --git a/application/models/Cat.php b/application/models/Cat.php
index 35f3e06a..7aca87d2 100644
--- a/application/models/Cat.php
+++ b/application/models/Cat.php
@@ -189,7 +189,7 @@
 		}
 
 		function radio_status($id) {
-			$sql = 'SELECT *, CONVERT_TZ(`timestamp`, @@session.time_zone, \'+00:00\' ) as newtime FROM `cat` WHERE id = ' . $id . ' and user_id =' . $this->session->userdata('user_id');
+			$sql = 'SELECT * FROM `cat` WHERE id = ' . $id . ' and user_id =' . $this->session->userdata('user_id');
 			return $this->db->query($sql);
 		}