From e695852d197d8a7953cbaebc3385ea5629041695 Mon Sep 17 00:00:00 2001
From: jaredb7 <sudden760@gmail.com>
Date: Sun, 2 Apr 2023 00:27:08 +1000
Subject: [PATCH] Make PHP use the systems timezone setting

The timezone in the PHP INI file could differ from the timezone set on the system itself and result incorrect time display on webpages and wherever date functions are used.

Simple fix to read the systems timezone and make PHP use the correct one.
---
 homepage/index.php | 20 ++++++++++++++++++++
 homepage/views.php | 22 +++++++++++++++++++++-
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/homepage/index.php b/homepage/index.php
index 63e86e9..7d05830 100644
--- a/homepage/index.php
+++ b/homepage/index.php
@@ -1,4 +1,24 @@
 <?php
+$sys_timezone = "";
+// If we can get the timezome from the systems timezone file ust that
+if (file_exists('/etc/timezone')) {
+	$tz_data = file_get_contents('/etc/timezone');
+	if ($tz_data !== false) {
+		$sys_timezone = trim($tz_data);
+	}
+} else {
+// Else get timezone from the timedatectl command
+	$tz_data = shell_exec('timedatectl show');
+	$tz_data_array = parse_ini_string($tz_data);
+	if (is_array($tz_data_array) && array_key_exists('Timezone', $tz_data_array)) {
+		$sys_timezone = $tz_data_array['Timezone'];
+	}
+}
+//Finally if we have a valod timezone, set it as the one PHP uses
+if ($sys_timezone !== "") {
+	date_default_timezone_set($sys_timezone);
+}
+
   if (file_exists('./scripts/thisrun.txt')) {
     $config = parse_ini_file('./scripts/thisrun.txt');
   } elseif (file_exists('./scripts/firstrun.ini')) {
diff --git a/homepage/views.php b/homepage/views.php
index 96db5f7..2416116 100644
--- a/homepage/views.php
+++ b/homepage/views.php
@@ -1,4 +1,24 @@
-<?php 
+<?php
+$sys_timezone = "";
+// If we can get the timezome from the systems timezone file ust that
+if (file_exists('/etc/timezone')) {
+	$tz_data = file_get_contents('/etc/timezone');
+	if ($tz_data !== false) {
+		$sys_timezone = trim($tz_data);
+	}
+} else {
+// Else get timezone from the timedatectl command
+	$tz_data = shell_exec('timedatectl show');
+	$tz_data_array = parse_ini_string($tz_data);
+	if (is_array($tz_data_array) && array_key_exists('Timezone', $tz_data_array)) {
+		$sys_timezone = $tz_data_array['Timezone'];
+	}
+}
+//Finally if we have a valod timezone, set it as the one PHP uses
+if ($sys_timezone !== "") {
+	date_default_timezone_set($sys_timezone);
+}
+
 session_start();
 $user = shell_exec("awk -F: '/1000/{print $1}' /etc/passwd");
 $user = trim($user);