From bb906e61aba0245a5587e2d9efd4d8500bd3246f Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Sun, 11 Feb 2024 04:10:30 +0100
Subject: [PATCH] Make time_zone a select list due to PEBKAC #1417 #1426

---
 dev/Settings/Admin/Config.js                                 | 3 ++-
 snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php   | 2 ++
 .../0.0.0/app/templates/Views/Admin/AdminSettingsConfig.html | 5 ++++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/dev/Settings/Admin/Config.js b/dev/Settings/Admin/Config.js
index 20e3f5d89..cd3e1dade 100644
--- a/dev/Settings/Admin/Config.js
+++ b/dev/Settings/Admin/Config.js
@@ -34,7 +34,8 @@ export class AdminSettingsConfig /*extends AbstractViewSettings*/ {
 							name: skey,
 							value: item[0],
 							type: getInputType(item[0], skey.includes('password')),
-							comment: item[1]
+							comment: item[1],
+							options: item[2]
 						});
 					});
 					cfg.push(section);
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php b/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php
index 17d81eed9..c19423f0c 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php
@@ -23,6 +23,8 @@ class ActionsAdmin extends Actions
 	{
 		$aConfig = $this->Config()->jsonSerialize();
 		unset($aConfig['version']);
+		$aConfig['logs']['time_zone'][1] = '';
+		$aConfig['logs']['time_zone'][2] = \DateTimeZone::listIdentifiers();
 		return $this->DefaultResponse($aConfig);
 	}
 
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsConfig.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsConfig.html
index cf7f6024b..0019760ef 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsConfig.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsConfig.html
@@ -11,7 +11,10 @@
 				<!-- ko if: 'checkbox' == type -->
 				<input type="checkbox" data-bind="attr: {name: key, checked: value}">
 				<!-- /ko -->
-				<!-- ko if: 'checkbox' != type -->
+				<!-- ko if: options -->
+				<select data-bind="attr: {name: key}, options: options, value: value"></select>
+				<!-- /ko -->
+				<!-- ko if: 'checkbox' != type && !options -->
 				<input data-bind="attr: {name: key, type: type}, value: value" autocorrect="off">
 				<!-- /ko -->
 				<em data-bind="text: comment, visible: comment"></em>