From f5e11103550facb8b2a75ca95d505dd9fab26ee3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 7 Sep 2011 18:08:08 +0000 Subject: [PATCH] New: Removed step0 in install process --- htdocs/install/etape0.php | 363 ------------------------------------ htdocs/install/etape1.php | 205 +++++++++++++++++--- htdocs/install/fileconf.php | 2 +- 3 files changed, 178 insertions(+), 392 deletions(-) delete mode 100644 htdocs/install/etape0.php diff --git a/htdocs/install/etape0.php b/htdocs/install/etape0.php deleted file mode 100644 index 593e99d4f5c..00000000000 --- a/htdocs/install/etape0.php +++ /dev/null @@ -1,363 +0,0 @@ - - * Copyright (C) 2007-2010 Laurent Destailleur - * Copyright (C) 2010-2011 Regis Houssin - * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/** - * \file htdocs/install/etape0.php - * \ingroup install - * \brief Show and ask charset for database - */ - -define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php - -include_once("./inc.php"); - -//print ">> ".$conf->db->character_set; -//print ">> ".$conf->db->dolibarr_main_db_collation; - - -$setuplang=isset($_POST["selectlang"])?$_POST["selectlang"]:(isset($_GET["selectlang"])?$_GET["selectlang"]:'auto'); -$langs->setDefaultLang($setuplang); - -$langs->load("admin"); -$langs->load("install"); -$langs->load("errors"); - -$error = 0; - -// Recuparation des information de connexion -$userroot=isset($_POST["db_user_root"])?$_POST["db_user_root"]:""; -$passroot=isset($_POST["db_pass_root"])?$_POST["db_pass_root"]:""; -// Repertoire 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. -$useforcedwizard=false; -if (file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); } -else if (file_exists("/etc/dolibarr/install.forced.php")) { $useforcedwizard=include_once("/etc/dolibarr/install.forced.php"); } - -dolibarr_install_syslog("--- etape0: Entering etape0.php page"); - - -/* - * View - */ - -pHeader($langs->trans("ConfigurationFile"),"etape1"); - -// Test if we can run a first install process -if (! is_writable($conffile)) -{ - print $langs->trans("ConfFileIsNotWritable",$conffiletoshow); - pFooter(1,$setuplang,'jscheckparam'); - exit; -} - -// On reporte champ formulaire precedent pour propagation -if ($_POST["action"] == "set") -{ - umask(0); - foreach($_POST as $cle=>$valeur) - { - echo ''; - if (! preg_match('/^db_pass/i',$cle)) dolibarr_install_syslog("Choice for ".$cle." = ".$valeur); - } -} - -// Check parameters -if (empty($_POST["db_type"])) -{ - print '
'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("DatabaseType")).'
'; - $error++; -} -if (empty($_POST["db_host"])) -{ - print '
'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Server")).'
'; - $error++; -} -if (empty($_POST["db_name"])) -{ - print '
'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("DatabaseName")).'
'; - $error++; -} -if (empty($_POST["db_user"])) -{ - print '
'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Login")).'
'; - $error++; -} -if (! empty($_POST["db_port"]) && ! is_numeric($_POST["db_port"])) -{ - print '
'.$langs->trans("ErrorBadValueForParameter",$_POST["db_port"],$langs->transnoentities("Port")).'
'; - $error++; -} - -/** - * Tentative de connexion a la base - */ -if (! $error) -{ - $result=@include_once($main_dir."/lib/databases/".$_POST["db_type"].".lib.php"); - if ($result) - { - // If we ask database or user creation we need to connect as root - if (! empty($_POST["db_create_database"]) && ! $userroot) - { - print '
'.$langs->trans("YouAskDatabaseCreationSoDolibarrNeedToConnect",$_POST["db_name"]).'
'; - print '
'; - if (empty($db->connected)) print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'

'; - print $langs->trans("ErrorGoBackAndCorrectParameters"); - $error++; - } - if (! empty($_POST["db_create_user"]) && ! $userroot) - { - print '
'.$langs->trans("YouAskLoginCreationSoDolibarrNeedToConnect",$_POST["db_user"]).'
'; - print '
'; - if (! $db->connected) print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'

