Changeset 1058

Timestamp:

08/25/08 22:16:16 (3 months ago)

Author:

laurentj

Message:

ticket #600: automatic timezone setting. p=doubleface

Files:

• trunk/lib/jelix/core/defaultconfig.ini.php (modified) (1 diff)
• trunk/lib/jelix/core/jConfigCompiler.class.php (modified) (3 diffs)
• trunk/lib/jelix/CREDITS (modified) (1 diff)
• trunk/testapp/var/config/defaultconfig.ini.php (modified) (1 diff)

trunk/lib/jelix/core/defaultconfig.ini.php

@@ -4 +4 @@
-startModule = "jelix"
-startAction = "default:index"
-fr_FR
+en_US
-charset = "UTF-8"
-
+
+
+
+
-
-checkTrustedModules = off

trunk/lib/jelix/core/jConfigCompiler.class.php

@@ -4 +4 @@
-* @subpackage   core
-* @author       Jouanneau Laurent
-
+, Christophe Thiriot
-* @copyright    2006-2008 Jouanneau laurent
-
+, 2008 Christophe Thiriot
-* @link         http://www.jelix.org
-* @licence      GNU Lesser General Public Licence see LICENCE file or http://www.gnu.org/licenses/lgpl.html
@@ -88 +88 @@
-        self::_initResponsesPath($config->_coreResponses);
-
+        if (trim($config->timeZone) === '') {
+#if PHP50
+            $config->timeZone = "Europe/Paris";
+#else
+            $config->timeZone = date_default_timezone_get();
+#endif
+        }
-
-        /*if(preg_match("/^([a-zA-Z]{2})(?:_([a-zA-Z]{2}))?$/",$config->locale,$m)){
@@ -147 +154 @@
-        self::_initResponsesPath($config['responses']);
-        self::_initResponsesPath($config['_coreResponses']);
+        if (trim($config['timeZone']) === '') {
+#if PHP50
+            $config['timeZone'] = "Europe/Paris";
+#else
+            $config['timeZone'] = date_default_timezone_get();
+#endif
+        }
-
-        /*if(preg_match("/^([a-zA-Z]{2})(?:_([a-zA-Z]{2}))?$/",$config['locale'],$m)){

trunk/lib/jelix/CREDITS

@@ -86 +86 @@
- - Added enhanced service handling (dependency injection) in jClasses (#523, #602)
- - implementation of "live" exit in command line (#406)
-
+
-
-Contributors

trunk/testapp/var/config/defaultconfig.ini.php

@@ -2 +2 @@
-;for security reasons , don't remove or modify the first line
-
-fr_FR
+en_US
-charset = "UTF-8"
-
-; see http://www.php.net/manual/en/timezones.php for supported values
-
+
+
-
-checkTrustedModules = off