diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php
index c848622dc68..19653023e2e 100644
--- a/htdocs/install/etape1.php
+++ b/htdocs/install/etape1.php
@@ -337,7 +337,7 @@ if ($_POST["action"] == "set")
if ($db->DDLCreateDb($dolibarr_main_db_name, $dolibarr_main_db_character_set, $dolibarr_main_db_collation, $dolibarr_main_db_user))
{
print '
| ';
- print $langs->trans("DatabaseCreation").' : ';
+ print $langs->trans("DatabaseCreation")." (".$langs->trans("User")." ".$userroot.") : ";
print $dolibarr_main_db_name;
print ' | ';
print "".$langs->trans("OK")." |
";
@@ -353,7 +353,7 @@ if ($_POST["action"] == "set")
else
{
print '| ';
- print $langs->trans("DatabaseCreation").' : ';
+ print $langs->trans("DatabaseCreation")." (".$langs->trans("User")." ".$userroot.") : ";
print $dolibarr_main_db_name;
print ' | ';
print ''.$langs->trans("Error").' '.$db->lasterrno().' '.$db->lasterror().' |
';
@@ -372,7 +372,7 @@ if ($_POST["action"] == "set")
}
else {
print '| ';
- print $langs->trans("DatabaseCreation").' : ';
+ print $langs->trans("DatabaseCreation")." (".$langs->trans("User")." ".$userroot.") : ";
print $dolibarr_main_db_name;
print ' | ';
print ''.$langs->trans("Error").' | ';
@@ -408,7 +408,7 @@ if ($_POST["action"] == "set")
{
dolibarr_install_syslog("etape1: connexion to server by user ".$conf->db->user." is ok", LOG_DEBUG);
print "
| ";
- print $langs->trans("ServerConnection")." : ";
+ print $langs->trans("ServerConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
print $dolibarr_main_db_host;
print " | ";
print $langs->trans("OK");
@@ -416,7 +416,7 @@ if ($_POST["action"] == "set")
dolibarr_install_syslog("etape1: connexion to database : ".$conf->db->name.", by user : ".$conf->db->user." is ok", LOG_DEBUG);
print " |
| ";
- print $langs->trans("DatabaseConnection")." : ";
+ print $langs->trans("DatabaseConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
print $dolibarr_main_db_name;
print " | ";
print $langs->trans("OK");
@@ -428,7 +428,7 @@ if ($_POST["action"] == "set")
{
dolibarr_install_syslog("etape1: connexion to server by user ".$conf->db->user." is ok", LOG_DEBUG);
print " |
| ";
- print $langs->trans("ServerConnection")." : ";
+ print $langs->trans("ServerConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
print $dolibarr_main_db_host;
print " | ";
print $langs->trans("OK");
@@ -436,7 +436,7 @@ if ($_POST["action"] == "set")
dolibarr_install_syslog("etape1: connexion to database ".$conf->db->name.", by user : ".$conf->db->user." has failed", LOG_ERR);
print " |
| ";
- print $langs->trans("DatabaseConnection")." : ";
+ print $langs->trans("DatabaseConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
print $dolibarr_main_db_name;
print ' | ';
print $langs->trans("Error");
@@ -456,7 +456,7 @@ if ($_POST["action"] == "set")
{
dolibarr_install_syslog("etape1: la connexion au serveur par le user ".$conf->db->user." est rate");
print " |
| ";
- print $langs->trans("ServerConnection")." : ";
+ print $langs->trans("ServerConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
print $dolibarr_main_db_host;
print ' | ';
print ''.$db->error.'';
diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php
index ea629b77ff1..0b6632bd313 100644
--- a/htdocs/install/etape2.php
+++ b/htdocs/install/etape2.php
@@ -151,7 +151,7 @@ if ($_POST["action"] == "set")
}
closedir($handle);
- // Sort list of data files on alphabetical order (load order is important)
+ // Sort list of sql files on alphabetical order (load order is important)
sort($tabledata);
foreach($tabledata as $file)
{
@@ -261,7 +261,7 @@ if ($_POST["action"] == "set")
}
closedir($handle);
- // Sort list of data files on alphabetical order (load order is important)
+ // Sort list of sql files on alphabetical order (load order is important)
sort($tabledata);
foreach($tabledata as $file)
{
@@ -505,7 +505,7 @@ if ($_POST["action"] == "set")
if ($resql)
{
$ok = 1;
- $db->free($resql);
+ //$db->free($resql); // Not required as request we launch here does not return memory needs.
}
else
{
@@ -519,6 +519,7 @@ if ($_POST["action"] == "set")
print $langs->trans("ErrorSQL")." : ".$db->lasterrno()." - ".$db->lastqueryerror()." - ".$db->lasterror()." ";
}
}
+
}
}
fclose($fp);
|