Skip to content
Snippets Groups Projects
Commit 1c7b3933 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

New: Minor change to allow a new windows .exe setup wizard

parent a0d4bf48
Branches
Tags
No related merge requests found
...@@ -69,7 +69,7 @@ if ($db->ok == 1) ...@@ -69,7 +69,7 @@ if ($db->ok == 1)
{ {
print '<tr><td>'.$langs->trans("DolibarrAdminLogin").' :</td><td>'; print '<tr><td>'.$langs->trans("DolibarrAdminLogin").' :</td><td>';
print '<input name="login" value="'.$force_install_dolibarrlogin.'"></td></tr>'; print '<input name="login" value="'.(! empty($_GET["login"])?$_GET["login"]:$force_install_dolibarrlogin).'"></td></tr>';
print '<tr><td>'.$langs->trans("Password").' :</td><td>'; print '<tr><td>'.$langs->trans("Password").' :</td><td>';
print '<input type="password" name="pass"></td></tr>'; print '<input type="password" name="pass"></td></tr>';
print '<tr><td>'.$langs->trans("PasswordAgain").' :</td><td>'; print '<tr><td>'.$langs->trans("PasswordAgain").' :</td><td>';
......
<?php <?php
/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be> * Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
* Copyright (C) 2004 Sebastien DiCintio <sdicintio@ressource-toi.org> * Copyright (C) 2004 Sebastien DiCintio <sdicintio@ressource-toi.org>
* *
...@@ -17,14 +17,12 @@ ...@@ -17,14 +17,12 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
*/ */
/** /**
\file htdocs/install/etape5.php \file htdocs/install/etape5.php
\brief Page de fin d'installation ou de migration \brief Page de fin d'installation ou de migration
\version $Revision$ \version $Id$
*/ */
include_once("./inc.php"); include_once("./inc.php");
...@@ -48,19 +46,19 @@ if ($_POST["action"] == "set" || $_POST["action"] == "upgrade") ...@@ -48,19 +46,19 @@ if ($_POST["action"] == "set" || $_POST["action"] == "upgrade")
{ {
if ($_POST["pass"] <> $_POST["pass_verif"]) if ($_POST["pass"] <> $_POST["pass_verif"])
{ {
Header("Location: etape4.php?error=1&selectlang=$setuplang"); Header("Location: etape4.php?error=1&selectlang=$setuplang".(isset($_POST["login"])?'&login='.$_POST["login"]:''));
exit; exit;
} }
if (strlen(trim($_POST["pass"])) == 0) if (strlen(trim($_POST["pass"])) == 0)
{ {
Header("Location: etape4.php?error=2&selectlang=$setuplang"); Header("Location: etape4.php?error=2&selectlang=$setuplang".(isset($_POST["login"])?'&login='.$_POST["login"]:''));
exit; exit;
} }
if (strlen(trim($_POST["login"])) == 0) if (strlen(trim($_POST["login"])) == 0)
{ {
Header("Location: etape4.php?error=3&selectlang=$setuplang"); Header("Location: etape4.php?error=3&selectlang=$setuplang".(isset($_POST["login"])?'&login='.$_POST["login"]:''));
exit; exit;
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment