More help on install process

This commit is contained in:
Laurent Destailleur 2010-02-02 18:07:43 +00:00
parent b4cdfcf4a8
commit cb61c1cc1e
3 changed files with 35 additions and 18 deletions

View File

@ -42,8 +42,8 @@ dolibarr_install_syslog("etape1: Entering etape1.php page");
/*
* View
*/
* View
*/
pHeader($langs->trans("ConfigurationFile"),"etape2");
@ -68,10 +68,10 @@ if (substr($_POST["main_url"], strlen($_POST["main_url"]) -1) == "/")
$main_data_dir=isset($_POST["main_data_dir"])?$_POST["main_data_dir"]:'';
if (! $main_data_dir) { $main_data_dir="$main_dir/documents"; }
/*
* Actions
*/
/*
* Actions
*/
if ($_POST["action"] == "set")
@ -114,8 +114,8 @@ if ($_POST["action"] == "set")
/***************************************************************************
* Create directories
***************************************************************************/
* Create directories
***************************************************************************/
// Create subdirectory main_data_dir
if (! $error)
@ -133,7 +133,7 @@ if ($_POST["action"] == "set")
print '</td><td>';
print '<font class="error">'.$langs->trans("Error").'</font>';
print "</td></tr>";
print '<tr><td colspan="2"><br>'.$langs->trans("CorrectProblemAndReloadPage",$_SERVER['PHP_SELF'].'?testget=ok').'</td></tr>';
print '<tr><td colspan="2"><br>'.$langs->trans("CorrectProblemAndReloadPage",$_SERVER['PHP_SELF'].'?testget=ok').'</td></tr>';
$error++;
}
else
@ -196,7 +196,7 @@ if ($_POST["action"] == "set")
print '</td><td>';
print '<font class="error">'.$langs->trans("Error").'</font>';
print "</td></tr>";
print '<tr><td colspan="2"><br>'.$langs->trans("CorrectProblemAndReloadPage",$_SERVER['PHP_SELF'].'?testget=ok').'</td></tr>';
print '<tr><td colspan="2"><br>'.$langs->trans("CorrectProblemAndReloadPage",$_SERVER['PHP_SELF'].'?testget=ok').'</td></tr>';
}
}
}
@ -208,8 +208,8 @@ if ($_POST["action"] == "set")
}
/**
* Create database and admin user database
*/
* Create database and admin user database
*/
if (! $error)
{
conf($dolibarr_main_document_root);
@ -219,8 +219,8 @@ if ($_POST["action"] == "set")
/**
* 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);
@ -312,8 +312,8 @@ if ($_POST["action"] == "set")
/*
* 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);
@ -378,8 +378,8 @@ if ($_POST["action"] == "set")
/*
* On test maintenant l'acces par le user admin dolibarr
*/
* On test maintenant l'acces par le user admin 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);
@ -463,7 +463,22 @@ if ($_POST["action"] == "set")
print '</table>';
}
pFooter($error,$setuplang);
?>
<script type="text/javascript" language="javascript">
function jsinfo()
{
ok=true;
alert('<?php echo dol_escape_js($langs->transnoentities("NextStepMightLastALongTime")); ?>');
return ok;
}
</script>
<?php
pFooter($error,$setuplang,'jsinfo');
/**

View File

@ -139,6 +139,7 @@ IfAlreadyExistsCheckOption=If this name is correct and that database does not ex
OpenBaseDir=PHP openbasedir parameter
YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide login/password of superuser (bottom of form).
YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide login/password of superuser (bottom of form).
NextStepMightLastALongTime=Next step may last several minutes. After clicking on validation, please wait until the next screen is shown completely before continuing.
#########
# upgrade

View File

@ -140,6 +140,7 @@ IfAlreadyExistsCheckOption=Si ce nom est correct et que cette base n'existe pas
OpenBaseDir=Paramètre php openbasedir
YouAskToCreateDatabaseSoRootRequired=Vous avez coché la case "Créer la base de donnée". Pour cela, le login/mot de passe du superutilisateur (en bas de formulaire) sont obligatoire.
YouAskToCreateDatabaseUserSoRootRequired=Vous avez coché la case "Créer l'utilisateur propriétaire" de la base. Pour cela, le login/mot de passe du superutilisateur (en bas de formulaire) sont obligatoire.
NextStepMightLastALongTime=L'étape suivante peut durer quelques minutes. Après avoir validé, merci d'attendre l'affichage complet de la page suivante pour poursuivre.
#########
# upgrade