From ef9ed79f6bd12785902d635b6b0a2bab2199b3cd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 14 May 2007 20:58:59 +0000
Subject: [PATCH] New: Ajout info timezone dans info systemes

---
 htdocs/admin/system/dolibarr.php | 2 ++
 htdocs/install/etape1.php        | 5 +++--
 htdocs/langs/en_US/admin.lang    | 1 +
 htdocs/langs/fr_BE/admin.lang    | 1 +
 htdocs/langs/fr_FR/admin.lang    | 1 +
 htdocs/lib/functions.inc.php     | 3 ++-
 6 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index 964c116ea7c..5f7ae85807e 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -77,6 +77,8 @@ $var=!$var;
 print "<tr ".$bc[$var]."><td width=\"240\">".$langs->trans("CurrentLeftMenuHandler")."</td><td>".$conf->left_menu."</td></tr>\n";
 $var=!$var;
 print "<tr ".$bc[$var]."><td width=\"240\">".$langs->trans("CurrentDolibarrLanguage")."</td><td>".$langs->getDefaultLang()."</td></tr>\n";
+$var=!$var;
+print "<tr ".$bc[$var]."><td width=\"240\">".$langs->trans("CurrentDolibarrTZ")."</td><td>".$_ENV["TZ"]."</td></tr>\n";
 print '</table>';
 print '<br>';
 
diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php
index 758bb504e51..1fc2ab3858d 100644
--- a/htdocs/install/etape1.php
+++ b/htdocs/install/etape1.php
@@ -102,9 +102,10 @@ if ($_POST["action"] == "set")
 			
 			fputs($fp, '<?php');
 			fputs($fp,"\n");
-			
 			fputs($fp,"#\n");
-			fputs($fp,"# File generated by Dolibarr installer on ".dolibarr_print_date(time(),'dayhour')."\n");
+			fputs($fp,"# File generated by Dolibarr installer on ".dolibarr_print_date(gmmktime(),'dayhour'));
+			if ($_ENV["TZ"]) fputs($fp," (TZ=".$_ENV["TZ"].")");
+			fputs($fp,"\n");
 			fputs($fp,"#\n");
 			fputs($fp,"# Take a look at conf.php.example file for an example of conf.php file\n");
 			fputs($fp,"# and explanations for all possibles parameters.\n");
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 7e6d6181587..a018038a740 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -45,6 +45,7 @@ LanguageParameter=Language parameter %s
 LanguageBrowserParameter=Parameter %s
 LanguageDolibarrParameter=Language Dolibarr parameter
 CurrentDolibarrLanguage=Dolibarr current language
+CurrentDolibarrTZ=Dolibarr current Time Zone
 OSEnv=OS Environment
 Box=Box
 Boxes=Boxes
diff --git a/htdocs/langs/fr_BE/admin.lang b/htdocs/langs/fr_BE/admin.lang
index 58455321c2d..0bae56987a9 100644
--- a/htdocs/langs/fr_BE/admin.lang
+++ b/htdocs/langs/fr_BE/admin.lang
@@ -38,6 +38,7 @@ LanguageParameter=Param
 LanguageBrowserParameter=Paramètre linguistique %s du navigateur
 LanguageDolibarrParameter=Paramètre linguistique de Dolibarr
 CurrentDolibarrLanguage=Langue courante de Dolibarr
+CurrentDolibarrTZ=Time Zone Dolibarr courante
 OSEnv=Environnement du système d'exploitation
 Box=Boîte
 Boxes=Boîtes
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index b875219835c..3365c057a28 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -46,6 +46,7 @@ LanguageParameter=Variable langue %s
 LanguageBrowserParameter=Variable %s
 LanguageDolibarrParameter=Paramètre de langue Dolibarr
 CurrentDolibarrLanguage=Langue Dolibarr courante
+CurrentDolibarrTZ=Time Zone Dolibarr courante
 OSEnv=Environnement OS
 Box=Boîte
 Boxes=Boîtes
diff --git a/htdocs/lib/functions.inc.php b/htdocs/lib/functions.inc.php
index 86cee05c58f..0d969fa729e 100644
--- a/htdocs/lib/functions.inc.php
+++ b/htdocs/lib/functions.inc.php
@@ -508,7 +508,7 @@ function dolibarr_print_date($time,$format='')
     if ($format == 'dayhourldap') $format='%Y%m%d%H%M%SZ';
     if ($format == 'dayhourtext') $format=$conf->format_date_hour_text_short;
 	if (! $format) $format='%Y-%m-%d %H:%M:%S';
-	
+
     // Si date non définie, on renvoie ''
     if (! $time) return '';
 
@@ -521,6 +521,7 @@ function dolibarr_print_date($time,$format='')
         $sday = $reg[3];
         $shour = $reg[4];
         $smin = $reg[5];
+
         if ($syear < 1970 && isset($_SERVER["WINDIR"]))
         {
             return strftime($format,dolibarr_mktime($shour,$smin,0,$smonth,$sday,$syear));