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

This commit is contained in:
Laurent Destailleur 2008-03-12 22:17:54 +00:00
parent 2162f1b84c
commit a0d4bf486f
2 changed files with 4 additions and 3 deletions

View File

@ -2,7 +2,7 @@
/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
* Copyright (C) 2004 Sebastien DiCintio <sdicintio@ressource-toi.org>
* Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net>
*
* 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
@ -21,6 +21,7 @@
/**
\file htdocs/install/etape4.php
\ingroup install
\brief Demande le login et mot de passe de l'administrateur Dolibarr
\version $Id$
*/
@ -42,7 +43,7 @@ dolibarr_install_syslog("etape4: Entering etape4.php page");
// Init "forced values" to nothing. "forced values" are used after an doliwamp install wizard.
if (! isset($force_install_dolibarrlogin)) $force_install_dolibarrlogin='';
if (file_exists("../conf/conf.forced.php")) include_once("../conf/conf.forced.php");
if (file_exists("./install.forced.php")) include_once("./install.forced.php");

View File

@ -45,7 +45,7 @@ if (! isset($force_install_databaselogin)) $force_install_databaselogin='';
if (! isset($force_install_databasepass)) $force_install_databasepass='';
if (! isset($force_install_databaserootlogin)) $force_install_databaserootlogin='';
if (! isset($force_install_databaserootpass)) $force_install_databaserootpass='';
if (file_exists("../conf/conf.forced.php")) include_once("../conf/conf.forced.php");
if (file_exists("./install.forced.php")) include_once("./install.forced.php");
pHeader($langs->trans("ConfigurationFile"),"etape0");