From 2d6ca716b09506825d3676015e4404c4b5b7da3a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 25 Jun 2005 22:18:06 +0000
Subject: [PATCH] Fix: Quelques defauts mineurs dans gestion erreur de
 l'install

---
 htdocs/install/etape2.php | 17 +----------------
 htdocs/install/etape5.php | 19 ++++++++++++++-----
 2 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php
index 1adeefca344..342522a281e 100644
--- a/htdocs/install/etape2.php
+++ b/htdocs/install/etape2.php
@@ -432,27 +432,12 @@ if ($_POST["action"] == "set")
             }
         }
 
-        if ($result == sizeof($sql))
-        {
-            if ($error == 0)
-            {
-                $db->query("DELETE FROM llx_const WHERE name='MAIN_NOT_INSTALLED'");
-            }
-        }
     }
 
-
-    /***************************************************************************************
-    *
-    *
-    *
-    *
-    ***************************************************************************************/
-
-
     print '</table>';
 
     $db->close();
 }
+
 pFooter(!$ok);
 ?>
diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php
index 2a194b56726..bf978d9a502 100644
--- a/htdocs/install/etape5.php
+++ b/htdocs/install/etape5.php
@@ -95,7 +95,6 @@ if ($_POST["action"] == "set")
 
     if ($resql)
     {
-        $db->query("DELETE FROM llx_const WHERE name='MAIN_NOT_INSTALLED'");
         print $langs->trans("AdminLoginCreatedSuccessfuly")."<br>";
         $success = 1;
     }
@@ -104,17 +103,27 @@ if ($_POST["action"] == "set")
         if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
         {
             print $langs->trans("AdminLoginAlreadyExists",$_POST["login"])."<br>";
+            $success = 1;
         }
         else {
             print $langs->trans("FailedToCreateAdminLogin")."<br>";
         }
     }
 
-    // Si install non Français, on configure pour fonctionner en mode internationnal
-    if ($langs->defaultlang != "fr_FR") {
-        $db->query("INSERT INTO llx_const(name,value,type,visible) values ('COMPANY_CREATE_TWO_STEPS','1','yesno',0)");
-    }
+    if ($success)
+    {
+        $db->query("DELETE FROM llx_const WHERE name='MAIN_NOT_INSTALLED'");
+    
+        // Si install non Français, on configure pour fonctionner en mode internationnal
+        if ($langs->defaultlang != "fr_FR") {
 
+            $db->query("INSERT INTO llx_const(name,value,type,visible) values ('COMPANY_CREATE_TWO_STEPS','1','yesno',0)");
+
+            $db->query("UPDATE llx_const set value='eldy.php' WHERE name='MAIN_MENU_BARRETOP';");
+            $db->query("UPDATE llx_const set value='eldy.php' WHERE name='MAIN_MENU_BARRELEFT';");
+        }
+    }
+        
     print '</table>';
 
     $db->close();