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

Qual: Amlioration des logs de l'install

Browse Source
This commit is contained in:
Laurent Destailleur 2007-05-10 18:58:52 +00:00
parent a2010f3e7e
commit b256cc1a15
7 changed files with 242 additions and 233 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
htdocs/install/etape1.php
View File

@ -38,6 +38,9 @@ $langs->setDefaultLang($setuplang);
$langs->load("admin"); $langs->load("admin");
$langs->load("install"); $langs->load("install");
dolibarr_install_syslog("etape1: Entering etape1.php page");
pHeader($langs->trans("ConfigurationFile"),"etape2"); pHeader($langs->trans("ConfigurationFile"),"etape2");
$error = 0; $error = 0;
@ -75,7 +78,7 @@ if ($_POST["action"] == "set")
{ {
if (! is_dir($main_dir)) if (! is_dir($main_dir))
{ {
dolibarr_install_syslog ("Repertoire '".$main_dir."' inexistant ou non accessible"); dolibarr_install_syslog("etape1: Repertoire '".$main_dir."' inexistant ou non accessible");
print "<tr><td>"; print "<tr><td>";
print $langs->trans("ErrorDirDoesNotExists",$main_dir).'<br>'; print $langs->trans("ErrorDirDoesNotExists",$main_dir).'<br>';
@ -162,7 +165,7 @@ if ($_POST["action"] == "set")
// Creation des sous-répertoires main_data_dir // Creation des sous-répertoires main_data_dir
if (! $error) if (! $error)
{ {
dolibarr_install_syslog ("Le dossier '".$main_dir."' existe"); dolibarr_install_syslog("etape1: Directory '".$main_dir."' exists");
// Répertoire des documents // Répertoire des documents
if (! is_dir($main_data_dir)) if (! is_dir($main_data_dir))
@ -197,7 +200,7 @@ if ($_POST["action"] == "set")
{ {
if (is_dir($dir[$i])) if (is_dir($dir[$i]))
{ {
dolibarr_install_syslog ("Directory '".$dir[$i]."' exists"); dolibarr_install_syslog("etape1: Directory '".$dir[$i]."' exists");
} }
else else
{ {
@ -212,7 +215,7 @@ if ($_POST["action"] == "set")
} }
else else
{ {
dolibarr_install_syslog("Directory '".$dir[$i]."' created"); dolibarr_install_syslog("etape1: Directory '".$dir[$i]."' created");
} }
} }
} }
@ -242,7 +245,7 @@ if ($_POST["action"] == "set")
*/ */
if (isset($_POST["db_create_user"]) && $_POST["db_create_user"] == "on") if (isset($_POST["db_create_user"]) && $_POST["db_create_user"] == "on")
{ {
dolibarr_install_syslog("Creation de l'utilisateur: ".$dolibarr_main_db_user); dolibarr_install_syslog("etape1: Creation de l'utilisateur: ".$dolibarr_main_db_user);
//print $conf->db->host." , ".$conf->db->name." , ".$conf->db->user." , ".$conf->db->pass; //print $conf->db->host." , ".$conf->db->name." , ".$conf->db->user." , ".$conf->db->pass;
$databasefortest=$conf->db->name; $databasefortest=$conf->db->name;
@ -278,7 +281,7 @@ if ($_POST["action"] == "set")
{ {
if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
{ {
dolibarr_install_syslog("User already exists"); dolibarr_install_syslog("etape1: User already exists");
print '<tr><td>'; print '<tr><td>';
print $langs->trans("UserCreation").' : '; print $langs->trans("UserCreation").' : ';
print $dolibarr_main_db_user; print $dolibarr_main_db_user;
@ -287,7 +290,7 @@ if ($_POST["action"] == "set")
} }
else else
{ {
dolibarr_install_syslog("Failed to create user"); dolibarr_install_syslog("etape1: Failed to create user");
print '<tr><td>'; print '<tr><td>';
print $langs->trans("UserCreation").' : '; print $langs->trans("UserCreation").' : ';
print $dolibarr_main_db_user; print $dolibarr_main_db_user;
@ -326,7 +329,7 @@ if ($_POST["action"] == "set")
*/ */
if (! $error && (isset($_POST["db_create_database"]) && $_POST["db_create_database"] == "on")) if (! $error && (isset($_POST["db_create_database"]) && $_POST["db_create_database"] == "on"))
{ {
dolibarr_install_syslog ("Creation de la base : ".$dolibarr_main_db_name); dolibarr_install_syslog("etape1: Creation de la base : ".$dolibarr_main_db_name);
$db = new DoliDb($conf->db->type,$conf->db->host,$userroot,$passroot); $db = new DoliDb($conf->db->type,$conf->db->host,$userroot,$passroot);
@ -384,7 +387,7 @@ if ($_POST["action"] == "set")
*/ */
if (! $error) if (! $error)
{ {
dolibarr_install_syslog("connexion de type=".$conf->db->type." sur host=".$conf->db->host." user=".$conf->db->user." name=".$conf->db->name); dolibarr_install_syslog("etape1: connexion de type=".$conf->db->type." sur host=".$conf->db->host." user=".$conf->db->user." name=".$conf->db->name);
//print "connexion de type=".$conf->db->type." sur host=".$conf->db->host." user=".$conf->db->user." name=".$conf->db->name; //print "connexion de type=".$conf->db->type." sur host=".$conf->db->host." user=".$conf->db->user." name=".$conf->db->name;
$db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name); $db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name);
@ -394,7 +397,7 @@ if ($_POST["action"] == "set")
// si accès serveur ok et accès base ok, tout est ok, on ne va pas plus loin, on a même pas utilisé le compte root. // si accès serveur ok et accès base ok, tout est ok, on ne va pas plus loin, on a même pas utilisé le compte root.
if ($db->database_selected == 1) if ($db->database_selected == 1)
{ {
dolibarr_install_syslog("la connexion au serveur par le user ".$conf->db->user." est reussie"); dolibarr_install_syslog("etape1: la connexion au serveur par le user ".$conf->db->user." est reussie");
print "<tr><td>"; print "<tr><td>";
print $langs->trans("ServerConnection")." : "; print $langs->trans("ServerConnection")." : ";
print $dolibarr_main_db_host; print $dolibarr_main_db_host;
@ -402,7 +405,7 @@ if ($_POST["action"] == "set")
print $langs->trans("OK"); print $langs->trans("OK");
print "</td></tr>"; print "</td></tr>";
dolibarr_install_syslog("la connexion a la base : ".$conf->db->name.",par le user : ".$conf->db->user." est reussie"); dolibarr_install_syslog("etape1: la connexion a la base : ".$conf->db->name.",par le user : ".$conf->db->user." est reussie");
print "<tr><td>"; print "<tr><td>";
print $langs->trans("DatabaseConnection")." : "; print $langs->trans("DatabaseConnection")." : ";
print $dolibarr_main_db_name; print $dolibarr_main_db_name;
@ -414,7 +417,7 @@ if ($_POST["action"] == "set")
} }
else else
{ {
dolibarr_install_syslog("la connection au serveur par le user ".$conf->db->user." est reussie"); dolibarr_install_syslog("etape1: la connection au serveur par le user ".$conf->db->user." est reussie");
print "<tr><td>"; print "<tr><td>";
print $langs->trans("ServerConnection")." : "; print $langs->trans("ServerConnection")." : ";
print $dolibarr_main_db_host; print $dolibarr_main_db_host;
@ -422,7 +425,7 @@ if ($_POST["action"] == "set")
print $langs->trans("OK"); print $langs->trans("OK");
print "</td></tr>"; print "</td></tr>";
dolibarr_install_syslog("la connexion a la base ".$conf->db->name.",par le user ".$conf->db->user." a échoué"); dolibarr_install_syslog("etape1: la connexion a la base ".$conf->db->name.",par le user ".$conf->db->user." a échoué");
print "<tr><td>"; print "<tr><td>";
print $langs->trans("DatabaseConnection")." : "; print $langs->trans("DatabaseConnection")." : ";
print $dolibarr_main_db_name; print $dolibarr_main_db_name;
@ -441,7 +444,7 @@ if ($_POST["action"] == "set")
} }
else else
{ {
dolibarr_install_syslog("la connection au serveur par le user ".$conf->db->user." est rate"); dolibarr_install_syslog("etape1: la connection au serveur par le user ".$conf->db->user." est rate");
print "<tr><td>"; print "<tr><td>";
print $langs->trans("ServerConnection")." : "; print $langs->trans("ServerConnection")." : ";
print $dolibarr_main_db_host; print $dolibarr_main_db_host;

3
htdocs/install/etape2.php
View File

@ -54,6 +54,7 @@ if ($dolibarr_main_db_type == "mysql") $choix=1;
if ($dolibarr_main_db_type == "mysqli") $choix=1; if ($dolibarr_main_db_type == "mysqli") $choix=1;
if ($dolibarr_main_db_type == "pqsql") $choix=2; if ($dolibarr_main_db_type == "pqsql") $choix=2;
dolibarr_install_syslog("etape2: Entering etape2.php page");
pHeader($langs->trans("CreateDatabaseObjects"),"etape4"); pHeader($langs->trans("CreateDatabaseObjects"),"etape4");
@ -90,7 +91,7 @@ if ($_POST["action"] == "set")
if($db->database_selected == 1) if($db->database_selected == 1)
{ {
dolibarr_install_syslog("Connexion réussie à la base : $dolibarr_main_db_name"); dolibarr_install_syslog("etape2: Connexion réussie à la base : $dolibarr_main_db_name");
} }
else else
{ {

3
htdocs/install/etape4.php
View File

@ -43,6 +43,9 @@ $langs->setDefaultLang($setuplang);
$langs->load("admin"); $langs->load("admin");
$langs->load("install"); $langs->load("install");
dolibarr_install_syslog("etape4: Entering etape4.php page");
pHeader($langs->trans("AdminAccountCreation"),"etape5"); pHeader($langs->trans("AdminAccountCreation"),"etape5");

2
htdocs/install/etape5.php
View File

@ -39,7 +39,7 @@ $langs->load("install");
$success=0; $success=0;
dolibarr_install_syslog("Entering etape5.php page"); dolibarr_install_syslog("etape5: Entering etape5.php page");
if ($_POST["action"] == "set" || $_POST["action"] == "upgrade") if ($_POST["action"] == "set" || $_POST["action"] == "upgrade")

2
htdocs/install/licence.php
View File

@ -35,6 +35,8 @@ $langs->setDefaultLang($setuplang);
$langs->load("install"); $langs->load("install");
dolibarr_install_syslog("licence: Entering licence.php page");
pHeader($langs->trans("License"),"fileconf"); pHeader($langs->trans("License"),"fileconf");

16
htdocs/install/upgrade.php
View File

@ -58,7 +58,7 @@ if ($dolibarr_main_db_type == "mysqli") $choix=1;
if ($dolibarr_main_db_type == "pgsql") $choix=2; if ($dolibarr_main_db_type == "pgsql") $choix=2;
dolibarr_install_syslog("Entering upgrade.php page"); dolibarr_install_syslog("upgrade: Entering upgrade.php page");
pHeader($langs->trans("DatabaseMigration"),"upgrade2","upgrade"); pHeader($langs->trans("DatabaseMigration"),"upgrade2","upgrade");
@ -92,13 +92,13 @@ if (! isset($_GET["action"]) || $_GET["action"] == "upgrade")
{ {
print "<tr><td nowrap>"; print "<tr><td nowrap>";
print $langs->trans("ServerConnection")." : $dolibarr_main_db_host</td><td align=\"right\">".$langs->trans("OK")."</td></tr>"; print $langs->trans("ServerConnection")." : $dolibarr_main_db_host</td><td align=\"right\">".$langs->trans("OK")."</td></tr>";
dolibarr_install_syslog($langs->trans("ServerConnection")." : $dolibarr_main_db_host ".$langs->trans("OK")); dolibarr_install_syslog("upgrade: ".$langs->trans("ServerConnection")." : $dolibarr_main_db_host ".$langs->trans("OK"));
$ok = 1; $ok = 1;
} }
else else
{ {
print "<tr><td>".$langs->trans("ErrorFailedToConnectToDatabase",$dolibarr_main_db_name)."</td><td align=\"right\">".$langs->trans("Error")."</td></tr>"; print "<tr><td>".$langs->trans("ErrorFailedToConnectToDatabase",$dolibarr_main_db_name)."</td><td align=\"right\">".$langs->trans("Error")."</td></tr>";
dolibarr_install_syslog($langs->trans("ErrorFailedToConnectToDatabase",$dolibarr_main_db_name)); dolibarr_install_syslog("upgrade: ".$langs->trans("ErrorFailedToConnectToDatabase",$dolibarr_main_db_name));
$ok = 0; $ok = 0;
} }
@ -108,13 +108,13 @@ if (! isset($_GET["action"]) || $_GET["action"] == "upgrade")
{ {
print "<tr><td nowrap>"; print "<tr><td nowrap>";
print $langs->trans("DatabaseConnection")." : ".$dolibarr_main_db_name."</td><td align=\"right\">".$langs->trans("OK")."</td></tr>"; print $langs->trans("DatabaseConnection")." : ".$dolibarr_main_db_name."</td><td align=\"right\">".$langs->trans("OK")."</td></tr>";
dolibarr_install_syslog("Database connection successfull : $dolibarr_main_db_name"); dolibarr_install_syslog("upgrade: Database connection successfull : $dolibarr_main_db_name");
$ok=1; $ok=1;
} }
else else
{ {
print "<tr><td>".$langs->trans("ErrorFailedToConnectToDatabase",$dolibarr_main_db_name)."</td><td align=\"right\">".$langs->trans("Error")."</td></tr>"; print "<tr><td>".$langs->trans("ErrorFailedToConnectToDatabase",$dolibarr_main_db_name)."</td><td align=\"right\">".$langs->trans("Error")."</td></tr>";
dolibarr_install_syslog($langs->trans("ErrorFailedToConnectToDatabase",$dolibarr_main_db_name)); dolibarr_install_syslog("upgrade: ".$langs->trans("ErrorFailedToConnectToDatabase",$dolibarr_main_db_name));
$ok=0; $ok=0;
} }
} }
@ -126,7 +126,7 @@ if (! isset($_GET["action"]) || $_GET["action"] == "upgrade")
$versionarray=$db->getVersionArray(); $versionarray=$db->getVersionArray();
print '<tr><td>'.$langs->trans("ServerVersion").'</td>'; print '<tr><td>'.$langs->trans("ServerVersion").'</td>';
print '<td align="right">'.$version.'</td></tr>'; print '<td align="right">'.$version.'</td></tr>';
dolibarr_install_syslog($langs->trans("ServerVersion")." : $version"); dolibarr_install_syslog("upgrade: ".$langs->trans("ServerVersion")." : $version");
//print '<td align="right">'.join('.',$versionarray).'</td></tr>'; //print '<td align="right">'.join('.',$versionarray).'</td></tr>';
} }
@ -228,7 +228,7 @@ if (! isset($_GET["action"]) || $_GET["action"] == "upgrade")
{ {
// Ajout trace sur requete (eventuellement à commenter si beaucoup de requetes) // Ajout trace sur requete (eventuellement à commenter si beaucoup de requetes)
print('<tr><td valign="top">'.$langs->trans("Request").' '.($i+1)." sql='".$sql."'</td></tr>\n"); print('<tr><td valign="top">'.$langs->trans("Request").' '.($i+1)." sql='".$sql."'</td></tr>\n");
dolibarr_install_syslog($langs->trans("Request").' '.($i+1)." sql='".$sql); dolibarr_install_syslog("upgrade: ".$langs->trans("Request").' '.($i+1)." sql='".$sql);
if ($db->query($sql)) if ($db->query($sql))
{ {
@ -257,7 +257,7 @@ if (! isset($_GET["action"]) || $_GET["action"] == "upgrade")
print '<tr><td valign="top" colspan="2">'; print '<tr><td valign="top" colspan="2">';
print '<div class="error">'.$langs->trans("Error")." ".$db->errno().": ".$sql."<br>".$db->error()."</font></td>"; print '<div class="error">'.$langs->trans("Error")." ".$db->errno().": ".$sql."<br>".$db->error()."</font></td>";
print '</tr>'; print '</tr>';
dolibarr_install_syslog($langs->trans("Request").' '.($i+1)." ".$langs->trans("Error")." ".$db->errno()." ".$sql."<br>".$db->error()); dolibarr_install_syslog("upgrade: ".$langs->trans("Request").' '.($i+1)." ".$langs->trans("Error")." ".$db->errno()." ".$sql."<br>".$db->error());
$error++; $error++;
} }
} }

16
htdocs/install/upgrade2.php
View File

@ -62,7 +62,7 @@ if ($dolibarr_main_db_type == 'mysqli') $choix=1;
if ($dolibarr_main_db_type == 'pgsql') $choix=2; if ($dolibarr_main_db_type == 'pgsql') $choix=2;
dolibarr_install_syslog("Entering upgrade2.php page"); dolibarr_install_syslog("upgrade2: Entering upgrade2.php page");
pHeader($langs->trans('DataMigration'),'etape5','upgrade'); pHeader($langs->trans('DataMigration'),'etape5','upgrade');
@ -96,7 +96,7 @@ if (isset($_POST['action']) && $_POST['action'] == 'upgrade')
{ {
if($db->database_selected == 1) if($db->database_selected == 1)
{ {
dolibarr_install_syslog('Database connection successfull : '.$dolibarr_main_db_name); dolibarr_install_syslog('upgrade2: Database connection successfull : '.$dolibarr_main_db_name);
} }
else else
{ {
@ -627,7 +627,7 @@ function migrate_price_facture($db,$langs,$conf)
{ {
$db->begin(); $db->begin();
dolibarr_install_syslog("Upgrade data for invoice"); dolibarr_install_syslog("upgrade2: Upgrade data for invoice");
print '<tr><td colspan="4">'; print '<tr><td colspan="4">';
@ -671,7 +671,7 @@ function migrate_price_facture($db,$langs,$conf)
$facligne->total_tva = $total_tva; $facligne->total_tva = $total_tva;
$facligne->total_ttc = $total_ttc; $facligne->total_ttc = $total_ttc;
dolibarr_install_syslog("Line $rowid: facid=$obj->facid pu=$pu qty=$qty tva_taux=$txtva remise_percent=$remise_percent remise_global=$remise_percent_global -> $total_ht, $total_tva, $total_ttc"); dolibarr_install_syslog("upgrade2: Line $rowid: facid=$obj->facid pu=$pu qty=$qty tva_taux=$txtva remise_percent=$remise_percent remise_global=$remise_percent_global -> $total_ht, $total_tva, $total_ttc");
print ". "; print ". ";
$facligne->update_total(); $facligne->update_total();
@ -733,7 +733,7 @@ function migrate_price_propal($db,$langs,$conf)
{ {
$db->begin(); $db->begin();
dolibarr_install_syslog("Upgrade data for propal"); dolibarr_install_syslog("upgrade2: Upgrade data for propal");
print '<tr><td colspan="4">'; print '<tr><td colspan="4">';
@ -777,7 +777,7 @@ function migrate_price_propal($db,$langs,$conf)
$propalligne->total_tva = $total_tva; $propalligne->total_tva = $total_tva;
$propalligne->total_ttc = $total_ttc; $propalligne->total_ttc = $total_ttc;
dolibarr_install_syslog("Line $rowid: propalid=$obj->facid pu=$pu qty=$qty tva_taux=$txtva remise_percent=$remise_percent remise_global=$remise_percent_global -> $total_ht, $total_tva, $total_ttc"); dolibarr_install_syslog("upgrade2: Line $rowid: propalid=$obj->rowid pu=$pu qty=$qty tva_taux=$txtva remise_percent=$remise_percent remise_global=$remise_percent_global -> $total_ht, $total_tva, $total_ttc");
print ". "; print ". ";
$propalligne->update_total($rowid); $propalligne->update_total($rowid);
@ -839,7 +839,7 @@ function migrate_price_commande($db,$langs,$conf)
{ {
$db->begin(); $db->begin();
dolibarr_install_syslog("Upgrade data for order"); dolibarr_install_syslog("upgrade2: Upgrade data for order");
print '<tr><td colspan="4">'; print '<tr><td colspan="4">';
@ -883,7 +883,7 @@ function migrate_price_commande($db,$langs,$conf)
$commandeligne->total_tva = $total_tva; $commandeligne->total_tva = $total_tva;
$commandeligne->total_ttc = $total_ttc; $commandeligne->total_ttc = $total_ttc;
dolibarr_install_syslog("Line $rowid: commandeid=$obj->facid pu=$pu qty=$qty tva_taux=$txtva remise_percent=$remise_percent remise_global=$remise_percent_global -> $total_ht, $total_tva, $total_ttc"); dolibarr_install_syslog("upgrade2: Line $rowid: commandeid=$obj->rowid pu=$pu qty=$qty tva_taux=$txtva remise_percent=$remise_percent remise_global=$remise_percent_global -> $total_ht, $total_tva, $total_ttc");
print ". "; print ". ";
$commandeligne->update_total($rowid); $commandeligne->update_total($rowid);