From 4069b157ad192c5e0ede451a8feb71ca132fadd1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 13 Jul 2010 19:16:09 +0000
Subject: [PATCH] More log to help to diagnose problems

---
 htdocs/install/upgrade.php | 10 +++++-----
 htdocs/lib/admin.lib.php   | 11 +++++++----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php
index 6ca50cb8b05..86ec495a13a 100644
--- a/htdocs/install/upgrade.php
+++ b/htdocs/install/upgrade.php
@@ -112,13 +112,13 @@ if (! isset($_GET["action"]) || preg_match('/upgrade/i',$_GET["action"]))
 	if ($db->connected == 1)
 	{
 		print '<tr><td nowrap="nowrap">';
-		print $langs->trans("ServerConnection")." : $dolibarr_main_db_host</td><td align=\"right\">".$langs->trans("OK")."</td></tr>";
+		print $langs->trans("ServerConnection")." : $dolibarr_main_db_host</td><td align=\"right\">".$langs->trans("OK")."</td></tr>\n";
 		dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ServerConnection")." : $dolibarr_main_db_host ".$langs->transnoentities("OK"));
 		$ok = 1;
 	}
 	else
 	{
-		print "<tr><td>".$langs->trans("ErrorFailedToConnectToDatabase",$dolibarr_main_db_name)."</td><td align=\"right\">".$langs->transnoentities("Error")."</td></tr>";
+		print "<tr><td>".$langs->trans("ErrorFailedToConnectToDatabase",$dolibarr_main_db_name)."</td><td align=\"right\">".$langs->transnoentities("Error")."</td></tr>\n";
 		dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ErrorFailedToConnectToDatabase",$dolibarr_main_db_name));
 		$ok = 0;
 	}
@@ -128,13 +128,13 @@ if (! isset($_GET["action"]) || preg_match('/upgrade/i',$_GET["action"]))
 		if($db->database_selected == 1)
 		{
 			print '<tr><td nowrap="nowrap">';
-			print $langs->trans("DatabaseConnection")." : ".$dolibarr_main_db_name."</td><td align=\"right\">".$langs->trans("OK")."</td></tr>";
+			print $langs->trans("DatabaseConnection")." : ".$dolibarr_main_db_name."</td><td align=\"right\">".$langs->trans("OK")."</td></tr>\n";
 			dolibarr_install_syslog("upgrade: Database connection successfull : $dolibarr_main_db_name");
 			$ok=1;
 		}
 		else
 		{
-			print "<tr><td>".$langs->trans("ErrorFailedToConnectToDatabase",$dolibarr_main_db_name)."</td><td align=\"right\">".$langs->trans("Error")."</td></tr>";
+			print "<tr><td>".$langs->trans("ErrorFailedToConnectToDatabase",$dolibarr_main_db_name)."</td><td align=\"right\">".$langs->trans("Error")."</td></tr>\n";
 			dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ErrorFailedToConnectToDatabase",$dolibarr_main_db_name));
 			$ok=0;
 		}
@@ -320,7 +320,7 @@ if (! isset($_GET["action"]) || preg_match('/upgrade/i',$_GET["action"]))
 		foreach($filelist as $file)
 		{
 			print '<tr><td nowrap>';
-			print $langs->trans("ChoosedMigrateScript").'</td><td align="right">'.$file.'</td></tr>';
+			print $langs->trans("ChoosedMigrateScript").'</td><td align="right">'.$file.'</td></tr>'."\n";
 
 			$name = substr($file, 0, strlen($file) - 4);
 
diff --git a/htdocs/lib/admin.lib.php b/htdocs/lib/admin.lib.php
index 027fe77c0de..c52a084a3be 100644
--- a/htdocs/lib/admin.lib.php
+++ b/htdocs/lib/admin.lib.php
@@ -230,6 +230,8 @@ function run_sql($sqlfile,$silent=1,$entity='',$usesavepoint=1)
 			$result=$db->query($newsql,$usesavepoint);
 			if ($result)
 			{
+				print '<!-- Result = OK -->'."\n";
+
 				if (preg_replace('/insert into ([^\s]+)/i',$newsql,$reg))
 				{
 					$cursorinsert++;
@@ -245,6 +247,7 @@ function run_sql($sqlfile,$silent=1,$entity='',$usesavepoint=1)
 			else
 			{
 				$errno=$db->errno();
+				print '<!-- Result = '.$errno.' -->'."\n";
 
 				$okerror=array( 'DB_ERROR_TABLE_ALREADY_EXISTS',
 				'DB_ERROR_COLUMN_ALREADY_EXISTS',
@@ -266,26 +269,26 @@ function run_sql($sqlfile,$silent=1,$entity='',$usesavepoint=1)
 				{
 					if (! $silent) print '<tr><td valign="top" colspan="2">';
 					if (! $silent) print '<div class="error">'.$langs->trans("Error")." ".$db->errno().": ".$newsql."<br>".$db->error()."</div></td>";
-					if (! $silent) print '</tr>';
+					if (! $silent) print '</tr>'."\n";
 					dol_syslog('Admin.lib::run_sql Request '.($i+1)." Error ".$db->errno()." ".$newsql."<br>".$db->error(), LOG_ERR);
 					$error++;
 				}
 			}
 
-			if (! $silent) print '</tr>';
+			if (! $silent) print '</tr>'."\n";
 		}
 	}
 
 	if ($error == 0)
 	{
 		if (! $silent) print '<tr><td>'.$langs->trans("ProcessMigrateScript").'</td>';
-		if (! $silent) print '<td align="right">'.$langs->trans("OK").'</td></tr>';
+		if (! $silent) print '<td align="right">'.$langs->trans("OK").'</td></tr>'."\n";
 		$ok = 1;
 	}
 	else
 	{
 		if (! $silent) print '<tr><td>'.$langs->trans("ProcessMigrateScript").'</td>';
-		if (! $silent) print '<td align="right"><font class="error">'.$langs->trans("KO").'</font></td></tr>';
+		if (! $silent) print '<td align="right"><font class="error">'.$langs->trans("KO").'</font></td></tr>'."\n";
 		$ok = 0;
 	}