From bdadea3cd1f9ede487d98e770e9c8f059cc0d78c Mon Sep 17 00:00:00 2001
From: Matt Fiscus <matt.fiscus@mac.com>
Date: Tue, 28 Nov 2023 17:32:08 -0700
Subject: [PATCH] Fixed timezone issue

Found an issue where timezone could be incorrect in api if server admin changes server timezeone to localtime instead of UTC.
---
 dashboard/json/index.php           | 2 --
 dashboard/json/views/links.php     | 4 ++--
 dashboard/json/views/peers.php     | 4 ++--
 dashboard/json/views/reflector.php | 6 +++---
 dashboard/json/views/stations.php  | 2 +-
 dashboard/json/views/status.php    | 4 ++--
 6 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/dashboard/json/index.php b/dashboard/json/index.php
index 90872a5..7bcacad 100644
--- a/dashboard/json/index.php
+++ b/dashboard/json/index.php
@@ -3,8 +3,6 @@
 header("Access-Control-Allow-Origin: *");
 header('Content-Type: application/json');
 
-date_default_timezone_set("UTC");
-
 if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/pgs/functions.php")) require_once($_SERVER['DOCUMENT_ROOT'] . "/pgs/functions.php");
 if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/pgs/config.inc.php")) require_once($_SERVER['DOCUMENT_ROOT'] . "/pgs/config.inc.php");
 
diff --git a/dashboard/json/views/links.php b/dashboard/json/views/links.php
index ef34d51..6718f2d 100644
--- a/dashboard/json/views/links.php
+++ b/dashboard/json/views/links.php
@@ -9,8 +9,8 @@ for ($i=0;$i<$Reflector->NodeCount();$i++) {
         'ip'            => $Reflector->Nodes[$i]->GetIP(),
         'linkedmodule'  => $Reflector->Nodes[$i]->GetLinkedModule(),
         'protocol'      => $Reflector->Nodes[$i]->GetProtocol(),
-        'connecttime'   => date('Y-m-d\TH:i:sp', $Reflector->Nodes[$i]->GetConnectTime()),
-        'lastheardtime' => date('Y-m-d\TH:i:sp', $Reflector->Nodes[$i]->GetLastHeardTime())
+        'connecttime'   => gmdate('Y-m-d\TH:i:sp', $Reflector->Nodes[$i]->GetConnectTime()),
+        'lastheardtime' => gmdate('Y-m-d\TH:i:sp', $Reflector->Nodes[$i]->GetLastHeardTime())
     );
 
 }
diff --git a/dashboard/json/views/peers.php b/dashboard/json/views/peers.php
index d427c93..c3dc079 100644
--- a/dashboard/json/views/peers.php
+++ b/dashboard/json/views/peers.php
@@ -7,8 +7,8 @@ for ($i=0;$i<$Reflector->PeerCount();$i++) {
         'callsign'      => $Reflector->Peers[$i]->GetCallSign(),
         'ip'            => $Reflector->Peers[$i]->GetIP(),
         'linkedmodule'  => $Reflector->Peers[$i]->GetLinkedModule(),
-        'connecttime'   => date('Y-m-d\TH:i:sp', $Reflector->Peers[$i]->GetConnectTime()),
-        'lastheardtime' => date('Y-m-d\TH:i:sp', $Reflector->Peers[$i]->GetLastHeardTime())
+        'connecttime'   => gmdate('Y-m-d\TH:i:sp', $Reflector->Peers[$i]->GetConnectTime()),
+        'lastheardtime' => gmdate('Y-m-d\TH:i:sp', $Reflector->Peers[$i]->GetLastHeardTime())
     );
 
 }
diff --git a/dashboard/json/views/reflector.php b/dashboard/json/views/reflector.php
index 97c4b1f..fe25d61 100644
--- a/dashboard/json/views/reflector.php
+++ b/dashboard/json/views/reflector.php
@@ -40,8 +40,8 @@ for ($i=0;$i<$Reflector->NodeCount();$i++) {
         'ip'            => $Reflector->Nodes[$i]->GetIP(),
         'linkedmodule'  => $Reflector->Nodes[$i]->GetLinkedModule(),
         'protocol'      => $Reflector->Nodes[$i]->GetProtocol(),
-        'connecttime'   => date('Y-m-d\TH:i:sp', $Reflector->Nodes[$i]->GetConnectTime()),
-        'lastheardtime' => date('Y-m-d\TH:i:sp', $Reflector->Nodes[$i]->GetLastHeardTime())
+        'connecttime'   => gmdate('Y-m-d\TH:i:sp', $Reflector->Nodes[$i]->GetConnectTime()),
+        'lastheardtime' => gmdate('Y-m-d\TH:i:sp', $Reflector->Nodes[$i]->GetLastHeardTime())
     );
 
 }
@@ -56,7 +56,7 @@ for ($i=0;$i<$Reflector->StationCount();$i++) {
         'vianode'       => $Reflector->Stations[$i]->GetVia(),
         'onmodule'      => $Reflector->Stations[$i]->GetModule(),
         'viapeer'       => $Reflector->Stations[$i]->GetPeer(),
-        'lastheardtime' => date('Y-m-d\TH:i:sp', $Reflector->Stations[$i]->GetLastHeardTime())
+        'lastheardtime' => gmdate('Y-m-d\TH:i:sp', $Reflector->Stations[$i]->GetLastHeardTime())
     );
 
 }
diff --git a/dashboard/json/views/stations.php b/dashboard/json/views/stations.php
index fac3dae..e0ae95e 100644
--- a/dashboard/json/views/stations.php
+++ b/dashboard/json/views/stations.php
@@ -15,7 +15,7 @@ for ($i=0;$i<$Reflector->StationCount();$i++) {
         'callsignsuffix' => $CallsignSuffix,
         'vianode'        => $Reflector->Stations[$i]->GetVia(),
         'onmodule'       => $Reflector->Stations[$i]->GetModule(),
-        'lastheard'      => date('Y-m-d\TH:i:sp', $Reflector->Stations[$i]->GetLastHeardTime())
+        'lastheard'      => gmdate('Y-m-d\TH:i:sp', $Reflector->Stations[$i]->GetLastHeardTime())
     );
 
     list ($CountryCode, $Country) = $Reflector->GetFlag($Reflector->Stations[$i]->GetCallSign());
diff --git a/dashboard/json/views/status.php b/dashboard/json/views/status.php
index 947b450..5ebcb38 100644
--- a/dashboard/json/views/status.php
+++ b/dashboard/json/views/status.php
@@ -3,8 +3,8 @@
 $ReflectorStatus = (file_exists($Service['PIDFile'])) ? 'up' : 'down';
 
 $payload = array(
-    'lastupdate'             => date('U', time()),
-    'lasturfdupdate'         => date('U', filemtime($Service['XMLFile'])),
+    'lastupdate'             => gmdate('U', time()),
+    'lasturfdupdate'         => gmdate('U', filemtime($Service['XMLFile'])),
     'reflectorstatus'        => $ReflectorStatus,
     'reflectoruptimeseconds' => $Reflector->GetServiceUptime()
 );