diff --git a/core/trunk/core/class/class_portal.php b/core/trunk/core/class/class_portal.php index de684266ea16bfc3eeed54de1844c2b455662faa..60fe28c333f0c31eda5b7ff25af9b3dae060ce3c 100644 --- a/core/trunk/core/class/class_portal.php +++ b/core/trunk/core/class/class_portal.php @@ -51,7 +51,14 @@ class portal extends functions $_SESSION['config']['unixserver'] = (string) $CONFIG->unixserver; $_SESSION['config']['defaultpage'] = (string) $CONFIG->defaultpage; $_SESSION['config']['defaultlang'] = (string) $CONFIG->defaultlanguage; - + if(isset($CONFIG->default_timezone) && !empty($CONFIG->default_timezone)) + { + $_SESSION['config']['default_timezone'] = (string) $CONFIG->default_timezone; + } + else + { + $_SESSION['config']['default_timezone'] = 'Europe/Paris'; + } if ($_SERVER['HTTPS'] == "on") $protocol = "https"; else diff --git a/core/trunk/core/init.php b/core/trunk/core/init.php index 57ff966481ddff58f26f5389b45228d6b0694425..7cdee9fe67026589ae2f03bf10014d6e37eaf122 100644 --- a/core/trunk/core/init.php +++ b/core/trunk/core/init.php @@ -1,7 +1,16 @@ <?php session_name('maarch_entreprise'); session_start(); - +if(isset($_SESSION['config']['default_timezone']) && !empty($_SESSION['config']['default_timezone'])) +{ + ini_set('date.timezone', $_SESSION['config']['default_timezone']); + date_default_timezone_set($_SESSION['config']['default_timezone']); +} +else +{ + ini_set('date.timezone', 'Europe/Paris'); + date_default_timezone_set('Europe/Paris'); +} if(isset($_SESSION['config']['corepath']) && !empty($_SESSION['config']['corepath'])) { chdir($_SESSION['config']['corepath']); @@ -15,7 +24,6 @@ if (isset($_SESSION['custom_override_id']) && !empty($_SESSION['custom_override_ } elseif(isset($_SESSION['config']['corepath']) && !empty($_SESSION['config']['corepath'])) { - set_include_path($_SESSION['config']['corepath']); } diff --git a/core/trunk/core/xml/config.xml.default b/core/trunk/core/xml/config.xml.default index d450905e676fc0e3a1222acffac343e68f827571..2968eb8389526ef6d0ffc20106d721cc13dd0a4a 100644 --- a/core/trunk/core/xml/config.xml.default +++ b/core/trunk/core/xml/config.xml.default @@ -5,6 +5,7 @@ <tmppath>C:\xampp\htdocs\maarch_entreprise\tmp\</tmppath> <defaultpage>C:\xampp\htdocs\maarch_entreprise\index.php</defaultpage> <defaultlanguage>fr</defaultlanguage> + <default_timezone>Europe/Paris</default_timezone> </CONFIG> <BUSINESSAPPS> <appid>maarch_entreprise</appid> <!-- same name as the app directory -->