From ef814c42ec2e62af7077529c9d59db0c3f9ba1d1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 14 May 2007 20:35:04 +0000
Subject: [PATCH] Ajout doc dans fichier conf

---
 htdocs/install/etape1.php    | 7 +++++++
 htdocs/lib/functions.inc.php | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php
index 0051ea80397..758bb504e51 100644
--- a/htdocs/install/etape1.php
+++ b/htdocs/install/etape1.php
@@ -103,6 +103,13 @@ 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,"#\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");
+			fputs($fp,"#\n");
+
 			fputs($fp, '$dolibarr_main_url_root="'.$_POST["main_url"].'";');
 			fputs($fp,"\n");
 			
diff --git a/htdocs/lib/functions.inc.php b/htdocs/lib/functions.inc.php
index 1ff613e3e2c..86cee05c58f 100644
--- a/htdocs/lib/functions.inc.php
+++ b/htdocs/lib/functions.inc.php
@@ -507,7 +507,8 @@ function dolibarr_print_date($time,$format='')
     if ($format == 'dayhour')     $format=$conf->format_date_hour_short;
     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 '';