'; - print $langs->trans("ErrorGoBackAndCorrectParameters"); - $error++; - } - - // If we need root access - if (! $error && (! empty($_POST["db_create_database"]) || ! empty($_POST["db_create_user"]))) - { - $databasefortest=$_POST["db_name"]; - if (! empty($_POST["db_create_database"])) - { - if ($_POST["db_type"] == 'mysql' || $_POST["db_type"] == 'mysqli') - { - $databasefortest='mysql'; - } - elseif ($_POST["db_type"] == 'pgsql') - { - $databasefortest='postgres'; - } - else - { - $databasefortest='mssql'; - } - } - //print $_POST["db_type"].",".$_POST["db_host"].",$userroot,$passroot,$databasefortest,".$_POST["db_port"]; - $db = new DoliDb($_POST["db_type"],$_POST["db_host"],$userroot,$passroot,$databasefortest,$_POST["db_port"]); - - dol_syslog("databasefortest=".$databasefortest." connected=".$db->connected." database_selected=".$db->database_selected, LOG_DEBUG); - //print "databasefortest=".$databasefortest." connected=".$db->connected." database_selected=".$db->database_selected; - - if (empty($_POST["db_create_database"]) && $db->connected && ! $db->database_selected) - { - print '
'.$langs->trans("ErrorConnectedButDatabaseNotFound",$_POST["db_name"]).'
'; - print '
'; - if (! $db->connected) print $langs->trans("IfDatabaseNotExistsGoBackAndUncheckCreate").'

'; - print $langs->trans("ErrorGoBackAndCorrectParameters"); - $error++; - } - elseif ($db->error && ! (! empty($_POST["db_create_database"]) && $db->connected)) - { - print '
'.$db->error.'
'; - if (! $db->connected) print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'

'; - print $langs->trans("ErrorGoBackAndCorrectParameters"); - $error++; - } - } - // If we need simple access - if (! $error && (empty($_POST["db_create_database"]) && empty($_POST["db_create_user"]))) - { - $db = new DoliDb($_POST["db_type"],$_POST["db_host"],$_POST["db_user"],$_POST["db_pass"],$_POST["db_name"],$_POST["db_port"]); - if ($db->error) - { - print '
'.$db->error.'
'; - if (! $db->connected) print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'

