This commit is contained in:
Laurent Destailleur 2008-04-21 07:21:13 +00:00
parent d61ff6d218
commit 4b33d2d038
8 changed files with 56 additions and 16 deletions

View File

@ -36,15 +36,17 @@ $langs->setDefaultLang($setuplang);
$langs->load("install"); $langs->load("install");
dolibarr_install_syslog("check: Dolibarr install/upgrade process started");
// Init "forced values" to nothing. "forced values" are used after an doliwamp install wizard. // Init "forced values" to nothing. "forced values" are used after an doliwamp install wizard.
if (! isset($force_install_dolibarrlogin)) $force_install_dolibarrlogin=''; if (! isset($force_install_dolibarrlogin)) $force_install_dolibarrlogin='';
if (file_exists("./install.forced.php")) include_once("./install.forced.php"); if (file_exists("./install.forced.php")) include_once("./install.forced.php");
dolibarr_install_syslog("check: Dolibarr install/upgrade process started");
/*
* View
*/
pHeader($langs->trans("DolibarrWelcome"),""); // Etape suivante = license pHeader($langs->trans("DolibarrWelcome"),""); // Etape suivante = license
print '<center><img src="../theme/dolibarr_logo_2.png" alt="Dolibarr logo"></center><br>'; print '<center><img src="../theme/dolibarr_logo_2.png" alt="Dolibarr logo"></center><br>';

View File

@ -19,6 +19,7 @@
/** /**
\file htdocs/install/etape0.php \file htdocs/install/etape0.php
\ingroup install
\brief Permet d'afficher et de confirmer le charset par rapport aux informations précédentes -> sélection suite à connexion' \brief Permet d'afficher et de confirmer le charset par rapport aux informations précédentes -> sélection suite à connexion'
\version $Id$ \version $Id$
*/ */
@ -36,17 +37,20 @@ $langs->load("errors");
$error = 0; $error = 0;
/** // Récuparation des information de connexion
* Récuparation des information de connexion
*/
$userroot=isset($_POST["db_user_root"])?$_POST["db_user_root"]:""; $userroot=isset($_POST["db_user_root"])?$_POST["db_user_root"]:"";
$passroot=isset($_POST["db_pass_root"])?$_POST["db_pass_root"]:""; $passroot=isset($_POST["db_pass_root"])?$_POST["db_pass_root"]:"";
// Répertoire des pages dolibarr // Répertoire des pages dolibarr
$main_dir=isset($_POST["main_dir"])?trim($_POST["main_dir"]):''; $main_dir=isset($_POST["main_dir"])?trim($_POST["main_dir"]):'';
// Init "forced values" to nothing. "forced values" are used after an doliwamp install wizard.
if (file_exists("./install.forced.php")) include_once("./install.forced.php");
dolibarr_install_syslog("etape0: Entering etape0.php page");
/* /*
* Affichage page * View
*/ */
pHeader($langs->trans("ConfigurationFile"),"etape1"); pHeader($langs->trans("ConfigurationFile"),"etape1");

View File

@ -21,6 +21,7 @@
/** /**
\file htdocs/install/etape1.php \file htdocs/install/etape1.php
\ingroup install
\brief Génère le fichier conf.php avec les informations issues de l'étape précédente \brief Génère le fichier conf.php avec les informations issues de l'étape précédente
\version $Id$ \version $Id$
*/ */
@ -34,9 +35,16 @@ $langs->setDefaultLang($setuplang);
$langs->load("admin"); $langs->load("admin");
$langs->load("install"); $langs->load("install");
// Init "forced values" to nothing. "forced values" are used after an doliwamp install wizard.
if (file_exists("./install.forced.php")) include_once("./install.forced.php");
dolibarr_install_syslog("etape1: Entering etape1.php page"); dolibarr_install_syslog("etape1: Entering etape1.php page");
/*
* View
*/
pHeader($langs->trans("ConfigurationFile"),"etape2"); pHeader($langs->trans("ConfigurationFile"),"etape2");
$error = 0; $error = 0;

View File

