From dbdb7869c47ab8c9e3a42384401a7e29599e192f Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Thu, 19 Jan 2023 18:26:04 +0100
Subject: Safer timezone set (#5021)

* Safer timezone set
Add missing tzdata in Docker :newest
Fallback to UTC if no timezone is defined at all
#fix https://github.com/FreshRSS/FreshRSS/pull/4906#issuecomment-1386747169

* Better refactoring
Show fallback timezone everywhere
---
 app/views/auth/register.phtml     | 2 +-
 app/views/configure/display.phtml | 2 +-
 app/views/user/manage.phtml       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'app/views')

diff --git a/app/views/auth/register.phtml b/app/views/auth/register.phtml
index 66c4a1ccb..999b2406a 100644
--- a/app/views/auth/register.phtml
+++ b/app/views/auth/register.phtml
@@ -21,7 +21,7 @@
 			<?php $timezones = array_merge([''], DateTimeZone::listIdentifiers()); ?>
 			<?php foreach ($timezones as $timezone): ?>
 			<option value="<?= $timezone ?>"<?= $timezone === '' ? ' selected="selected"' : '' ?>>
-				<?= $timezone == '' ? _t('gen.short.by_default') . ' (' . ini_get('date.timezone') . ')' : $timezone ?>
+				<?= $timezone == '' ? _t('gen.short.by_default') . ' (' . FreshRSS_Context::defaultTimeZone() . ')' : $timezone ?>
 			</option>
 			<?php endforeach; ?>
 			</select>
diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml
index 986d7dd17..44ca242ad 100644
--- a/app/views/configure/display.phtml
+++ b/app/views/configure/display.phtml
@@ -37,7 +37,7 @@
 				?>
 				<?php foreach ($timezones as $timezone): ?>
 				<option value="<?= $timezone ?>"<?= FreshRSS_Context::$user_conf->timezone === $timezone ? ' selected="selected"' : '' ?>>
-					<?= $timezone == '' ? _t('gen.short.by_default') . ' (' . ini_get('date.timezone') . ')' : $timezone ?>
+					<?= $timezone == '' ? _t('gen.short.by_default') . ' (' . FreshRSS_Context::defaultTimeZone() . ')' : $timezone ?>
 				</option>
 				<?php endforeach; ?>
 				</select>
diff --git a/app/views/user/manage.phtml b/app/views/user/manage.phtml
index 22a1a4d03..b996cdf2b 100644
--- a/app/views/user/manage.phtml
+++ b/app/views/user/manage.phtml
@@ -35,7 +35,7 @@
 				<?php $timezones = array_merge([''], DateTimeZone::listIdentifiers()); ?>
 				<?php foreach ($timezones as $timezone): ?>
 				<option value="<?= $timezone ?>"<?= $timezone === '' ? ' selected="selected"' : '' ?>>
-					<?= $timezone == '' ? _t('gen.short.by_default') . ' (' . ini_get('date.timezone') . ')' : $timezone ?>
+					<?= $timezone == '' ? _t('gen.short.by_default') . ' (' . FreshRSS_Context::defaultTimeZone() . ')' : $timezone ?>
 				</option>
 				<?php endforeach; ?>
 				</select>
-- 
cgit v1.2.3