Fix custom timezone

adaur · adaur · commit 44d2246219af · 2019-05-05T12:34:13.000-04:00
diff --git a/featherbb/Controller/Admin/Options.php b/featherbb/Controller/Admin/Options.php
@@ -40,13 +40,17 @@ public function display($req, $res, $args)
 
         AdminUtils::generateAdminMenu('admin options');
 
+        $diff = (User::getPref('timezone') + User::getPref('dst')) * 3600;
+        $timestamp = time() + $diff;
+
         View::setPageInfo([
                 'title' => [Utils::escape(ForumSettings::get('o_board_title')), __('Admin'), __('Admin options')],
                 'active_page' => 'admin',
                 'admin_console' => true,
                 'languages' => $this->model->languages(),
                 'styles' => $this->model->styles(),
                 'times' => $this->model->times(),
+                'timestamp' => $timestamp
             ]
         )->addTemplate('@forum/admin/options')->display();
     }
diff --git a/featherbb/Core/Utils.php b/featherbb/Core/Utils.php
@@ -90,11 +90,13 @@ public static function formatTime($timestamp, $dateOnly = false, $dateFormat = n
         $now = time();
 
         if (is_null($dateFormat)) {
-            $dateFormat = User::getPref('date_format');
+            $availableDateFormats = Container::get('forum_date_formats');
+            $dateFormat = $availableDateFormats[User::getPref('date_format')];
         }
 
         if (is_null($timeFormat)) {
-            $timeFormat = User::getPref('time_format');
+            $availableTimeFormats = Container::get('forum_time_formats');
+            $timeFormat = $availableTimeFormats[User::getPref('time_format')];
         }
 
         $date = gmdate($dateFormat, $timestamp);
diff --git a/featherbb/View/admin/options.html.twig b/featherbb/View/admin/options.html.twig

Original file line number	Diff line number	Diff line change
`@@ -90,11 +90,13 @@ public static function formatTime($timestamp, $dateOnly = false, $dateFormat = n`
`90`	`90`	`$now = time();`
`91`	`91`
`92`	`92`	`if (is_null($dateFormat)) {`
`93`		`- $dateFormat = User::getPref('date_format');`
	`93`	`+ $availableDateFormats = Container::get('forum_date_formats');`
	`94`	`+ $dateFormat = $availableDateFormats[User::getPref('date_format')];`
`94`	`95`	`}`
`95`	`96`
`96`	`97`	`if (is_null($timeFormat)) {`
`97`		`- $timeFormat = User::getPref('time_format');`
	`98`	`+ $availableTimeFormats = Container::get('forum_time_formats');`
	`99`	`+ $timeFormat = $availableTimeFormats[User::getPref('time_format')];`
`98`	`100`	`}`
`99`	`101`
`100`	`102`	`$date = gmdate($dateFormat, $timestamp);`