diff --git a/htdocs/admin/adherent.php b/htdocs/admin/adherent.php
index 9d781a7a89a..937ed4c2cc6 100644
--- a/htdocs/admin/adherent.php
+++ b/htdocs/admin/adherent.php
@@ -53,20 +53,18 @@ if ($_POST["action"] == 'update' || $_POST["action"] == 'add')
 {
   if (isset($_POST["consttype"]) && $_POST["consttype"] != '')
 	{
-		$sql = "delete from ".MAIN_DB_PREFIX."const where name = '".$_POST["constname"]."';";
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = '".$_POST["constname"]."';";
 	  $db->query($sql);
 		$sql = '';
-		$sql = "insert into ".MAIN_DB_PREFIX."const (name,value,type,visible,note) VALUES ('".$_POST["constname"]."','".$_POST["constvalue"]."','".$typeconst[$_POST["consttype"]]."',0,'".$_POST["constnote"]."') ;";
-				
-  //  $sql = "REPLACE INTO ".MAIN_DB_PREFIX."const SET name='".$_POST["constname"]."', value = '".$_POST["constvalue"]."',note='".$_POST["constnote"]."', type='".$typeconst[$_POST["consttype"]]."',visible=0";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,value,type,visible,note) VALUES ('".$_POST["constname"]."','".$_POST["constvalue"]."','".$typeconst[$_POST["consttype"]]."',0,'".$_POST["constnote"]."') ;";
+
   }
 	else
 	{
-	  $sql = "delete from ".MAIN_DB_PREFIX."const where name = '".$_POST["constname"]."';";
+	  $sql = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = '".$_POST["constname"]."';";
 	  $db->query($sql);
 		$sql ='';
-		$sql = "insert into ".MAIN_DB_PREFIX."const (name,value,visible,note) VALUES ('".$_POST["constname"]."','".$_POST["constvalue"]."',0,'".$_POST["constnote"]."') ;";
-    //$sql = "REPLACE INTO ".MAIN_DB_PREFIX."const SET name='".$_POST["constname"]."', value = '".$_POST["constvalue"]."',note='".$_POST["constnote"]."',visible=0";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,value,visible,note) VALUES ('".$_POST["constname"]."','".$_POST["constvalue"]."',0,'".$_POST["constnote"]."') ;";
   }
   
   if ($db->query($sql))
@@ -85,15 +83,13 @@ if ($_POST["action"] == 'update' || $_POST["action"] == 'add')
 
 if ($action == 'set')
 {
-   $sql = "delete from ".MAIN_DB_PREFIX." where name = '$name' ;";
+   $sql = "DELETE FROM ".MAIN_DB_PREFIX." WHERE name = '$name' ;";
 	 $db->query($sql);
 	 
 	 $sql ='';
 	 $sql = "INSERT INTO ".MAIN_DB_PREFIX."const(name,value,visible) values ('$name','$value',
 	 0);  "; 
 
- // $sql = "REPLACE INTO ".MAIN_DB_PREFIX."const SET name = '$name', value='".$value."', visible=0";
-
   if ($db->query($sql))
     {
       Header("Location: adherent.php");
diff --git a/htdocs/admin/boutique.php b/htdocs/admin/boutique.php
index a7a521b9b82..388bce9df53 100644
--- a/htdocs/admin/boutique.php
+++ b/htdocs/admin/boutique.php
@@ -55,10 +55,10 @@ $modules["BOUTIQUE_ALBUM"][3] = "Module de gestion des albums";
 
 if ($action == 'set')
 {
-	$sql = "delete from ".MAIN_DB_PREFIX."const where name = '".$value."';";
+	$sql = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = '".$value."';";
 	$db->query($sql);
 	$sql ='';
-	$sql = "insert into ".MAIN_DB_PREFIX."const (name,value,visible) VALUES ('".$value."','1',0) ; ";
+	$sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,value,visible) VALUES ('".$value."','1',0) ; ";
 	
   //$sql = "REPLACE INTO ".MAIN_DB_PREFIX."const SET name = '".$value."', value='1', visible = 0";
 
@@ -70,10 +70,10 @@ if ($action == 'set')
 
 if ($action == 'reset')
 {
-  $sql = "delete from ".MAIN_DB_PREFIX."const where name = '".$value."';";
+  $sql = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = '".$value."';";
 	$db->query($sql);
 	$sql = '';
-	$sql = "insert into ".MAIN_DB_PREFIX."const (name,value,visible) VALUES ('".$value."','0',0) ; ";
+	$sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,value,visible) VALUES ('".$value."','0',0) ; ";
   //$sql = "REPLACE INTO ".MAIN_DB_PREFIX."const SET name = '".$value."', value='0', visible = 0";
 
   if ($db->query($sql))
diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index d5d7d0724a4..ff98ecb01ee 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -49,13 +49,11 @@ $commande_addon_var = COMMANDE_ADDON;
 
 if ($_GET["action"] == 'setmod')
 {
-	$sql = "delete from ".MAIN_DB_PREFIX."const where name = 'COMMANDE_ADDON' ;";
+	$sql = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = 'COMMANDE_ADDON' ;";
 	$db->query($sql);
 	$sql = '';
-	$sql = "insert into ".MAIN_DB_PREFIX."const (name,value,visible) VALUES
+	$sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,value,visible) VALUES
 	('COMMANDE_ADDON','".$_GET["value"]."',0) ; ";
-	
-  //$sql = "REPLACE INTO ".MAIN_DB_PREFIX."const SET name = 'COMMANDE_ADDON', value='".$_GET["value"]."', visible=0";
 
   if ($db->query($sql))
     {
diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index 6029b6489ae..a52db33f85c 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -2,8 +2,8 @@
 /* Copyright (C) 2003-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004 Laurent Destailleur  <eldy@users.sourceforge.net>
  * 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>
+ * 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
@@ -39,10 +39,10 @@ if (!$user->admin)
 
 if ($action == 'nbprod' && $user->admin)
 {
-  $sql ="delete from ".MAIN_DB_PREFIX."const where name = 'EXPEDITION_NEW_FORM_NB_PRODUCT';";
+  $sql ="DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = 'EXPEDITION_NEW_FORM_NB_PRODUCT';";
 	$db->query($sql);
 	$sql ='';
-	$sql = "insert into ".MAIN_DB_PREFIX."const (name,value,visible) VALUES ('EXPEDITION_NEW_FORM_NB_PRODUCT','".$value."',0);";
+	$sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,value,visible) VALUES ('EXPEDITION_NEW_FORM_NB_PRODUCT','".$value."',0);";
 	
   //$sql = "REPLACE INTO ".MAIN_DB_PREFIX."const SET name = 'EXPEDITION_NEW_FORM_NB_PRODUCT', value='".$value."', visible=0";
 
@@ -63,13 +63,10 @@ if ($_GET["action"] == 'set')
   require_once($file);
   
   $obj = new $classname();
-  $sql = "delete from ".MAIN_DB_PREFIX."expedition_methode where rowid = ".$obj->id.";";
+  $sql = "DELETE FROM ".MAIN_DB_PREFIX."expedition_methode WHERE rowid = ".$obj->id.";";
   $db->query($sql);
   $sql='';
-  $sql = "insert into ".MAIN_DB_PREFIX."expedition_methode (rowid,code,libelle,description,status) VALUES (".$obj->id.",'".$obj->code."','".$obj->name."','".addslashes($obj->description)."',".$_GET["statut"].");";
-  
-  //$sql = "REPLACE INTO ".MAIN_DB_PREFIX."expedition_methode (rowid,code,libelle, description, statut)";
-  //$sql .= " VALUES (".$obj->id.",'".$obj->code."','".$obj->name."','".addslashes($obj->description)."',".$_GET["statut"].")";
+  $sql = "INSERT INTO ".MAIN_DB_PREFIX."expedition_methode (rowid,code,libelle,description,status) VALUES (".$obj->id.",'".$obj->code."','".$obj->name."','".addslashes($obj->description)."',".$_GET["statut"].");";
   
   if ($db->query($sql))
     {
@@ -83,12 +80,10 @@ $expedition_addon_var_pdf = EXPEDITION_ADDON_PDF;
 
 if ($_GET["action"] == 'setpdf')
 {
-	$sql = "delete from ".MAIN_DB_PREFIX."const where name = 'EXPEDITION_ADDON_PDF';";
+	$sql = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = 'EXPEDITION_ADDON_PDF';";
 	$db->query($sql);
 	$sql='';
-	$sql = "insert into ".MAIN_DB_PREFIX."const (name,value,visible) VALUES ('EXPEDITION_ADDON_PDF','".$_GET["value"]."',0)";
-	
-  //$sql = "REPLACE INTO ".MAIN_DB_PREFIX."const SET name = 'EXPEDITION_ADDON_PDF', value='".$_GET["value"]."', visible=0";
+	$sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,value,visible) VALUES ('EXPEDITION_ADDON_PDF','".$_GET["value"]."',0)";
 
   if ($db->query($sql))
     {
@@ -111,12 +106,11 @@ $expedition_default = EXPEDITION_DEFAULT;
 
 if ($_GET["action"] == 'setdef')
 {
-  $sql = "delete from ".MAIN_DB_PREFIX."const where name = 'EXPEDITION_ADDON';";
+  $sql = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = 'EXPEDITION_ADDON';";
 	$db->query($sql);
 	$sql='';
-	$sql = "insert into ".MAIN_DB_PREFIX."const (name,value,visible) VALUES ('EXPEDITION_ADDON','".$value."',0)";
+	$sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,value,visible) VALUES ('EXPEDITION_ADDON','".$value."',0)";
 	
-  //$sql = "REPLACE INTO ".MAIN_DB_PREFIX."const SET name = 'EXPEDITION_ADDON', value='".$value."', visible=0";
   if ($db->query($sql))
     {
       // la constante qui a été lue en avant du nouveau set
diff --git a/htdocs/admin/external_rss.php b/htdocs/admin/external_rss.php
index 94413575978..ae58b7ba205 100644
--- a/htdocs/admin/external_rss.php
+++ b/htdocs/admin/external_rss.php
@@ -42,7 +42,7 @@ if (!$user->admin)
 $def = array();
 
 // positionne la variable pour le nombre de rss externes
-$db->query("select count(*) nb from ".MAIN_DB_PREFIX."const where name like 'EXTERNAL_RSS_URLRSS_%'");
+$db->query("select count(*) nb from ".MAIN_DB_PREFIX."const WHERE name like 'EXTERNAL_RSS_URLRSS_%'");
 $obj = $db->fetch_object(0);
 $nbexternalrss = $obj->nb;
 
@@ -54,22 +54,15 @@ if ($_POST["action"] == 'add')
     if(isset($_POST[$external_rss_urlrss])) {
       $external_rss_title = "external_rss_title_" . $_POST["norss"];
       //$external_rss_url = "external_rss_url_" . $_POST["norss"];
-      
-      //$sql  = "REPLACE INTO ".MAIN_DB_PREFIX."const SET name = 'EXTERNAL_RSS_URL_" . $_POST["norss"] . "', value='".$_POST[$external_rss_url]."', visible=0"; 
 			
-			$sql = "delete from ".MAIN_DB_PREFIX."const where name ='EXTERNAL_RSS_TITLE_" . $_POST["norss"] . "'; ";
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name ='EXTERNAL_RSS_TITLE_" . $_POST["norss"] . "'; ";
       $db->query($sql); $sql='';
-			$sql1 = "insert into ".MAIN_DB_PREFIX."const (name,value,visible) VALUES ('EXTERNAL_RSS_TITLE_" . $_POST["norss"] . "','".$_POST[$external_rss_title]."',0) ;";
-			
-			//$sql1 = "REPLACE INTO ".MAIN_DB_PREFIX."const SET name = 'EXTERNAL_RSS_TITLE_" . $_POST["norss"] . "', value='".$_POST[$external_rss_title]."', visible=0";
-			
-			
-			$sql = "delete from ".MAIN_DB_PREFIX."const where name ='EXTERNAL_RSS_URLRSS_" . $_POST["norss"] . "'; ";
+			$sql1 = "INSERT INTO ".MAIN_DB_PREFIX."const (name,value,visible) VALUES ('EXTERNAL_RSS_TITLE_" . $_POST["norss"] . "','".$_POST[$external_rss_title]."',0) ;";
+						
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name ='EXTERNAL_RSS_URLRSS_" . $_POST["norss"] . "'; ";
 			$db->query($sql);$sql='';
-		$sql2 = "insert into ".MAIN_DB_PREFIX."const (name,value,visible) VALUES ('EXTERNAL_RSS_URLRSS_" . $_POST["norss"] . "','".$_POST[$external_rss_urlrss]."',0) ;";
-			
-      //$sql2 = "REPLACE INTO ".MAIN_DB_PREFIX."const SET name = 'EXTERNAL_RSS_URLRSS_" . $_POST["norss"] . "', value='".$_POST[$external_rss_urlrss]."', visible=0";
-      
+		$sql2 = "INSERT INTO ".MAIN_DB_PREFIX."const (name,value,visible) VALUES ('EXTERNAL_RSS_URLRSS_" . $_POST["norss"] . "','".$_POST[$external_rss_urlrss]."',0) ;";
+			      
       if ($db->query($sql1) && $db->query($sql2))
 	{
         header("Location: external_rss.php");
@@ -82,9 +75,9 @@ if ($_POST["action"] == 'add')
 if ($_POST["delete"])
 {
     if(isset($_POST["norss"])) {
-      $sql  = "DELETE FROM ".MAIN_DB_PREFIX."const where name = 'EXTERNAL_RSS_URL_" . $_POST["norss"]."'";
-      $sql1 = "DELETE FROM ".MAIN_DB_PREFIX."const where name = 'EXTERNAL_RSS_TITLE_" . $_POST["norss"]."'";
-      $sql2 = "DELETE FROM ".MAIN_DB_PREFIX."const where name = 'EXTERNAL_RSS_URLRSS_" . $_POST["norss"]."'";
+      $sql  = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = 'EXTERNAL_RSS_URL_" . $_POST["norss"]."'";
+      $sql1 = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = 'EXTERNAL_RSS_TITLE_" . $_POST["norss"]."'";
+      $sql2 = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = 'EXTERNAL_RSS_URLRSS_" . $_POST["norss"]."'";
       
       $result = $db->query($sql);
       $result = $db->query($sql1);
@@ -103,18 +96,16 @@ if ($_POST["modify"])
     if(isset($_POST[$external_rss_urlrss])) {
       $external_rss_title = "external_rss_title_" . $_POST["norss"];
       //$external_rss_url = "external_rss_url_" . $i;
-      //$sql = "REPLACE INTO ".MAIN_DB_PREFIX."const SET name = '" . "EXTERNAL_RSS_URL_" . $_POST["norss"] . "', value='". $_POST[$external_rss_url]."', visible=0"; 
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX."const where name = 'EXTERNAL_RSS_TITLE_" . $_POST["norss"]."';";
+			
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = 'EXTERNAL_RSS_TITLE_" . $_POST["norss"]."';";
 			$db->query($sql);$sql='';
-			$sql1 = "insert into ".MAIN_DB_PREFIX."const (name,value,visible) VALUES
+			$sql1 = "INSERT INTO ".MAIN_DB_PREFIX."const (name,value,visible) VALUES
 			('" . "EXTERNAL_RSS_TITLE_" . $_POST["norss"] . "',". $_POST[$external_rss_title]."',0) ;";
 			
-      //$sql1 = "REPLACE INTO ".MAIN_DB_PREFIX."const SET name = '" . "EXTERNAL_RSS_TITLE_" . $_POST["norss"] . "', value='". $_POST[$external_rss_title]."', visible=0";
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX."const where name = 'EXTERNAL_RSS_URLRSS_" . $_POST["norss"]."';";
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = 'EXTERNAL_RSS_URLRSS_" . $_POST["norss"]."';";
 			$db->query($sql);$sql='';
-			$sql2 = "insert into ".MAIN_DB_PREFIX."const (name,value,visible) VALUES 
+			$sql2 = "INSERT INTO ".MAIN_DB_PREFIX."const (name,value,visible) VALUES 
 			('" . "EXTERNAL_RSS_URLRSS_" . $_POST["norss"] . "','". $_POST[$external_rss_urlrss]."',0)";
-      //$sql2 = "REPLACE INTO ".MAIN_DB_PREFIX."const SET name = '" . "EXTERNAL_RSS_URLRSS_" . $_POST["norss"] . "', value='". $_POST[$external_rss_urlrss]."', visible=0";
       
       if ($db->query($sql1) && $db->query($sql2))
 	{
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index e493c44559f..8f17669a052 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -45,12 +45,10 @@ $ficheinter_addon_var_pdf = FICHEINTER_ADDON_PDF;
 
 if ($action == 'setpdf')
 {
-	$sql = "delete from ".MAIN_DB_PREFIX."const where name = 'FICHEINTER_ADDON_PDF' ;";
+	$sql = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = 'FICHEINTER_ADDON_PDF' ;";
 	$db->query($sql);$sql ='';
-	$sql = "insert into ".MAIN_DB_PREFIX."const (name,value,visible) VALUES
+	$sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,value,visible) VALUES
 	('FICHEINTER_ADDON_PDF','".$value."',0) ; ";
-	
-  //$sql = "REPLACE INTO ".MAIN_DB_PREFIX."const SET name = 'FICHEINTER_ADDON_PDF', value='".$value."', visible=0";
 
   if ($db->query($sql))
     {
diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php
index ad5d38da0ca..604c412867c 100644
--- a/htdocs/admin/ldap.php
+++ b/htdocs/admin/ldap.php
@@ -38,31 +38,29 @@ if (!$user->admin)
 
 if ($_GET["action"] == 'setvalue' && $user->admin)
 {
-  $sql = "delete from ".MAIN_DB_PREFIX."const where name = 'LDAP_SERVER_HOST';";
+  $sql = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = 'LDAP_SERVER_HOST';";
 	$db->query($sql);$sql='';
-	$sql = "insert into ".MAIN_DB_PREFIX."const (name,value,visible) VALUES
+	$sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,value,visible) VALUES
 	('LDAP_SERVER_HOST','".$_POST["host"]."',0);";
-  //$sql = "REPLACE INTO ".MAIN_DB_PREFIX."const SET name = 'LDAP_SERVER_HOST', value='".$_POST["host"]."', visible=0";
+
   $db->query($sql);
 
-  //$sql = "REPLACE INTO ".MAIN_DB_PREFIX."const SET name = 'LDAP_SERVER_DN', value='".$_POST["dn"]."', visible=0";
-  $sql = "delete from ".MAIN_DB_PREFIX."const where name = 'LDAP_SERVER_DN';";
+  $sql = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = 'LDAP_SERVER_DN';";
 	$db->query($sql);$sql='';
-	$sql = "insert into ".MAIN_DB_PREFIX."const (name,value,visible) VALUES
+	$sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,value,visible) VALUES
 	('LDAP_SERVER_DN','".$_POST["dn"]."',0);";
   $db->query($sql);
 
-	$sql = "delete from ".MAIN_DB_PREFIX."const where name = 'LDAP_SERVER_PASS';";
+	$sql = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = 'LDAP_SERVER_PASS';";
 	$db->query($sql);$sql='';
-	$sql = "insert into ".MAIN_DB_PREFIX."const (name,value,visible) VALUES
+	$sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,value,visible) VALUES
 	('LDAP_SERVER_PASS','".$_POST["pass"]."',0);";
-  //$sql = "REPLACE INTO ".MAIN_DB_PREFIX."const SET name = 'LDAP_SERVER_PASS', value='".$_POST["pass"]."', visible=0";
+
   $db->query($sql);
 
-  //$sql = "REPLACE INTO ".MAIN_DB_PREFIX."const SET name = 'LDAP_SERVER_TYPE', value='".$_POST["type"]."', visible=0";
-  $sql = "delete from ".MAIN_DB_PREFIX."const where name = 'LDAP_SERVER_TYPE';";
+  $sql = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = 'LDAP_SERVER_TYPE';";
 	$db->query($sql);$sql='';
-	$sql = "insert into ".MAIN_DB_PREFIX."const (name,value,visible) VALUES
+	$sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,value,visible) VALUES
 	('LDAP_SERVER_TYPE','".$_POST["type"]."',0);";
   $db->query($sql);
 
diff --git a/htdocs/admin/webcalendar.php b/htdocs/admin/webcalendar.php
index 72927be7e6e..4d1d039c800 100644
--- a/htdocs/admin/webcalendar.php
+++ b/htdocs/admin/webcalendar.php
@@ -57,34 +57,61 @@ if ($actionsave)
 {
     if (trim($phpwebcalendar_pass) == trim($phpwebcalendar_pass2))
     {
-            $sql = "delete from ".MAIN_DB_PREFIX."const where name = 'PHPWEBCALENDAR_URL';";
-						$db->query($sql);$sql='';
-						$sql = "insert into ".MAIN_DB_PREFIX."const (name,value,visible) VALUES
+            $sql = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = 'PHPWEBCALENDAR_URL';";
+						
+						$db->query($sql);
+						
+						$sql='';
+						
+						$sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,value,visible) VALUES
 						('PHPWEBCALENDAR_URL','".$phpwebcalendar_url."',0);"; 
-						//$sql  = "REPLACE INTO ".MAIN_DB_PREFIX."const SET name = 'PHPWEBCALENDAR_URL',value='".$phpwebcalendar_url."', visible=0";
 						
-						$sql1 = "delete from ".MAIN_DB_PREFIX."const where name = 'PHPWEBCALENDAR_HOST';";
-						$db->query($sql1);$sql1 = '';
-						$sql1 = "insert into ".MAIN_DB_PREFIX."const (name,value,visible) VALUES ('PHPWEBCALENDAR_HOST','".$phpwebcalendar_host."',0);"; 
-            //$sql1 = "REPLACE INTO ".MAIN_DB_PREFIX."const SET name = 'PHPWEBCALENDAR_HOST',value='".$phpwebcalendar_host."', visible=0";
+						$db->query($sql);
 						
-						$sql2 = "delete from ".MAIN_DB_PREFIX."const where name = 'PHPWEBCALENDAR_DBNAME';";
-						$db->query($sql2);$sql2='';
-						$sql2 = "insert into ".MAIN_DB_PREFIX."const (name,value,visible) VALUES
+						$sql='';
+						
+						$sql1 = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = 'PHPWEBCALENDAR_HOST';";
+						
+						$db->query($sql1);
+						
+						$sql1 = '';
+						
+						$sql1 = "INSERT INTO ".MAIN_DB_PREFIX."const (name,value,visible) VALUES ('PHPWEBCALENDAR_HOST','".$phpwebcalendar_host."',0);"; 
+
+						$db->query($sql1);
+												
+						$sql2 = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = 'PHPWEBCALENDAR_DBNAME';";
+						
+						$db->query($sql2);
+						
+						$sql2='';
+						
+						$sql2 = "INSERT INTO ".MAIN_DB_PREFIX."const (name,value,visible) VALUES
 						('PHPWEBCALENDAR_DBNAME','".$phpwebcalendar_dbname."',0);";
-            //$sql2 = "REPLACE INTO ".MAIN_DB_PREFIX."const SET name = 'PHPWEBCALENDAR_DBNAME', value='".$phpwebcalendar_dbname."', visible=0";
 						
-						$sql3 = "delete from ".MAIN_DB_PREFIX."const where name = 'PHPWEBCALENDAR_USER' ;";
-						$db->query($sql3);$sql3='';
-						$sql3 = "insert into ".MAIN_DB_PREFIX."const (name,value,visible) VALUES
+						$db->query($sql2);
+						
+						$sql2='';
+						
+						$sql3 = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = 'PHPWEBCALENDAR_USER' ;";
+						
+						$db->query($sql3);
+						
+						$sql3='';
+						
+						$sql3 = "INSERT INTO ".MAIN_DB_PREFIX."const (name,value,visible) VALUES
 						('PHPWEBCALENDAR_USER','".$phpwebcalendar_user."',0);";
-            //$sql3 = "REPLACE INTO ".MAIN_DB_PREFIX."const SET name = 'PHPWEBCALENDAR_USER',	value='".$phpwebcalendar_user."', visible=0";
 						
-						$sql4 = "delete from ".MAIN_DB_PREFIX."const where name = 'PHPWEBCALENDAR_PASS';";
-						$db->query($sql4);$sql4='';
-						$sql4 = "insert into ".MAIN_DB_PREFIX."const (name,value,visible) VALUES
+						$sql4 = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = 'PHPWEBCALENDAR_PASS';";
+						
+						$db->query($sql4);
+						
+						$sql4='';
+						
+						$sql4 = "INSERT INTO ".MAIN_DB_PREFIX."const (name,value,visible) VALUES
 						('PHPWEBCALENDAR_PASS','".$phpwebcalendar_pass."',0);";
-            //$sql4 = "REPLACE INTO ".MAIN_DB_PREFIX."const SET name = 'PHPWEBCALENDAR_PASS',	value='".$phpwebcalendar_pass."', visible=0";
+
+						$db->query($sql4);
 
             if ($db->query($sql) && $db->query($sql1) && $db->query($sql2) && $db->query($sql3) && $db->query($sql4))
             {