'; - print $langs->trans("ErrorGoBackAndCorrectParameters"); - $error++; - } - } - } - else - { - print "
\nFailed to include_once(\"".$main_dir."/lib/databases/".$_POST["db_type"].".lib.php\")
\n"; - print '
'.$langs->trans("ErrorWrongValueForParameter",$langs->transnoentities("WebPagesDirectory")).'
'; - print $langs->trans("ErrorGoBackAndCorrectParameters"); - $error++; - } -} - -else -{ - if (isset($db)) print $db->lasterror(); - if (isset($db) && ! $db->connected) print '
'.$langs->trans("BecauseConnectionFailedParametersMayBeWrong").'

'; - print $langs->trans("ErrorGoBackAndCorrectParameters"); - $error++; -} - -/* - * Si creation database demandee, il est possible de faire un choix - */ -$disabled=""; -if (! $error && ! empty($_POST["db_create_database"])) -{ - $disabled=""; -}else{ - $disabled="disabled"; -} - -if (! $error && $db->connected) -{ - if (! empty($_POST["db_create_database"])) - { - $result=$db->select_db($_POST["db_name"]); - if ($result) - { - print '
'.$langs->trans("ErrorDatabaseAlreadyExists",$_POST["db_name"]).'
'; - print $langs->trans("IfDatabaseExistsGoBackAndCheckCreate").'

'; - print $langs->trans("ErrorGoBackAndCorrectParameters"); - $error++; - } - } -} - -if (! $error && $db->connected) -{ - ?> - - - - - - - forcecharset; - $defaultCollationConnection=$db->forcecollate; - } - else // If already created, we take current value - { - $defaultCharacterSet=$db->getDefaultCharacterSetDatabase(); - $defaultCollationConnection=$db->getDefaultCollationDatabase(); - } - - $listOfCharacterSet=$db->getListOfCharacterSet(); - $listOfCollation=$db->getListOfCollation(); - - // Choice of dolibarr_main_db_character_set - ?> - - - - - - - - - - - - - - -
-

trans("CharsetChoice");?>

-
trans("CharacterSetDatabase"); ?>'; - $selected=""; - foreach ($listOfCharacterSet as $characterSet) - { - $linedisabled=false; - - // We keep only utf8 - //if (($_POST["db_type"] == 'mysql' ||$_POST["db_type"] == 'mysqli') && ! preg_match('/(utf8|latin1)/i',$characterSet['charset'])) $linedisabled=true; - if (($_POST["db_type"] == 'mysql' ||$_POST["db_type"] == 'mysqli') && ! preg_match('/utf8$/i',$characterSet['charset'])) $linedisabled=true; - - if ($defaultCharacterSet == $characterSet['charset'] ) - { - $selected="selected"; - } - else - { - $selected=""; - } - if (! $linedisabled) $nbofchoice++; - print ''; - } - print ''; - if ($disabled=="disabled") - { - print ''; - } - } - else - { - print ''; - } - if ($nbofchoice > 1) { - ?> -
1) echo $langs->trans("CharacterSetDatabaseComment"); ?>
-
trans("CollationConnection"); ?>'; - $selected=""; - foreach ($listOfCollation as $collation) - { - $linedisabled=false; - - // We keep only utf8 and iso - //if (($_POST["db_type"] == 'mysql' ||$_POST["db_type"] == 'mysqli') && ! preg_match('/(utf8_general|latin1_swedish)/i',$collation['collation'])) $linedisabled=true; - if (($_POST["db_type"] == 'mysql' ||$_POST["db_type"] == 'mysqli') && ! preg_match('/utf8_general/i',$collation['collation'])) $linedisabled=true; - - if ($defaultCollationConnection == $collation['collation']) - { - $selected="selected"; - } - else - { - $selected=""; - } - if (! $linedisabled) $nbofchoice++; - print ''; - } - print ''; - if ($disabled=="disabled"){ - print ''; - } - } - else - { - print ''; - } - if ($nbofchoice > 1) { - ?> -
1) echo $langs->trans("CollationConnectionComment"); ?>
-
- \ No newline at end of file diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php index 51941d88a6c..3b839d817e3 100644 --- a/htdocs/install/etape1.php +++ b/htdocs/install/etape1.php @@ -36,6 +36,12 @@ $langs->setDefaultLang($setuplang); $langs->load("admin"); $langs->load("install"); +// Recuparation des information de connexion +$userroot=isset($_POST["db_user_root"])?$_POST["db_user_root"]:""; +$passroot=isset($_POST["db_pass_root"])?$_POST["db_pass_root"]:""; +// Repertoire 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. $useforcedwizard=false; if (file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); } @@ -43,11 +49,14 @@ else if (file_exists("/etc/dolibarr/install.forced.php")) { $useforcedwizard=inc dolibarr_install_syslog("--- etape1: Entering etape1.php page"); +$error = 0; + /* * View */ + pHeader($langs->trans("ConfigurationFile"),"etape2"); // Test if we can run a first install process @@ -58,10 +67,34 @@ if (! is_writable($conffile)) exit; } -$error = 0; -// Repertoire des pages dolibarr -$main_dir=isset($_POST["main_dir"])?trim($_POST["main_dir"]):''; +// Check parameters +if (empty($_POST["db_type"])) +{ + print '
'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("DatabaseType")).'
'; + $error++; +} +if (empty($_POST["db_host"])) +{ + print '
'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Server")).'
'; + $error++; +} +if (empty($_POST["db_name"])) +{ + print '
'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("DatabaseName")).'
'; + $error++; +} +if (empty($_POST["db_user"])) +{ + print '
'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Login")).'
'; + $error++; +} +if (! empty($_POST["db_port"]) && ! is_numeric($_POST["db_port"])) +{ + print '
'.$langs->trans("ErrorBadValueForParameter",$_POST["db_port"],$langs->transnoentities("Port")).'
'; + $error++; +} + // Remove last / into dans main_dir if (substr($main_dir, dol_strlen($main_dir) -1) == "/") @@ -80,7 +113,139 @@ $main_data_dir=isset($_POST["main_data_dir"])?$_POST["main_data_dir"]:''; if (! $main_data_dir) { $main_data_dir="$main_dir/documents"; } -if ($action == "set") +// Test database connexion +if (! $error) +{ + $result=@include_once($main_dir."/lib/databases/".$_POST["db_type"].".lib.php"); + if ($result) + { + // If we ask database or user creation we need to connect as root + if (! empty($_POST["db_create_database"]) && ! $userroot) + { + print '
'.$langs->trans("YouAskDatabaseCreationSoDolibarrNeedToConnect",$_POST["db_name"]).'
'; + print '
'; + if (empty($db->connected)) print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'

