From 989971c985e686f1c891dbd8eba53555408dbc3c Mon Sep 17 00:00:00 2001
From: erics <erics>
Date: Wed, 22 Dec 2004 20:24:26 +0000
Subject: [PATCH] =?UTF-8?q?je=20pensais=20avoir=20trouv=C3=A9=20un=20bug?=
 =?UTF-8?q?=20dans=20ce=20module=20mais=20c'est=20juste=20un=20soucis=20d'?=
 =?UTF-8?q?indentation=20qui=20fait=20que=20j'arrive=20pas=20=C3=A0=20lire?=
 =?UTF-8?q?=20le=20code,=20d=C3=A9sol=C3=A9=20donc=20je=20r=C3=A9indente?=
 =?UTF-8?q?=20pour=20m'y=20retrouver?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/DolibarrModules.class.php         | 43 ++++++++++---------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/htdocs/includes/modules/DolibarrModules.class.php b/htdocs/includes/modules/DolibarrModules.class.php
index b6cd8bf7941..27c2aed959d 100644
--- a/htdocs/includes/modules/DolibarrModules.class.php
+++ b/htdocs/includes/modules/DolibarrModules.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004 Sebastien Di Cintio  <sdicintio@ressource-toi.org>
  * Copyright (C) 2004 Benoit Mortier			 <benoit.mortier@opensides.be>
+ * Copyright (C) 2004 Eric Seigne          <eric.seigne@ryxeo.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -54,21 +55,21 @@ class DolibarrModules
     // Insère les constantes
     $err = 0;
     $sql_del = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = '".$this->const_name."';";
-		$this->db->query($sql_del);
-		$sql ="INSERT INTO ".MAIN_DB_PREFIX."const (name,value,visible) VALUES
-		('".$this->const_name."','1',0);";
+    $this->db->query($sql_del);
 
+    $sql ="INSERT INTO ".MAIN_DB_PREFIX."const (name,value,visible) VALUES
+		('".$this->const_name."','1',0);";
     if (!$this->db->query($sql))
       {
 	$err++;
       }
-
+    
     // Insère les boxes dans llx_boxes_def
     foreach ($this->boxes as $key => $value)
       {
 	$titre = $this->boxes[$key][0];
 	$file  = $this->boxes[$key][1];
-
+	
 	$sql = "SELECT count(*) FROM ".MAIN_DB_PREFIX."boxes_def WHERE name ='".$titre."'";
 
 	if ( $this->db->query($sql) )
@@ -110,21 +111,21 @@ class DolibarrModules
 	    if ($row[0] == 0)
 	      {
 	        // Si non trouve // '$visible'
-            if (strlen($note)){
-            $sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,type,value,note,visible) VALUES ('$name','$type','$val','$note',0);";
-            }elseif (strlen($val))
-            {
-            $sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,type,value,visible) VALUES ('$name','$type','$val',0);";
-            }
-            else
-            {
-            $sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,type,visible) VALUES ('$name','$type',0);";
-            }
-            
-            if (! $this->db->query($sql) )
-            {
-            $err++;
-            }
+		if (strlen($note)){
+		  $sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,type,value,note,visible) VALUES ('$name','$type','$val','$note',0);";
+		}elseif (strlen($val))
+		  {
+		    $sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,type,value,visible) VALUES ('$name','$type','$val',0);";
+		  }
+		else
+		  {
+		    $sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,type,visible) VALUES ('$name','$type',0);";
+		  }
+		
+		if (! $this->db->query($sql) )
+		  {
+		    $err++;
+		  }
 	      }
 	  }
 	else
@@ -173,7 +174,7 @@ class DolibarrModules
 		$sql .= "(".$r_id.",'".$r_desc."','".$r_modul."','".$r_type."',".$r_def.");";
 	      }
 
-
+	    //	    print "<pre>DEBUG ERIC: $sql</pre>\n";
 	    if ( $this->db->query($sql) )
 	      {
 	      }