From f9f91f1e43262511c8eb5e7e10bcb2645dc126f2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 9 Feb 2005 21:03:09 +0000
Subject: [PATCH] Qual: Correction de mauvaises habitudes de codage.

---
 .../includes/modules/DolibarrModules.class.php | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/htdocs/includes/modules/DolibarrModules.class.php b/htdocs/includes/modules/DolibarrModules.class.php
index 299856789cd..5e677b01a06 100644
--- a/htdocs/includes/modules/DolibarrModules.class.php
+++ b/htdocs/includes/modules/DolibarrModules.class.php
@@ -53,6 +53,8 @@ class DolibarrModules
      */
     function _init($array_sql)
     {
+        global $langs;
+        
         // Insère les constantes
         $err = 0;
         $sql_del = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = '".$this->const_name."';";
@@ -73,13 +75,14 @@ class DolibarrModules
 
             $sql = "SELECT count(*) FROM ".MAIN_DB_PREFIX."boxes_def WHERE name ='".$titre."'";
 
-            if ( $this->db->query($sql) )
+            $result=$this->db->query($sql);
+            if ($result)
             {
-                $row = $this->db->fetch_row($sql);
+                $row = $this->db->fetch_row($result);
                 if ($row[0] == 0)
                 {
                     $sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes_def (name, file) VALUES ('".$titre."','".$file."')";
-                    if (! $this->db->query($sql) )
+                    if (! $this->db->query($sql))
                     {
                         $err++;
                     }
@@ -102,9 +105,10 @@ class DolibarrModules
 
             $sql = "SELECT count(*) FROM ".MAIN_DB_PREFIX."const WHERE name ='".$name."'";
 
-            if ( $this->db->query($sql) )
+            $result=$this->db->query($sql);
+            if ($result)
             {
-                $row = $this->db->fetch_row($sql);
+                $row = $this->db->fetch_row($result);
 
                 if ($row[0] == 0)
                 {
@@ -188,8 +192,8 @@ class DolibarrModules
                     umask(0);
                     if (! @mkdir($dir, 0755))
                     {
-                        $this->error = "Erreur: Le répertoire '$dir' n'existe pas et Dolibarr n'a pu le créer.";
-                        dolibarr_syslog("Erreur: impossible de créer $dir");
+                        $this->error = $langs->trans("ErrorCanNotCreateDir",$dir);
+                        dolibarr_syslog("DolibarrModules::_init error");
 
                     }
                 }