diff --git a/htdocs/admin/boutique.php b/htdocs/admin/boutique.php
index cd70ab48849..f6439660d5d 100644
--- a/htdocs/admin/boutique.php
+++ b/htdocs/admin/boutique.php
@@ -86,14 +86,16 @@ elseif ($_POST["test"])
     if ($oscommercedb->connected == 1 && $oscommercedb->database_selected == 1)
     {
         // Vérifie si bonne base par requete sur une table OSCommerce
-        $sql="SELECT xxx FROM zzz WHERE aaa='application_name'";
+        $sql ="SELECT configuration_value";
+        $sql.=" FROM configuration";
+        $sql.=" WHERE configuration_key='STORE_NAME'";
         $resql=$oscommercedb->query($sql);
         if ($resql) {
             $mesg ="<div class=\"ok\">".$langs->trans("OSCommerceTestOk",$_POST["oscommerce_dbhost"],$_POST["oscommerce_dbname"],$_POST["oscommerce_dbuser"]);
             $mesg.="</div>";
         }
         else {
-            $mesg ="<div class=\"error\">".$langs->trans("ErrorConnectOkButWrongDatabase");
+            $mesg ="<div class=\"error\">".$langs->trans("OSCommerceErrorConnectOkButWrongDatabase");
             $mesg.="</div>";
         }
 
diff --git a/htdocs/admin/webcalendar.php b/htdocs/admin/webcalendar.php
index fe2b812ea13..e42cad79c9f 100644
--- a/htdocs/admin/webcalendar.php
+++ b/htdocs/admin/webcalendar.php
@@ -108,7 +108,7 @@ elseif ($actiontest)
             $mesg.="</div>";
         }
         else {
-            $mesg ="<div class=\"error\">".$langs->trans("ErrorConnectOkButWrongDatabase");
+            $mesg ="<div class=\"error\">".$langs->trans("WebCalErrorConnectOkButWrongDatabase");
             $mesg.="</div>";
         }
 
diff --git a/htdocs/compta/prelevement/rejet-prelevement.class.php b/htdocs/compta/prelevement/rejet-prelevement.class.php
index 0c8a06fb45e..1957d45e374 100644
--- a/htdocs/compta/prelevement/rejet-prelevement.class.php
+++ b/htdocs/compta/prelevement/rejet-prelevement.class.php
@@ -17,20 +17,19 @@
  *
  * $Id$
  * $Source$
- *
  */
 
 /*
-  \file       htdocs/compta/prelevement/prelevement.class.php
-  \ingroup    prelevement
-  \brief      Fichier de la classe des prelevements
-  \version    $Revision$
+		\file       htdocs/compta/prelevement/rejet-prelevement.class.php
+		\ingroup    prelevement
+		\brief      Fichier de la classe des prelevements
+		\version    $Revision$
 */
 
 
-/*!
-  \class Prelevement
-  \brief      Classe permettant la gestion des prelevements
+/**
+		\class 		Prelevement
+		\brief      Classe permettant la gestion des prelevements
 */
 
 class RejetPrelevement
diff --git a/htdocs/conf/conf.class.php b/htdocs/conf/conf.class.php
index 6db173b1790..c84ac9b386d 100644
--- a/htdocs/conf/conf.class.php
+++ b/htdocs/conf/conf.class.php
@@ -92,8 +92,11 @@ class Conf
 		        $objp = $db->fetch_object($result);
 		        $key=$objp->name;
 		        $value=$objp->value; // Pas de stripslashes (ne s'applique pas sur lecture en base mais après POST quand get_magic_quotes_gpc()==1)
-		        define ("$key", $value);
-		        $this->global->$key=$value;
+		        if ($key)
+		        {
+		        	define ("$key", $value);
+		        	$this->global->$key=$value;
+				}
 		        $i++;
 		    }
 		}
@@ -141,14 +144,14 @@ class Conf
 
 		// Module mailing
 		$this->mailing->enabled=defined("MAIN_MODULE_MAILING")?MAIN_MODULE_MAILING:0;
-	
+
 		// Module notification
 		$this->notification->enabled=defined("MAIN_MODULE_NOTIFICATION")?MAIN_MODULE_NOTIFICATION:0;
 
 		// Module externalrss
 		$this->externalrss->enabled=defined("MAIN_MODULE_EXTERNALRSS")?MAIN_MODULE_EXTERNALRSS:0;
 		$this->externalrss->dir_temp=DOL_DATA_ROOT."/rss/temp";
-		
+
 		// Module commande client
 		$this->commande->enabled=defined("MAIN_MODULE_COMMANDE")?MAIN_MODULE_COMMANDE:0;
 		$this->commande->dir_output=DOL_DATA_ROOT."/commande";
@@ -293,7 +296,7 @@ class Conf
 
 		// outils systemes
 		if (! $this->global->SYSTEMTOOLS_MYSQLDUMP) $this->global->SYSTEMTOOLS_MYSQLDUMP="mysqldump";
-		
+
 		// societe
 		if (! $this->global->SOCIETE_CODECLIENT_ADDON) $this->global->SOCIETE_CODECLIENT_ADDON="mod_codeclient_leopard";
 		if (! $this->global->SOCIETE_CODEFOURNISSEUR_ADDON) $this->global->SOCIETE_CODEFOURNISSEUR_ADDON="mod_codeclient_leopard";
diff --git a/htdocs/lib/functions.inc.php b/htdocs/lib/functions.inc.php
index b1b3cbd0372..b5cd4abe42a 100644
--- a/htdocs/lib/functions.inc.php
+++ b/htdocs/lib/functions.inc.php
@@ -320,6 +320,12 @@ function dolibarr_set_const($db, $name, $value, $type='chaine', $visible=0, $not
     
     $db->begin();
     
+    if (! $name) 
+    {
+    	dolibarr_print_error("Error: Call to function dolibarr_set_const with wrong parameters");
+    	exit;
+    }
+    
     //dolibarr_syslog("dolibarr_set_const name=$name, value=$value");
     $sql = "DELETE FROM llx_const WHERE name = '$name';"; 		
     $resql=$db->query($sql);	
diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php
index 0396528b3ef..1492f723e74 100644
--- a/htdocs/viewimage.php
+++ b/htdocs/viewimage.php
@@ -21,13 +21,13 @@
  * $Source$
  */
 
-/**     \file       htdocs/viewimage.php
+/**
+		\file       htdocs/viewimage.php
 		\brief      Wrapper permettant l'affichage de fichiers images Dolibarr
         \remarks    L'appel est viewimage.php?file=pathrelatifdufichier&modulepart=repfichierconcerne
 		\version    $Revision$
 */
 
-require_once("master.inc.php");
 require_once("main.inc.php");