added new config setting: TIMEZONE

diff --git a/ChangeLog b/ChangeLog
index e6819ea35ac3da8c63d9d3f2176477085814b0ad..5bff93d65c53954a71b1c22eba73c8e4b7ef9110 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
 version 2.x.x - Griffin Chapel ()
+    + Added TIMEZONE as a new config setting. Please update your config.
+      See update.txt for more details.
     + Better logging
     + New home screen layout
 

diff --git a/documentation/update.txt b/documentation/update.txt
index 515a9302366576e411db126f1a8cb7d565ff0eaf..850faa2144adc0fa7d75692785ae2288b16774a3 100644 (file)
--- a/documentation/update.txt
+++ b/documentation/update.txt
@@ -1,6 +1,9 @@
 If you are updating from a previous version make sure every update info from
 the version your are updating from is done.
 
+## version 2.x.x - Griffin Chapel
++ Add new config setting TIMEZONE to your config. See config.default.php for more details
+
 ## version 2.8.2 - Dragon Chapel
 + Add query debug setting to config file.
   See config.default.php for QUERY_DEBUG constant. Add it to your local config.php

diff --git a/webroot/config.default.php b/webroot/config.default.php
index 02674c438a3225fd939568f96ad54fde4e5fa7db..30ddb3bf71d629c619290be8a3fd54bdca1767d4 100644 (file)
--- a/webroot/config.default.php
+++ b/webroot/config.default.php
@@ -83,6 +83,9 @@ const EMAIL_REPLY_BACK_SUBJECT = 'Insipid email import response';
 const COMPLETE_PAGE_SCREENSHOT = false;
 const COMPLETE_PAGE_SCREENSHOT_COMMAND = '/absolute/path/to/command';
 
+# Timezone setting
+const TIMEZONE = 'Europe/Berlin';
+
 # debug
 const DEBUG = false;
 const QUERY_DEBUG = false;

diff --git a/webroot/index.php b/webroot/index.php
index e6839418a06d2b5e2c271329eea33fc7d9d517ff..c21624ba497868fb4d956912090e135863dd0482 100644 (file)
--- a/webroot/index.php
+++ b/webroot/index.php
@@ -29,10 +29,8 @@
 mb_http_output('UTF-8');
 mb_internal_encoding('UTF-8');
 error_reporting(-1); // E_ALL & E_STRICT
-# time settings
-date_default_timezone_set('Europe/Berlin');
-
 require('config.php');
+date_default_timezone_set(TIMEZONE);
 
 ## check request
 $_urlToParse = filter_var($_SERVER['QUERY_STRING'],FILTER_UNSAFE_RAW, FILTER_FLAG_STRIP_LOW);

diff --git a/webroot/job/email-import.php b/webroot/job/email-import.php
index cd7afdf9be11449d5e7e91a207da74341ed694f4..7fe14443ba185379cded313b5bf5ed5fb88d8782 100644 (file)
--- a/webroot/job/email-import.php
+++ b/webroot/job/email-import.php
@@ -29,10 +29,8 @@
 mb_http_output('UTF-8');
 mb_internal_encoding('UTF-8');
 error_reporting(-1); // E_ALL & E_STRICT
-# time settings
-date_default_timezone_set('Europe/Berlin');
-
 require('../config.php');
+date_default_timezone_set(TIMEZONE);
 
 ## set the error reporting
 ini_set('log_errors',true);;