lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Qual: Add more information on install

Browse Source
This commit is contained in:
Laurent Destailleur 2010-09-04 11:19:21 +00:00
parent 7364d8a7dd
commit 326fcf601e
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/install/etape1.php
View File

@ -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)) if ($db->DDLCreateDb($dolibarr_main_db_name, $dolibarr_main_db_character_set, $dolibarr_main_db_collation, $dolibarr_main_db_user))
{ {
print '<tr><td>'; print '<tr><td>';
print $langs->trans("DatabaseCreation").' : '; print $langs->trans("DatabaseCreation")." (".$langs->trans("User")." ".$userroot.") : ";
print $dolibarr_main_db_name; print $dolibarr_main_db_name;
print '</td>'; print '</td>';
print "<td>".$langs->trans("OK")."</td></tr>"; print "<td>".$langs->trans("OK")."</td></tr>";
@ -353,7 +353,7 @@ if ($_POST["action"] == "set")
else else
{ {
print '<tr><td>'; print '<tr><td>';
print $langs->trans("DatabaseCreation").' : '; print $langs->trans("DatabaseCreation")." (".$langs->trans("User")." ".$userroot.") : ";
print $dolibarr_main_db_name; print $dolibarr_main_db_name;
print '</td>'; print '</td>';
print '<td>'.$langs->trans("Error").' '.$db->lasterrno().'<br>'.$db->lasterror().'</td></tr>'; print '<td>'.$langs->trans("Error").' '.$db->lasterrno().'<br>'.$db->lasterror().'</td></tr>';
@ -372,7 +372,7 @@ if ($_POST["action"] == "set")
} }
else { else {
print '<tr><td>'; print '<tr><td>';
print $langs->trans("DatabaseCreation").' : '; print $langs->trans("DatabaseCreation")." (".$langs->trans("User")." ".$userroot.") : ";
print $dolibarr_main_db_name; print $dolibarr_main_db_name;
print '</td>'; print '</td>';
print '<td>'.$langs->trans("Error").'</td>'; print '<td>'.$langs->trans("Error").'</td>';
@ -408,7 +408,7 @@ if ($_POST["action"] == "set")
{ {
dolibarr_install_syslog("etape1: connexion to server by user ".$conf->db->user." is ok", LOG_DEBUG); dolibarr_install_syslog("etape1: connexion to server by user ".$conf->db->user." is ok", LOG_DEBUG);
print "<tr><td>"; print "<tr><td>";
print $langs->trans("ServerConnection")." : "; print $langs->trans("ServerConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
print $dolibarr_main_db_host; print $dolibarr_main_db_host;
print "</td><td>"; print "</td><td>";
print $langs->trans("OK"); 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); dolibarr_install_syslog("etape1: connexion to database : ".$conf->db->name.", by user : ".$conf->db->user." is ok", LOG_DEBUG);
print "<tr><td>"; print "<tr><td>";
print $langs->trans("DatabaseConnection")." : "; print $langs->trans("DatabaseConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
print $dolibarr_main_db_name; print $dolibarr_main_db_name;
print "</td><td>"; print "</td><td>";
print $langs->trans("OK"); 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); dolibarr_install_syslog("etape1: connexion to server by user ".$conf->db->user." is ok", LOG_DEBUG);
print "<tr><td>"; print "<tr><td>";
print $langs->trans("ServerConnection")." : "; print $langs->trans("ServerConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
print $dolibarr_main_db_host; print $dolibarr_main_db_host;
print "</td><td>"; print "</td><td>";
print $langs->trans("OK"); 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); dolibarr_install_syslog("etape1: connexion to database ".$conf->db->name.", by user : ".$conf->db->user." has failed", LOG_ERR);
print "<tr><td>"; print "<tr><td>";
print $langs->trans("DatabaseConnection")." : "; print $langs->trans("DatabaseConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
print $dolibarr_main_db_name; print $dolibarr_main_db_name;
print '</td><td>'; print '</td><td>';
print $langs->trans("Error"); 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"); dolibarr_install_syslog("etape1: la connexion au serveur par le user ".$conf->db->user." est rate");
print "<tr><td>"; print "<tr><td>";
print $langs->trans("ServerConnection")." : "; print $langs->trans("ServerConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
print $dolibarr_main_db_host; print $dolibarr_main_db_host;
print '</td><td>'; print '</td><td>';
print '<font class="error">'.$db->error.'</div>'; print '<font class="error">'.$db->error.'</div>';

7
htdocs/install/etape2.php
View File

@ -151,7 +151,7 @@ if ($_POST["action"] == "set")
} }
closedir($handle); 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); sort($tabledata);
foreach($tabledata as $file) foreach($tabledata as $file)
{ {
@ -261,7 +261,7 @@ if ($_POST["action"] == "set")
} }
closedir($handle); 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); sort($tabledata);
foreach($tabledata as $file) foreach($tabledata as $file)
{ {
@ -505,7 +505,7 @@ if ($_POST["action"] == "set")
if ($resql) if ($resql)
{ {
$ok = 1; $ok = 1;
$db->free($resql); //$db->free($resql); // Not required as request we launch here does not return memory needs.
} }
else else
{ {
@ -519,6 +519,7 @@ if ($_POST["action"] == "set")
print $langs->trans("ErrorSQL")." : ".$db->lasterrno()." - ".$db->lastqueryerror()." - ".$db->lasterror()."<br>"; print $langs->trans("ErrorSQL")." : ".$db->lasterrno()." - ".$db->lastqueryerror()." - ".$db->lasterror()."<br>";
} }
} }
} }
} }
fclose($fp); fclose($fp);