@ -19,6 +19,7 @@
/** /**
\file htdocs/install/etape2.php \file htdocs/install/etape2.php
\ingroup install
\brief Cree les tables, cles primaires, cles etrangeres, index et fonctions en base puis charge les donnees de reference \brief Cree les tables, cles primaires, cles etrangeres, index et fonctions en base puis charge les donnees de reference
\version $Id$ \version $Id$
*/ */
@ -50,9 +51,16 @@ if ($dolibarr_main_db_type == "mysqli") $choix=1;
if ($dolibarr_main_db_type == "pgsql") $choix=2; if ($dolibarr_main_db_type == "pgsql") $choix=2;
if ($dolibarr_main_db_type == "mssql") $choix=3; if ($dolibarr_main_db_type == "mssql") $choix=3;
// Init "forced values" to nothing. "forced values" are used after an doliwamp install wizard.
if (file_exists("./install.forced.php")) include_once("./install.forced.php");
dolibarr_install_syslog("etape2: Entering etape2.php page"); dolibarr_install_syslog("etape2: Entering etape2.php page");
/*
* View
*/
pHeader($langs->trans("CreateDatabaseObjects"),"etape4"); pHeader($langs->trans("CreateDatabaseObjects"),"etape4");

View File

@ -38,15 +38,17 @@ $langs->setDefaultLang($setuplang);
$langs->load("admin"); $langs->load("admin");
$langs->load("install"); $langs->load("install");
dolibarr_install_syslog("etape4: Entering etape4.php page");
// Init "forced values" to nothing. "forced values" are used after an doliwamp install wizard. // Init "forced values" to nothing. "forced values" are used after an doliwamp install wizard.
if (! isset($force_install_dolibarrlogin)) $force_install_dolibarrlogin=''; if (! isset($force_install_dolibarrlogin)) $force_install_dolibarrlogin='';
if (file_exists("./install.forced.php")) include_once("./install.forced.php"); if (file_exists("./install.forced.php")) include_once("./install.forced.php");
dolibarr_install_syslog("etape4: Entering etape4.php page");
/*
* View
*/
pHeader($langs->trans("AdminAccountCreation"),"etape5"); pHeader($langs->trans("AdminAccountCreation"),"etape5");

View File

@ -21,6 +21,7 @@
/** /**
\file htdocs/install/etape5.php \file htdocs/install/etape5.php
\ingroup install
\brief Page de fin d'installation ou de migration \brief Page de fin d'installation ou de migration
\version $Id$ \version $Id$
*/ */
@ -48,11 +49,13 @@ if (! isset($force_install_databaserootpass)) $force_install_databaserootpass='
if (! isset($force_install_renamedir)) $force_install_renamedir=''; if (! isset($force_install_renamedir)) $force_install_renamedir='';
if (file_exists("./install.forced.php")) include_once("./install.forced.php"); if (file_exists("./install.forced.php")) include_once("./install.forced.php");
dolibarr_install_syslog("etape5: Entering etape5.php page", LOG_INFO); dolibarr_install_syslog("etape5: Entering etape5.php page", LOG_INFO);
/*
* Actions
*/
// If install, check pass and pass_verif used to create admin account // If install, check pass and pass_verif used to create admin account
if ($_POST["action"] == "set") if ($_POST["action"] == "set")
{ {

View File

@ -47,6 +47,12 @@ if (! isset($force_install_databaserootlogin)) $force_install_databaserootlogin=
if (! isset($force_install_databaserootpass)) $force_install_databaserootpass=''; if (! isset($force_install_databaserootpass)) $force_install_databaserootpass='';
if (file_exists("./install.forced.php")) include_once("./install.forced.php"); if (file_exists("./install.forced.php")) include_once("./install.forced.php");
dolibarr_install_syslog("Fileconf: Entering fileconf.php page");
/*
* View
*/
pHeader($langs->trans("ConfigurationFile"),"etape0"); pHeader($langs->trans("ConfigurationFile"),"etape0");

View File

@ -31,9 +31,16 @@ $langs->setDefaultLang($setuplang);
$langs->load("install"); $langs->load("install");
// Init "forced values" to nothing. "forced values" are used after an doliwamp install wizard.
if (file_exists("./install.forced.php")) include_once("./install.forced.php");
dolibarr_install_syslog("Licence: Entering licence.php page"); dolibarr_install_syslog("Licence: Entering licence.php page");
/*
* View
*/
pHeader($langs->trans("License"),"fileconf"); pHeader($langs->trans("License"),"fileconf");
//print '<pre style="align: center; font-size: 12px">'; //print '<pre style="align: center; font-size: 12px">';