From 7b73adbf890e022c6d0717282986d705635c7327 Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Fri, 5 Sep 2014 15:13:59 +0200
Subject: [PATCH] Timezone detection: Add discoverd value to preference form

refs #6078
---
 application/forms/Preference/GeneralForm.php | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/application/forms/Preference/GeneralForm.php b/application/forms/Preference/GeneralForm.php
index 5b9a1b95f..c78206c5a 100644
--- a/application/forms/Preference/GeneralForm.php
+++ b/application/forms/Preference/GeneralForm.php
@@ -5,6 +5,7 @@
 namespace Icinga\Form\Preference;
 
 use DateTimeZone;
+use Icinga\Util\TimezoneDetect;
 use Zend_Config;
 use Zend_Form_Element_Text;
 use Zend_Form_Element_Select;
@@ -69,13 +70,22 @@ class GeneralForm extends Form
      */
     private function addTimezoneSelection(Zend_Config $cfg)
     {
+        $prefs = $this->getUserPreferences();
+        $useGlobalTimezone = $this->getRequest()->getParam('default_timezone', !$prefs->has('app.timezone'));
+        $detect = new TimezoneDetect();
+
         $tzList = array();
         foreach (DateTimeZone::listIdentifiers() as $tz) {
             $tzList[$tz] = $tz;
         }
+
         $helptext = 'Use the following timezone for dates and times';
-        $prefs = $this->getUserPreferences();
-        $useGlobalTimezone = $this->getRequest()->getParam('default_timezone', !$prefs->has('app.timezone'));
+
+        if ($useGlobalTimezone && $detect->success() === true) {
+            $helptext .= '<br />' . t('Currently your time was detected to be')
+                . ': '
+                . '<strong>' . $detect->getTimezoneName() . '</strong>';
+        }
 
         $selectTimezone = new Zend_Form_Element_Select(
             array(
@@ -87,6 +97,7 @@ class GeneralForm extends Form
                 'value'         =>  $prefs->get('app.timezone', $cfg->get('timezone', date_default_timezone_get()))
             )
         );
+
         $this->addElement(
             'checkbox',
             'default_timezone',
@@ -99,7 +110,9 @@ class GeneralForm extends Form
         if ($useGlobalTimezone) {
             $selectTimezone->setAttrib('disabled', 1);
         }
+
         $this->addElement($selectTimezone);
+
         $this->enableAutoSubmit(array('default_timezone'));
     }