From 0798e730be0007f96afc962c33ad6d1a886b9bb4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 12 Aug 2006 18:17:51 +0000
Subject: [PATCH] =?UTF-8?q?Look:=20Utilisation=20de=20la=20fonction=20info?=
 =?UTF-8?q?=5Fadmin=20pour=20afficher=20alerte=20securit=E9=20admin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/html.form.class.php | 10 +++++-----
 htdocs/index.php           |  7 +++----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php
index 9a1d1698b82..de765bce8e6 100644
--- a/htdocs/html.form.class.php
+++ b/htdocs/html.form.class.php
@@ -662,18 +662,18 @@ class Form
 
 		dolibarr_syslog("html.form.class::select_projects sql=$sql");
 
-		$result=$this->db->query($sql);
-		if ($result)
+		$resql=$this->db->query($sql);
+		if ($resql)
 		{
 			print '<select class="flat" name="'.$htmlname.'">';
     		print '<option value="0">&nbsp;</option>';
-			$num = $this->db->num_rows($result);
+			$num = $this->db->num_rows($resql);
 			$i = 0;
 			if ($num)
 			{
 				while ($i < $num)
 				{
-					$obj = $this->db->fetch_object();
+					$obj = $this->db->fetch_object($resql);
 					if (!empty($selected) && $selected == $obj->rowid)
 					{
 						print '<option value="'.$obj->rowid.'" selected="true">'.$obj->title.'</option>';
@@ -704,7 +704,7 @@ class Form
     function select_produits($selected='',$htmlname='productid',$filtretype='',$limit=20,$price_level=0)
     {
 		global $langs,$conf,$user;
-		if($conf->use_ajax)
+		if ($conf->use_ajax)
 		{
 			print $langs->trans("Ref").':<input type="text" size="8" name="ajkeyref'.$htmlname.'" id="ajkeyref'.$htmlname.'">&nbsp; &nbsp;';
 			print $langs->trans("Label").':<input type="text" size="16" name="ajkeylabel'.$htmlname.'" id="ajkeylabel'.$htmlname.'">';
diff --git a/htdocs/index.php b/htdocs/index.php
index 68fdc316b00..99a99140875 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -54,10 +54,9 @@ if ($user->admin && ! defined("MAIN_REMOVE_INSTALL_WARNING"))
     if (is_dir(DOL_DOCUMENT_ROOT."/install") && is_readable(DOL_DOCUMENT_ROOT."/install"))
     {
         $langs->load("other");
-        print '<table width="100%"><tr><td>';
-        print '<div class="warning">'.$langs->trans("WarningInstallDirExists",DOL_DOCUMENT_ROOT."/install").' ';
-        print $langs->trans("WarningUntilDirRemoved",DOL_DOCUMENT_ROOT."/install").'</div>';   
-        print '</td></tr></table>';
+        $message=$langs->trans("WarningInstallDirExists",DOL_DOCUMENT_ROOT."/install");
+        $message.=$langs->trans("WarningUntilDirRemoved",DOL_DOCUMENT_ROOT."/install");
+		print info_admin($message);
         print "<br>\n";
     }
 }