'; + print $langs->trans("ErrorGoBackAndCorrectParameters"); + $error++; + } + if (! empty($_POST["db_create_user"]) && ! $userroot) + { + print '
'.$langs->trans("YouAskLoginCreationSoDolibarrNeedToConnect",$_POST["db_user"]).'
'; + print '
'; + if (! $db->connected) print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'

'; + print $langs->trans("ErrorGoBackAndCorrectParameters"); + $error++; + } + + // If we need root access + if (! $error && (! empty($_POST["db_create_database"]) || ! empty($_POST["db_create_user"]))) + { + $databasefortest=$_POST["db_name"]; + if (! empty($_POST["db_create_database"])) + { + if ($_POST["db_type"] == 'mysql' || $_POST["db_type"] == 'mysqli') + { + $databasefortest='mysql'; + } + elseif ($_POST["db_type"] == 'pgsql') + { + $databasefortest='postgres'; + } + else + { + $databasefortest='mssql'; + } + } + //print $_POST["db_type"].",".$_POST["db_host"].",$userroot,$passroot,$databasefortest,".$_POST["db_port"]; + $db = new DoliDb($_POST["db_type"],$_POST["db_host"],$userroot,$passroot,$databasefortest,$_POST["db_port"]); + + dol_syslog("databasefortest=".$databasefortest." connected=".$db->connected." database_selected=".$db->database_selected, LOG_DEBUG); + //print "databasefortest=".$databasefortest." connected=".$db->connected." database_selected=".$db->database_selected; + + if (empty($_POST["db_create_database"]) && $db->connected && ! $db->database_selected) + { + print '
'.$langs->trans("ErrorConnectedButDatabaseNotFound",$_POST["db_name"]).'
'; + print '
'; + if (! $db->connected) print $langs->trans("IfDatabaseNotExistsGoBackAndUncheckCreate").'

'; + print $langs->trans("ErrorGoBackAndCorrectParameters"); + $error++; + } + elseif ($db->error && ! (! empty($_POST["db_create_database"]) && $db->connected)) + { + print '
'.$db->error.'
'; + if (! $db->connected) print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'

'; + print $langs->trans("ErrorGoBackAndCorrectParameters"); + $error++; + } + } + // If we need simple access + if (! $error && (empty($_POST["db_create_database"]) && empty($_POST["db_create_user"]))) + { + $db = new DoliDb($_POST["db_type"],$_POST["db_host"],$_POST["db_user"],$_POST["db_pass"],$_POST["db_name"],$_POST["db_port"]); + if ($db->error) + { + print '
'.$db->error.'
'; + if (! $db->connected) print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'

