From d74fc064b266e04b3c8592ebc7537de652c9414f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 9 Oct 2007 23:28:27 +0000
Subject: [PATCH] Fix: Pb affichage log install

---
 htdocs/install/etape5.php    | 16 ++++++++--------
 htdocs/install/inc.php       |  4 ++--
 htdocs/lib/functions.inc.php |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php
index 6c21a24c90d..709eb1c2121 100644
--- a/htdocs/install/etape5.php
+++ b/htdocs/install/etape5.php
@@ -38,7 +38,7 @@ $langs->load("install");
 $success=0;
 
 
-dolibarr_install_syslog("etape5: Entering etape5.php page");
+dolibarr_install_syslog("etape5: Entering etape5.php page", LOG_INFO);
 
 
 if ($_POST["action"] == "set" || $_POST["action"] == "upgrade")
@@ -65,11 +65,6 @@ if ($_POST["action"] == "set" || $_POST["action"] == "upgrade")
         }
     }
     
-    // If upgrade
-    if ($_POST["action"] == "upgrade")
-    {
-
-    }
 
     pHeader($langs->trans("SetupEnd"),"etape5");
 
@@ -92,7 +87,8 @@ if ($_POST["action"] == "set" || $_POST["action"] == "upgrade")
     // Active module user
     $modName='modUser';
     $file = $modName . ".class.php";
-    include_once("../includes/modules/$file");
+    dolibarr_install_syslog('install/etape5.php Load module user '.DOL_DOCUMENT_ROOT ."/includes/modules/".$file, LOG_INFO);
+	include_once(DOL_DOCUMENT_ROOT ."/includes/modules/".$file);
     $objMod = new $modName($db);
     $objMod->init();
     
@@ -108,6 +104,8 @@ if ($_POST["action"] == "set" || $_POST["action"] == "upgrade")
             $sql.= ",'".($conf->password_encrypted?md5($_POST["pass"]):$_POST["pass"])."'";
             $sql.= ",1,'Administrateur')";
 	    	//print "sql=".$sql." ".mysql_errno($db->db);
+
+			dolibarr_install_syslog('install/etape5.php sql='.$sql, LOG_INFO);
 	        $resql=$db->query($sql);
 	        if ($resql)
 	        {
@@ -118,11 +116,13 @@ if ($_POST["action"] == "set" || $_POST["action"] == "upgrade")
 	        {
 	            if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 	            {
+					dolibarr_install_syslog('install/etape5.php DB_ERROR_RECORD_ALREADY_EXISTS', LOG_WARNING);
 	                print '<br><div class="warning">'.$langs->trans("AdminLoginAlreadyExists",$_POST["login"])."</div><br>";
 	                $success = 1;
 	            }
 	            else
 	            {
+					dolibarr_install_syslog('install/etape5.php FailedToCreateAdminLogin', LOG_ERR);
 	                print '<br>'.$langs->trans("FailedToCreateAdminLogin").'<br><br>';
 	            }
 	        }
@@ -188,7 +188,7 @@ print $langs->trans("GoToSetupArea");
 print '</a>';
 
 
-dolibarr_install_syslog("Dolibarr install/setup finished");
+dolibarr_install_syslog("Dolibarr install/setup finished", LOG_INFO);
 
 
 pFooter(1,$setuplang);
diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index 0cb08ffe073..d53cbc0ff3e 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -181,10 +181,10 @@ function pFooter($nonext=0,$setuplang='')
 }
 
 
-function dolibarr_install_syslog($message)
+function dolibarr_install_syslog($message, $level=LOG_DEBUG)
 {
 	if (! defined('LOG_DEBUG')) define('LOG_DEBUG',6);
-	dolibarr_syslog($message,constant('LOG_DEBUG'));
+	dolibarr_syslog($message,$level);
 }
 
 ?>
\ No newline at end of file
diff --git a/htdocs/lib/functions.inc.php b/htdocs/lib/functions.inc.php
index 208d671948a..42478e2635f 100644
--- a/htdocs/lib/functions.inc.php
+++ b/htdocs/lib/functions.inc.php
@@ -170,7 +170,7 @@ function sanitize_string($str)
 				fautes de protection mémoire. Pour résoudre, utiliser le loggage fichier,
 				au lieu du loggage syslog (configuration du module).
 				Si SYSLOG_FILE_NO_ERROR défini, on ne gère pas erreur ecriture log
-	\remarks	On windows LOG_ERROR=4, LOG_WARNING=5, LOG_NOTICE=LOG_DEBUG=6
+	\remarks	On windows LOG_ERROR=4, LOG_WARNING=5, LOG_NOTICE=LOG_DEBUG=LOG_INFO=6
 */
 function dolibarr_syslog($message, $level=LOG_INFO)
 {