From 4b33d2d038d9a6b490231edf17f28c1df0c54f40 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 21 Apr 2008 07:21:13 +0000 Subject: [PATCH] Doxygen --- htdocs/install/check.php | 8 +++++--- htdocs/install/etape0.php | 20 ++++++++++++-------- htdocs/install/etape1.php | 8 ++++++++ htdocs/install/etape2.php | 8 ++++++++ htdocs/install/etape4.php | 8 +++++--- htdocs/install/etape5.php | 7 +++++-- htdocs/install/fileconf.php | 6 ++++++ htdocs/install/licence.php | 7 +++++++ 8 files changed, 56 insertions(+), 16 deletions(-) diff --git a/htdocs/install/check.php b/htdocs/install/check.php index c3a462f2cd3..2c15104384c 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -36,15 +36,17 @@ $langs->setDefaultLang($setuplang); $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. if (! isset($force_install_dolibarrlogin)) $force_install_dolibarrlogin=''; 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 print '
Dolibarr logo

'; diff --git a/htdocs/install/etape0.php b/htdocs/install/etape0.php index adf3b58a22f..da82247805e 100644 --- a/htdocs/install/etape0.php +++ b/htdocs/install/etape0.php @@ -18,9 +18,10 @@ */ /** - \file htdocs/install/etape0.php - \brief Permet d'afficher et de confirmer le charset par rapport aux informations précédentes -> sélection suite à connexion' - \version $Id$ + \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' + \version $Id$ */ define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php @@ -36,18 +37,21 @@ $langs->load("errors"); $error = 0; -/** - * Récuparation des information de connexion - */ +// Récuparation des information de connexion $userroot=isset($_POST["db_user_root"])?$_POST["db_user_root"]:""; $passroot=isset($_POST["db_pass_root"])?$_POST["db_pass_root"]:""; // Répertoire des pages dolibarr $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"); diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php index 5705269695b..8ee85866196 100644 --- a/htdocs/install/etape1.php +++ b/htdocs/install/etape1.php @@ -21,6 +21,7 @@ /** \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 \version $Id$ */ @@ -34,9 +35,16 @@ $langs->setDefaultLang($setuplang); $langs->load("admin"); $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"); +/* +* View +*/ + pHeader($langs->trans("ConfigurationFile"),"etape2"); $error = 0; diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php index ab0901525cd..b7e111a7e6f 100644 --- a/htdocs/install/etape2.php +++ b/htdocs/install/etape2.php @@ -19,6 +19,7 @@ /** \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 \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 == "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"); +/* +* View +*/ + pHeader($langs->trans("CreateDatabaseObjects"),"etape4"); diff --git a/htdocs/install/etape4.php b/htdocs/install/etape4.php index 43207912ef0..d6a22f3d1db 100644 --- a/htdocs/install/etape4.php +++ b/htdocs/install/etape4.php @@ -38,15 +38,17 @@ $langs->setDefaultLang($setuplang); $langs->load("admin"); $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. if (! isset($force_install_dolibarrlogin)) $force_install_dolibarrlogin=''; 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"); diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php index 97bbe1c0295..116b6d085be 100644 --- a/htdocs/install/etape5.php +++ b/htdocs/install/etape5.php @@ -21,6 +21,7 @@ /** \file htdocs/install/etape5.php + \ingroup install \brief Page de fin d'installation ou de migration \version $Id$ */ @@ -48,11 +49,13 @@ if (! isset($force_install_databaserootpass)) $force_install_databaserootpass=' if (! isset($force_install_renamedir)) $force_install_renamedir=''; if (file_exists("./install.forced.php")) include_once("./install.forced.php"); - - dolibarr_install_syslog("etape5: Entering etape5.php page", LOG_INFO); +/* +* Actions +*/ + // If install, check pass and pass_verif used to create admin account if ($_POST["action"] == "set") { diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php index 17049f77eb3..145437ae041 100644 --- a/htdocs/install/fileconf.php +++ b/htdocs/install/fileconf.php @@ -47,6 +47,12 @@ if (! isset($force_install_databaserootlogin)) $force_install_databaserootlogin= if (! isset($force_install_databaserootpass)) $force_install_databaserootpass=''; 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"); diff --git a/htdocs/install/licence.php b/htdocs/install/licence.php index 1b0ccbc9d49..0528e15efff 100644 --- a/htdocs/install/licence.php +++ b/htdocs/install/licence.php @@ -31,9 +31,16 @@ $langs->setDefaultLang($setuplang); $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"); +/* +* View +*/ + pHeader($langs->trans("License"),"fileconf"); //print '
';