'; + print $langs->trans("ErrorGoBackAndCorrectParameters"); + $error++; + } + } + } + else + { + print "
\nFailed to include_once(\"".$main_dir."/lib/databases/".$_POST["db_type"].".lib.php\")
\n"; + print '
'.$langs->trans("ErrorWrongValueForParameter",$langs->transnoentities("WebPagesDirectory")).'
'; + print $langs->trans("ErrorGoBackAndCorrectParameters"); + $error++; + } +} + +else +{ + if (isset($db)) print $db->lasterror(); + if (isset($db) && ! $db->connected) print '
'.$langs->trans("BecauseConnectionFailedParametersMayBeWrong").'

'; + print $langs->trans("ErrorGoBackAndCorrectParameters"); + $error++; +} + +if (! $error && $db->connected) +{ + if (! empty($_POST["db_create_database"])) + { + $result=$db->select_db($_POST["db_name"]); + if ($result) + { + print '
'.$langs->trans("ErrorDatabaseAlreadyExists",$_POST["db_name"]).'
'; + print $langs->trans("IfDatabaseExistsGoBackAndCheckCreate").'

'; + print $langs->trans("ErrorGoBackAndCorrectParameters"); + $error++; + } + } +} + +// Define $defaultCharacterSet and $defaultCollationConnection +if (! $error && $db->connected) +{ + if (! empty($_POST["db_create_database"])) // If we create database, we force default value + { + $defaultCharacterSet=$db->forcecharset; + $defaultCollationConnection=$db->forcecollate; + } + else // If already created, we take current value + { + $defaultCharacterSet=$db->getDefaultCharacterSetDatabase(); + $defaultCollationConnection=$db->getDefaultCollationDatabase(); + } + + print ''; + print ''; + $_POST['dolibarr_main_db_character_set']=$defaultCharacterSet; + $_POST['dolibarr_main_db_collation']=$defaultCollationConnection; +} + + +// Create config file +if (! $error && $db->connected && $action == "set") { umask(0); foreach($_POST as $cle=>$valeur) @@ -110,7 +275,7 @@ if ($action == "set") } } - // Chargement driver acces bases + // Load database driver if (! $error) { dolibarr_install_syslog("etape1: Directory '".$main_dir."' exists"); @@ -119,17 +284,13 @@ if ($action == "set") } - /*************************************************************************** - * Create directories - ***************************************************************************/ - // Create subdirectory main_data_dir if (! $error) { // Create directory for documents if (! is_dir($main_data_dir)) { - create_exdir($main_data_dir); + dol_mkdir($main_data_dir); } if (! is_dir($main_data_dir)) @@ -214,9 +375,7 @@ if ($action == "set") // Alternative root directory name $main_alt_dir_name = ( (GETPOST("main_alt_dir_name") && GETPOST("main_alt_dir_name") != '') ? GETPOST("main_alt_dir_name") : 'custom'); - /** - * Write conf file on disk - */ + // Write conf file on disk if (! $error) { // Save old conf file on disk @@ -231,15 +390,11 @@ if ($action == "set") $error+=write_conf_file($conffile); } - /** - * Write main.inc.php and master.inc.php into documents/custom dir - */ + // Write main.inc.php and master.inc.php into documents/custom dir $error+=write_main_file($main_data_dir.'/custom/main.inc.php',$main_dir); $error+=write_master_file($main_data_dir.'/custom/master.inc.php',$main_dir); - /** - * Create database and admin user database - */ + // Create database and admin user database if (! $error) { // We reload configuration file @@ -255,9 +410,7 @@ if ($action == "set") $passroot=isset($_POST["db_pass_root"])?$_POST["db_pass_root"]:""; - /** - * Si creation utilisateur admin demandee, on le cree - */ + // Si creation utilisateur admin demandee, on le cree if (isset($_POST["db_create_user"]) && $_POST["db_create_user"] == "on") { dolibarr_install_syslog("etape1: Create database user: ".$dolibarr_main_db_user); @@ -349,9 +502,7 @@ if ($action == "set") } // Fin si "creation utilisateur" - /* - * If database creation is asked, we create it - */ + // If database creation is asked, we create it if (! $error && (isset($_POST["db_create_database"]) && $_POST["db_create_database"] == "on")) { dolibarr_install_syslog("etape1: Create database : ".$dolibarr_main_db_name, LOG_DEBUG); @@ -412,9 +563,7 @@ if ($action == "set") } // Fin si "creation database" - /* - * We testOn test maintenant l'acces par le user base dolibarr - */ + // We testOn test maintenant l'acces par le user base dolibarr if (! $error) { dolibarr_install_syslog("etape1: connexion de type=".$conf->db->type." sur host=".$conf->db->host." port=".$conf->db->port." user=".$conf->db->user." name=".$conf->db->name, LOG_DEBUG); diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php index 88c95a01d7b..fbeb2f77363 100644 --- a/htdocs/install/fileconf.php +++ b/htdocs/install/fileconf.php @@ -64,7 +64,7 @@ dolibarr_install_syslog("Fileconf: Entering fileconf.php page"); * View */ -pHeader($langs->trans("ConfigurationFile"),"etape0"); +pHeader($langs->trans("ConfigurationFile"),"etape1"); // Test if we can run a first install process if (! is_writable($conffile))