diff --git a/htdocs/install/check.php b/htdocs/install/check.php index df8254eee9f..3e675ba19bb 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -41,7 +41,7 @@ $langs->setDefaultLang($setuplang); $langs->load("install"); -dolibarr_install_syslog("Dolibarr install/upgrade process started"); +dolibarr_install_syslog("check: Dolibarr install/upgrade process started"); pHeader($langs->trans("DolibarrWelcome"),""); // Etape suivante = license @@ -111,7 +111,7 @@ else clearstatcache(); if (is_readable($conffile) && filesize($conffile) > 8) { - dolibarr_install_syslog("conf file '$conffile' already exists"); + dolibarr_install_syslog("check: conf file '$conffile' already exists"); $confexists=1; include_once($conffile); @@ -122,17 +122,30 @@ if (is_readable($conffile) && filesize($conffile) > 8) else { // Si non on le crée - dolibarr_install_syslog("we try to creat conf file '$conffile'"); + dolibarr_install_syslog("check: we try to creat conf file '$conffile'"); $confexists=0; - $fp = @fopen($conffile, "w"); - if ($fp) - { - @fwrite($fp, '"); - fclose($fp); + + # First we try by copying example + if (copy($conffile.".example", $conffile)) + { + # Success + dolibarr_install_syslog("check: copied file ".$conffile.".example into ".$conffile." done successfully."); + } + else + { + # If failed, we try to create an empty file + dolibarr_install_syslog("check: failed to copy file ".$conffile.".example into ".$conffile.". We try to create it."); + + $fp = @fopen($conffile, "w"); + if ($fp) + { + @fwrite($fp, '"); + fclose($fp); + } } - + // First install, on ne peut pas upgrader $allowupgrade=0; } diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php index a8700aa2013..01777aaabaf 100644 --- a/htdocs/install/etape1.php +++ b/htdocs/install/etape1.php @@ -75,7 +75,7 @@ if ($_POST["action"] == "set") { if (! is_dir($main_dir)) { - dolibarr_syslog ("Repertoire '".$main_dir."' inexistant ou non accessible"); + dolibarr_install_syslog ("Repertoire '".$main_dir."' inexistant ou non accessible"); print ""; print $langs->trans("ErrorDirDoesNotExists",$main_dir).'
'; @@ -162,7 +162,7 @@ if ($_POST["action"] == "set") // Creation des sous-répertoires main_data_dir if (! $error) { - dolibarr_syslog ("Le dossier '".$main_dir."' existe"); + dolibarr_install_syslog ("Le dossier '".$main_dir."' existe"); // Répertoire des documents if (! is_dir($main_data_dir)) @@ -197,7 +197,7 @@ if ($_POST["action"] == "set") { if (is_dir($dir[$i])) { - dolibarr_syslog ("Directory '".$dir[$i]."' exists"); + dolibarr_install_syslog ("Directory '".$dir[$i]."' exists"); } else { @@ -212,7 +212,7 @@ if ($_POST["action"] == "set") } else { - dolibarr_syslog("Directory '".$dir[$i]."' created"); + dolibarr_install_syslog("Directory '".$dir[$i]."' created"); } } } @@ -242,7 +242,7 @@ if ($_POST["action"] == "set") */ if (isset($_POST["db_create_user"]) && $_POST["db_create_user"] == "on") { - dolibarr_syslog("Creation de l'utilisateur: ".$dolibarr_main_db_user); + dolibarr_install_syslog("Creation de l'utilisateur: ".$dolibarr_main_db_user); //print $conf->db->host." , ".$conf->db->name." , ".$conf->db->user." , ".$conf->db->pass; $databasefortest=$conf->db->name; @@ -278,7 +278,7 @@ if ($_POST["action"] == "set") { if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') { - dolibarr_syslog("User already exists"); + dolibarr_install_syslog("User already exists"); print ''; print $langs->trans("UserCreation").' : '; print $dolibarr_main_db_user; @@ -287,7 +287,7 @@ if ($_POST["action"] == "set") } else { - dolibarr_syslog("Failed to create user"); + dolibarr_install_syslog("Failed to create user"); print ''; print $langs->trans("UserCreation").' : '; print $dolibarr_main_db_user; @@ -326,7 +326,7 @@ if ($_POST["action"] == "set") */ if (! $error && (isset($_POST["db_create_database"]) && $_POST["db_create_database"] == "on")) { - dolibarr_syslog ("Creation de la base : ".$dolibarr_main_db_name); + dolibarr_install_syslog ("Creation de la base : ".$dolibarr_main_db_name); $db = new DoliDb($conf->db->type,$conf->db->host,$userroot,$passroot); @@ -384,7 +384,7 @@ if ($_POST["action"] == "set") */ if (! $error) { - dolibarr_syslog("connexion de type=".$conf->db->type." sur host=".$conf->db->host." user=".$conf->db->user." name=".$conf->db->name); + dolibarr_install_syslog("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); @@ -394,7 +394,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. if ($db->database_selected == 1) { - dolibarr_syslog("la connexion au serveur par le user ".$conf->db->user." est reussie"); + dolibarr_install_syslog("la connexion au serveur par le user ".$conf->db->user." est reussie"); print ""; print $langs->trans("ServerConnection")." : "; print $dolibarr_main_db_host; @@ -402,7 +402,7 @@ if ($_POST["action"] == "set") print $langs->trans("OK"); print ""; - dolibarr_syslog("la connexion a la base : ".$conf->db->name.",par le user : ".$conf->db->user." est reussie"); + dolibarr_install_syslog("la connexion a la base : ".$conf->db->name.",par le user : ".$conf->db->user." est reussie"); print ""; print $langs->trans("DatabaseConnection")." : "; print $dolibarr_main_db_name; @@ -414,7 +414,7 @@ if ($_POST["action"] == "set") } else { - dolibarr_syslog("la connection au serveur par le user ".$conf->db->user." est reussie"); + dolibarr_install_syslog("la connection au serveur par le user ".$conf->db->user." est reussie"); print ""; print $langs->trans("ServerConnection")." : "; print $dolibarr_main_db_host; @@ -422,7 +422,7 @@ if ($_POST["action"] == "set") print $langs->trans("OK"); print ""; - dolibarr_syslog("la connexion a la base ".$conf->db->name.",par le user ".$conf->db->user." a échoué"); + dolibarr_install_syslog("la connexion a la base ".$conf->db->name.",par le user ".$conf->db->user." a échoué"); print ""; print $langs->trans("DatabaseConnection")." : "; print $dolibarr_main_db_name; @@ -441,7 +441,7 @@ if ($_POST["action"] == "set") } else { - dolibarr_syslog("la connection au serveur par le user ".$conf->db->user." est rate"); + dolibarr_install_syslog("la connection au serveur par le user ".$conf->db->user." est rate"); print ""; print $langs->trans("ServerConnection")." : "; print $dolibarr_main_db_host; diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php index d3cd9926679..17be9ea5e98 100644 --- a/htdocs/install/etape2.php +++ b/htdocs/install/etape2.php @@ -90,7 +90,7 @@ if ($_POST["action"] == "set") if($db->database_selected == 1) { - dolibarr_syslog("Connexion réussie à la base : $dolibarr_main_db_name"); + dolibarr_install_syslog("Connexion réussie à la base : $dolibarr_main_db_name"); } else {