diff --git a/build/perl/virtualmin/dolibarr.pl b/build/perl/virtualmin/dolibarr.pl
index f105a89bc4d9583569a7f4b32aa941ff099a3a45..31578905202182870a12959510b7afe29286eae9 100644
--- a/build/perl/virtualmin/dolibarr.pl
+++ b/build/perl/virtualmin/dolibarr.pl
@@ -242,7 +242,7 @@ if ($upgrade) {
[ "versionfrom", $upgrade->{'version'} ],
[ "versionto", $ver ],
);
- local $err = &call_dolibarr_wizard_page(\@params, "etape5", $d, $opts);
+ local $err = &call_dolibarr_wizard_page(\@params, "step5", $d, $opts);
return (-1, "Dolibarr wizard failed : $err") if ($err);
# Remove the installation directory.
@@ -268,12 +268,12 @@ else {
[ "usealternaterootdir", "1" ],
[ "main_alt_dir_name", "custom" ],
);
- local $err = &call_dolibarr_wizard_page(\@params, "etape1", $d, $opts);
+ local $err = &call_dolibarr_wizard_page(\@params, "step1", $d, $opts);
return (-1, "Dolibarr wizard failed : $err") if ($err);
# Second page (Populate database)
local @params = ( [ "action", "set" ] );
- local $err = &call_dolibarr_wizard_page(\@params, "etape2", $d, $opts);
+ local $err = &call_dolibarr_wizard_page(\@params, "step2", $d, $opts);
return (-1, "Dolibarr wizard failed : $err") if ($err);
# Third page (Add administrator account)
@@ -282,7 +282,7 @@ else {
[ "pass", $dompass ],
[ "pass_verif", $dompass ],
);
- local $err = &call_dolibarr_wizard_page(\@params, "etape5", $d, $opts);
+ local $err = &call_dolibarr_wizard_page(\@params, "step5", $d, $opts);
return (-1, "Dolibarr wizard failed : $err") if ($err);
# Remove the installation directory and protect config file.
diff --git a/htdocs/install/check.php b/htdocs/install/check.php
index 4149691302e9eae9c94c0ac7107ef6431bc9dc6d..0b9b08f3b684af1343a0fdf30b15dc09755971c0 100644
--- a/htdocs/install/check.php
+++ b/htdocs/install/check.php
@@ -5,6 +5,7 @@
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2013-2014 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2014 Marcos García <marcosgdf@gmail.com>
+ * Copyright (C) 2015 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -43,8 +44,7 @@ $forcedfile="./install.forced.php";
if ($conffile == "/etc/dolibarr/conf.php") $forcedfile="/etc/dolibarr/install.forced.php";
if (@file_exists($forcedfile)) { $useforcedwizard=true; include_once $forcedfile; }
-dolibarr_install_syslog("Dolibarr install/upgrade process started");
-
+dolibarr_install_syslog("--- check: Dolibarr install/upgrade process started");
/*
@@ -167,11 +167,11 @@ if ($memmaxorig != '')
}
-// If config file presente and filled
+// If config file present and filled
clearstatcache();
if (is_readable($conffile) && filesize($conffile) > 8)
{
- dolibarr_install_syslog("conf file '$conffile' already defined");
+ dolibarr_install_syslog("check: conf file '" . $conffile . "' already defined");
$confexists=1;
include_once $conffile;
@@ -189,19 +189,19 @@ if (is_readable($conffile) && filesize($conffile) > 8)
else
{
// If not, we create it
- dolibarr_install_syslog("we try to create conf file '$conffile'");
+ dolibarr_install_syslog("check: we try to create conf file '" . $conffile . "'");
$confexists=0;
// First we try by copying example
if (@copy($conffile.".example", $conffile))
{
// Success
- dolibarr_install_syslog("copied file ".$conffile.".example into ".$conffile." done successfully.");
+ dolibarr_install_syslog("check: successfully copied file " . $conffile . ".example into " . $conffile);
}
else
{
// If failed, we try to create an empty file
- dolibarr_install_syslog("failed to copy file ".$conffile.".example into ".$conffile.". We try to create it.", LOG_WARNING);
+ dolibarr_install_syslog("check: failed to copy file " . $conffile . ".example into " . $conffile . ". We try to create it.", LOG_WARNING);
$fp = @fopen($conffile, "w");
if ($fp)
@@ -210,7 +210,7 @@ else
@fputs($fp,"\n");
fclose($fp);
}
- else dolibarr_install_syslog("failed to create a new file ".$conffile." into current dir ".getcwd().". Check permission.", LOG_ERR);
+ else dolibarr_install_syslog("check: failed to create a new file " . $conffile . " into current dir " . getcwd() . ". Please check permissions.", LOG_ERR);
}
// First install, we can't upgrade
@@ -282,7 +282,7 @@ else
if (! file_exists($dolibarr_main_document_root."/core/lib/admin.lib.php"))
{
print '<font class="error">A '.$conffiletoshow.' file exists with a dolibarr_main_document_root to '.$dolibarr_main_document_root.' that seems wrong. Try to fix or remove the '.$conffiletoshow.' file.</font><br>'."\n";
- dol_syslog("A '.$conffiletoshow.' file exists with a dolibarr_main_document_root to ".$dolibarr_main_document_root." that seems wrong. Try to fix or remove the '.$conffiletoshow.' file.", LOG_WARNING);
+ dol_syslog("A '" . $conffiletoshow . "' file exists with a dolibarr_main_document_root to " . $dolibarr_main_document_root . " that seems wrong. Try to fix or remove the '" . $conffiletoshow . "' file.", LOG_WARNING);
}
else
{
@@ -531,5 +531,6 @@ $(".runupgrade").click(function() {
</script>';
+dolibarr_install_syslog("--- check: end");
pFooter(true); // Never display next button
diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php
index 04f8a3caf4c297a39971931213cdab6f784feed9..92d2fc963a8ed2a0622628fde9ce988589a41bfd 100644
--- a/htdocs/install/fileconf.php
+++ b/htdocs/install/fileconf.php
@@ -36,7 +36,7 @@ $langs->setDefaultLang($setuplang);
$langs->load("install");
$langs->load("errors");
-dolibarr_install_syslog("Fileconf: Entering fileconf.php page");
+dolibarr_install_syslog("--- fileconf: entering fileconf.php page");
// You can force preselected values of the config step of Dolibarr by adding a file
// install.forced.php into directory htdocs/install (This is the case with some wizard
@@ -71,12 +71,14 @@ if (@file_exists($forcedfile)) {
session_start(); // To be able to keep info into session (used for not loosing pass during navigation. pass must not transit throug parmaeters)
-pHeader($langs->trans("ConfigurationFile"),"etape1","set","",(empty($force_dolibarr_js_JQUERY)?'':$force_dolibarr_js_JQUERY.'/'));
+pHeader($langs->trans("ConfigurationFile"),"step1","set","",(empty($force_dolibarr_js_JQUERY)?'':$force_dolibarr_js_JQUERY.'/'));
// Test if we can run a first install process
if (! is_writable($conffile))
{
- print $langs->trans("ConfFileIsNotWritable",$conffiletoshow);
+ print $langs->trans("ConfFileIsNotWritable", $conffiletoshow);
+ dolibarr_install_syslog("fileconf: config file is not writable", LOG_WARNING);
+ dolibarr_install_syslog("--- fileconf: end");
pFooter(1,$setuplang,'jscheckparam');
exit;
}
@@ -584,4 +586,5 @@ function jscheckparam()
// $db->close(); Not database connexion yet
+dolibarr_install_syslog("--- fileconf: end");
pFooter($err,$setuplang,'jscheckparam');
diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index bac0ffe6eda65ca0e638089c2084421cd21d7518..36d124210558a7664c27e271f5ec21aee17c1dd4 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -375,13 +375,13 @@ function pHeader($subtitle,$next,$action='set',$param='',$forcejqueryurl='')
print '<!-- Includes CSS for JQuery -->'."\n";
if ($jQueryUiCustomPath) print '<link rel="stylesheet" type="text/css" href="'.$jQueryUiCustomPath.'css/'.$jquerytheme.'/jquery-ui.min.css" />'."\n"; // JQuery
- else print '<link rel="stylesheet" type="text/css" href="../includes/jquery/css/'.$jquerytheme.'/jquery-ui-latest.custom.css" />'."\n"; // JQuery
+ else print '<link rel="stylesheet" type="text/css" href="../includes/jquery/css/'.$jquerytheme.'/jquery-ui.custom.css" />'."\n"; // JQuery
print '<!-- Includes JS for JQuery -->'."\n";
if ($jQueryCustomPath) print '<script type="text/javascript" src="'.$jQueryCustomPath.'jquery.min.js"></script>'."\n";
- else print '<script type="text/javascript" src="../includes/jquery/js/jquery-latest.min.js"></script>'."\n";
+ else print '<script type="text/javascript" src="../includes/jquery/js/jquery.min.js"></script>'."\n";
if ($jQueryUiCustomPath) print '<script type="text/javascript" src="'.$jQueryUiCustomPath.'jquery-ui.min.js"></script>'."\n";
- else print '<script type="text/javascript" src="../includes/jquery/js/jquery-ui-latest.custom.min.js"></script>'."\n";
+ else print '<script type="text/javascript" src="../includes/jquery/js/jquery-ui.custom.min.js"></script>'."\n";
print '<title>'.$langs->trans("DolibarrSetup").'</title>'."\n";
print '</head>'."\n";
diff --git a/htdocs/install/index.php b/htdocs/install/index.php
index 4508a266b087c38c7cfca16330b078e1e230415a..9b0ac71931bff7c829a243a0a18f696b4d5ff9d2 100644
--- a/htdocs/install/index.php
+++ b/htdocs/install/index.php
@@ -28,8 +28,7 @@ include_once '../core/class/html.formadmin.class.php';
$err = 0;
-// Si fichier conf existe deja et rempli, on est pas sur une premiere install,
-// on ne passe donc pas par la page de choix de langue
+// If the config file exists and is filled, we're not on first install so we skip the language selection page
if (file_exists($conffile) && isset($dolibarr_main_url_root))
{
header("Location: check.php?testget=ok");
@@ -45,7 +44,7 @@ $langs->load("admin");
$formadmin=new FormAdmin(''); // Note: $db does not exist yet but we don't need it, so we put ''.
-pHeader("", "check"); // Etape suivante = check
+pHeader("", "check"); // Next step = check
// Ask installation language
@@ -62,6 +61,6 @@ print '</table></div>';
print '<br><br>'.$langs->trans("SomeTranslationAreUncomplete");
-// Si pas d'erreur, on affiche le bouton pour passer a l'etape suivante
+// If there's no error, we display the next step button
if ($err == 0) pFooter(0);
diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php
index 786a8efb4309fdea798b422bb0393bc61b0fa533..c8a77e9d8e7441f649000f274e760aa76afac42c 100644
--- a/htdocs/install/repair.php
+++ b/htdocs/install/repair.php
@@ -2,6 +2,7 @@
/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
+ * Copyright (C) 2015 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -18,7 +19,7 @@
*/
/**
- * \file htdocs/install/repair.php
+ * \file htdocs/install/repair.php
* \brief Run repair script
*/
@@ -29,7 +30,7 @@ require_once $dolibarr_main_document_root.'/core/class/extrafields.class.php';
require_once 'lib/repair.lib.php';
$grant_query='';
-$etape = 2;
+$step = 2;
$ok = 0;
@@ -54,8 +55,8 @@ if ($dolibarr_main_db_type == "pgsql") $choix=2;
if ($dolibarr_main_db_type == "mssql") $choix=3;
-dolibarr_install_syslog("repair: Entering upgrade.php page");
-if (! is_object($conf)) dolibarr_install_syslog("repair: conf file not initialized",LOG_ERR);
+dolibarr_install_syslog("--- repair: entering upgrade.php page");
+if (! is_object($conf)) dolibarr_install_syslog("repair: conf file not initialized", LOG_ERR);
/*
@@ -105,13 +106,13 @@ if ($db->connected)
{
print '<tr><td class="nowrap">';
print $langs->trans("ServerConnection")." : $dolibarr_main_db_host</td><td align=\"right\">".$langs->trans("OK")."</td></tr>";
- dolibarr_install_syslog("repair: ".$langs->transnoentities("ServerConnection")." : $dolibarr_main_db_host ".$langs->transnoentities("OK"));
+ dolibarr_install_syslog("repair: " . $langs->transnoentities("ServerConnection") . ": " . $dolibarr_main_db_host . $langs->transnoentities("OK"));
$ok = 1;
}
else
{
print "<tr><td>".$langs->trans("ErrorFailedToConnectToDatabase",$dolibarr_main_db_name)."</td><td align=\"right\">".$langs->transnoentities("Error")."</td></tr>";
- dolibarr_install_syslog("repair: ".$langs->transnoentities("ErrorFailedToConnectToDatabase",$dolibarr_main_db_name));
+ dolibarr_install_syslog("repair: " . $langs->transnoentities("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name));
$ok = 0;
}
@@ -121,13 +122,13 @@ if ($ok)
{
print '<tr><td class="nowrap">';
print $langs->trans("DatabaseConnection")." : ".$dolibarr_main_db_name."</td><td align=\"right\">".$langs->trans("OK")."</td></tr>";
- dolibarr_install_syslog("repair: Database connection successfull : $dolibarr_main_db_name");
+ dolibarr_install_syslog("repair: database connection successful: " . $dolibarr_main_db_name);
$ok=1;
}
else
{
print "<tr><td>".$langs->trans("ErrorFailedToConnectToDatabase",$dolibarr_main_db_name)."</td><td align=\"right\">".$langs->trans("Error")."</td></tr>";
- dolibarr_install_syslog("repair: ".$langs->transnoentities("ErrorFailedToConnectToDatabase",$dolibarr_main_db_name));
+ dolibarr_install_syslog("repair: " . $langs->transnoentities("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name));
$ok=0;
}
}
@@ -139,7 +140,7 @@ if ($ok)
$versionarray=$db->getVersionArray();
print '<tr><td>'.$langs->trans("ServerVersion").'</td>';
print '<td align="right">'.$version.'</td></tr>';
- dolibarr_install_syslog("repair: ".$langs->transnoentities("ServerVersion")." : $version");
+ dolibarr_install_syslog("repair: " . $langs->transnoentities("ServerVersion") . ": " . $version);
//print '<td align="right">'.join('.',$versionarray).'</td></tr>';
}
@@ -514,6 +515,7 @@ print '<div class="center"><a href="../index.php?mainmenu=home'.(isset($_POST["l
print $langs->trans("GoToDolibarr");
print '</a></div>';
+dolibarr_install_syslog("--- repair: end");
pFooter(1,$setuplang);
if ($db->connected) $db->close();
diff --git a/htdocs/install/etape1.php b/htdocs/install/step1.php
similarity index 92%
rename from htdocs/install/etape1.php
rename to htdocs/install/step1.php
index 5817af81e9b728172b175dccc73b25774f205e32..d1eca1211bae18b7612421b7d5629b5472f92e11 100644
--- a/htdocs/install/etape1.php
+++ b/htdocs/install/step1.php
@@ -4,6 +4,7 @@
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
* Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org>
* Copyright (C) 2005-2011 Regis Houssin <regis.houssin@capnetworks.com>
+ * Copyright (C) 2015 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -20,7 +21,7 @@
*/
/**
- * \file htdocs/install/etape1.php
+ * \file htdocs/install/step1.php
* \ingroup install
* \brief Build conf file on disk
*/
@@ -64,7 +65,7 @@ $forcedfile="./install.forced.php";
if ($conffile == "/etc/dolibarr/conf.php") $forcedfile="/etc/dolibarr/install.forced.php";
if (@file_exists($forcedfile)) { $useforcedwizard=true; include_once $forcedfile; }
-dolibarr_install_syslog("--- etape1: Entering etape1.php page");
+dolibarr_install_syslog("--- step1: entering step1.php page");
$error = 0;
@@ -74,7 +75,7 @@ $error = 0;
*/
-pHeader($langs->trans("ConfigurationFile"),"etape2");
+pHeader($langs->trans("ConfigurationFile"),"step2");
// Test if we can run a first install process
if (! is_writable($conffile))
@@ -185,7 +186,7 @@ if (! $error)
$db=getDoliDBInstance($db_type, $db_host, $userroot, $passroot, $databasefortest, $db_port);
- dol_syslog("databasefortest=".$databasefortest." connected=".$db->connected." database_selected=".$db->database_selected, LOG_DEBUG);
+ dol_syslog("databasefortest=" . $databasefortest . " connected=" . $db->connected . " database_selected=" . $db->database_selected, LOG_DEBUG);
//print "databasefortest=".$databasefortest." connected=".$db->connected." database_selected=".$db->database_selected;
if (empty($_POST["db_create_database"]) && $db->connected && ! $db->database_selected)
@@ -276,7 +277,7 @@ if (! $error && $db->connected)
print '<input type="hidden" name="dolibarr_main_db_collation" value="'.$defaultDBSortingCollation.'">';
$db_character_set=$defaultCharacterSet;
$db_collation=$defaultDBSortingCollation;
- dolibarr_install_syslog("db_character_set=".$db_character_set." db_collation=".$db_collation);
+ dolibarr_install_syslog("step1: db_character_set=" . $db_character_set . " db_collation=" . $db_collation);
}
@@ -286,8 +287,9 @@ if (! $error && $db->connected && $action == "set")
umask(0);
foreach($_POST as $key => $value)
{
- if (! preg_match('/^db_pass/i', $key))
- dolibarr_install_syslog("Choice for ".$key." = ".$value);
+ if (! preg_match('/^db_pass/i', $key)) {
+ dolibarr_install_syslog("step1: choice for " . $key . " = " . $value);
+ }
}
// Show title of step
@@ -299,7 +301,7 @@ if (! $error && $db->connected && $action == "set")
{
if (! is_dir($main_dir))
{
- dolibarr_install_syslog("etape1: Repertoire '".$main_dir."' inexistant ou non accessible");
+ dolibarr_install_syslog("step1: directory '" . $main_dir . "' is unavailable or can't be accessed");
print "<tr><td>";
print $langs->trans("ErrorDirDoesNotExists",$main_dir).'<br>';
@@ -314,7 +316,7 @@ if (! $error && $db->connected && $action == "set")
if (! $error)
{
- dolibarr_install_syslog("etape1: Directory '".$main_dir."' exists");
+ dolibarr_install_syslog("step1: directory '" . $main_dir . "' exists");
}
@@ -343,7 +345,7 @@ if (! $error && $db->connected && $action == "set")
$pathhtaccess=$main_data_dir.'/.htaccess';
if (! file_exists($pathhtaccess))
{
- dolibarr_install_syslog("etape1: .htaccess file does not exists, we create it in '".$main_data_dir."'");
+ dolibarr_install_syslog("step1: .htaccess file did not exist, we created it in '" . $main_data_dir . "'");
$handlehtaccess=@fopen($pathhtaccess,'w');
if ($handlehtaccess)
{
@@ -351,7 +353,7 @@ if (! $error && $db->connected && $action == "set")
fwrite($handlehtaccess,'Deny from all'."\n");
fclose($handlehtaccess);
- dolibarr_install_syslog("etape1: .htaccess file created");
+ dolibarr_install_syslog("step1: .htaccess file created");
}
}
@@ -372,7 +374,7 @@ if (! $error && $db->connected && $action == "set")
{
if (is_dir($dir[$i]))
{
- dolibarr_install_syslog("etape1: Directory '".$dir[$i]."' exists");
+ dolibarr_install_syslog("step1: directory '" . $dir[$i] . "' exists");
}
else
{
@@ -387,7 +389,7 @@ if (! $error && $db->connected && $action == "set")
}
else
{
- dolibarr_install_syslog("etape1: Directory '".$dir[$i]."' created");
+ dolibarr_install_syslog("step1: directory '" . $dir[$i] . "' created");
}
}
}
@@ -475,7 +477,7 @@ if (! $error && $db->connected && $action == "set")
// 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);
+ dolibarr_install_syslog("step1: create database user: " . $dolibarr_main_db_user);
//print $conf->db->host." , ".$conf->db->name." , ".$conf->db->user." , ".$conf->db->port;
$databasefortest=$conf->db->name;
@@ -523,7 +525,7 @@ if (! $error && $db->connected && $action == "set")
|| $db->errno() == 'DB_ERROR_KEY_NAME_ALREADY_EXISTS'
|| $db->errno() == 'DB_ERROR_USER_ALREADY_EXISTS')
{
- dolibarr_install_syslog("etape1: User already exists");
+ dolibarr_install_syslog("step1: user already exists");
print '<tr><td>';
print $langs->trans("UserCreation").' : ';
print $dolibarr_main_db_user;
@@ -532,7 +534,7 @@ if (! $error && $db->connected && $action == "set")
}
else
{
- dolibarr_install_syslog("etape1: Failed to create user");
+ dolibarr_install_syslog("step1: failed to create user", LOG_ERR);
print '<tr><td>';
print $langs->trans("UserCreation").' : ';
print $dolibarr_main_db_user;
@@ -569,7 +571,7 @@ if (! $error && $db->connected && $action == "set")
// 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." ".$dolibarr_main_db_character_set." ".$dolibarr_main_db_collation." ".$dolibarr_main_db_user, LOG_DEBUG);
+ dolibarr_install_syslog("step1: create database: " . $dolibarr_main_db_name . " " . $dolibarr_main_db_character_set . " " . $dolibarr_main_db_collation . " " . $dolibarr_main_db_user);
$newdb=getDoliDBInstance($conf->db->type,$conf->db->host,$userroot,$passroot,'',$conf->db->port);
//print 'eee'.$conf->db->type." ".$conf->db->host." ".$userroot." ".$passroot." ".$conf->db->port." ".$newdb->connected." ".$newdb->forcecharset;exit;
@@ -587,11 +589,11 @@ if (! $error && $db->connected && $action == "set")
$check1=$newdb->getDefaultCharacterSetDatabase();
$check2=$newdb->getDefaultCollationDatabase();
- dolibarr_install_syslog('etape1: Note that default server was charset='.$check1.' collation='.$check2, LOG_DEBUG);
+ dolibarr_install_syslog('step1: note that default server was charset=' . $check1 . ' collation=' . $check2);
// If values differs, we save conf file again
- //if ($check1 != $dolibarr_main_db_character_set) dolibarr_install_syslog('etape1: Value for character_set is not the one asked for database creation', LOG_WARNING);
- //if ($check2 != $dolibarr_main_db_collation) dolibarr_install_syslog('etape1: Value for collation is not the one asked for database creation', LOG_WARNING);
+ //if ($check1 != $dolibarr_main_db_character_set) dolibarr_install_syslog('step1: value for character_set is not the one asked for database creation', LOG_WARNING);
+ //if ($check2 != $dolibarr_main_db_collation) dolibarr_install_syslog('step1: value for collation is not the one asked for database creation', LOG_WARNING);
}
else
{
@@ -603,7 +605,7 @@ if (! $error && $db->connected && $action == "set")
print '<br>';
print '</td></tr>';
- dolibarr_install_syslog('etape1: Failed to create database '.$dolibarr_main_db_name.' '.$newdb->lasterrno().' '.$newdb->lasterror(), LOG_ERR);
+ dolibarr_install_syslog('step1: failed to create database ' . $dolibarr_main_db_name . ' ' . $newdb->lasterrno() . ' ' . $newdb->lasterror(), LOG_ERR);
$error++;
}
$newdb->close();
@@ -632,14 +634,14 @@ if (! $error && $db->connected && $action == "set")
// We test access with dolibarr database user (not admin)
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);
+ dolibarr_install_syslog("step1: connection type=" . $conf->db->type . " on host=" . $conf->db->host . " port=" . $conf->db->port . " user=" . $conf->db->user . " name=" . $conf->db->name);
//print "connexion de type=".$conf->db->type." sur host=".$conf->db->host." port=".$conf->db->port." user=".$conf->db->user." name=".$conf->db->name;
$db=getDoliDBInstance($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port);
if ($db->connected)
{
- dolibarr_install_syslog("etape1: connexion to server by user ".$conf->db->user." is ok", LOG_DEBUG);
+ dolibarr_install_syslog("step1: connection to server by user " . $conf->db->user . " ok");
print "<tr><td>";
print $langs->trans("ServerConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
print $dolibarr_main_db_host;
@@ -650,7 +652,7 @@ if (! $error && $db->connected && $action == "set")
// si acces serveur ok et acces base ok, tout est ok, on ne va pas plus loin, on a meme pas utilise le compte root.
if ($db->database_selected)
{
- dolibarr_install_syslog("etape1: connexion to database : ".$conf->db->name.", by user : ".$conf->db->user." is ok", LOG_DEBUG);
+ dolibarr_install_syslog("step1: connection to database " . $conf->db->name . " by user " . $conf->db->user . " ok");
print "<tr><td>";
print $langs->trans("DatabaseConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
print $dolibarr_main_db_name;
@@ -662,7 +664,7 @@ if (! $error && $db->connected && $action == "set")
}
else
{
- dolibarr_install_syslog("etape1: connexion to database ".$conf->db->name.", by user : ".$conf->db->user." has failed", LOG_ERR);
+ dolibarr_install_syslog("step1: connection to database " . $conf->db->name . " by user " . $conf->db->user . " failed", LOG_ERR);
print "<tr><td>";
print $langs->trans("DatabaseConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
print $dolibarr_main_db_name;
@@ -682,7 +684,7 @@ if (! $error && $db->connected && $action == "set")
}
else
{
- dolibarr_install_syslog("etape1: la connexion au serveur par le user ".$conf->db->user." est rate");
+ dolibarr_install_syslog("step1: connection to server by user " . $conf->db->user . " failed", LOG_ERR);
print "<tr><td>";
print $langs->trans("ServerConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
print $dolibarr_main_db_host;
@@ -723,7 +725,7 @@ function jsinfo()
<?php
-dolibarr_install_syslog("--- install/etape1.php end", LOG_INFO);
+dolibarr_install_syslog("--- step1: end");
pFooter($error,$setuplang,'jsinfo',1);
@@ -744,7 +746,6 @@ function write_main_file($mainfile,$main_dir)
fputs($fp, '<?php'."\n");
fputs($fp, "// Wrapper to include main into htdocs\n");
fputs($fp, "include_once '".$main_dir."/main.inc.php';\n");
- fputs($fp, '?>');
fclose($fp);
}
}
@@ -766,7 +767,6 @@ function write_master_file($masterfile,$main_dir)
fputs($fp, '<?php'."\n");
fputs($fp, "// Wrapper to include master into htdocs\n");
fputs($fp, "include_once '".$main_dir."/master.inc.php';\n");
- fputs($fp, '?>');
fclose($fp);
}
}
@@ -928,7 +928,6 @@ function write_conf_file($conffile)
fputs($fp, '$dolibarr_font_DOL_DEFAULT_TTF_BOLD=\''.$force_dolibarr_font_DOL_DEFAULT_TTF_BOLD.'\';');
fputs($fp,"\n");
- fputs($fp, '?>');
fclose($fp);
if (file_exists("$conffile"))
diff --git a/htdocs/install/etape2.php b/htdocs/install/step2.php
similarity index 91%
rename from htdocs/install/etape2.php
rename to htdocs/install/step2.php
index 8de4481222257f2621ab5f3f3bcd0b0ebcb08596..8f27aa53767abde88bb2228e93904d4d7c77cfa1 100644
--- a/htdocs/install/etape2.php
+++ b/htdocs/install/step2.php
@@ -1,7 +1,8 @@
<?php
/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2015 Cedric GROSS <c.gross@kreiz-it.fr>
+ * Copyright (C) 2015 Cedric GROSS <c.gross@kreiz-it.fr>
+ * Copyright (C) 2015 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -18,8 +19,8 @@
*/
/**
- * \file htdocs/install/etape2.php
- * \ingroup install
+ * \file htdocs/install/step2.php
+ * \ingroup install
* \brief Create tables, primary keys, foreign keys, indexes and functions into database and then load reference data
*/
@@ -27,7 +28,7 @@ include 'inc.php';
require_once $dolibarr_main_document_root.'/core/class/conf.class.php';
require_once $dolibarr_main_document_root.'/core/lib/admin.lib.php';
-$etape = 2;
+$step = 2;
$ok = 0;
@@ -54,7 +55,7 @@ if ($dolibarr_main_db_type == "mssql") $choix=3;
if ($dolibarr_main_db_type == "sqlite") $choix=4;
if ($dolibarr_main_db_type == "sqlite3") $choix=5;
-//if (empty($choix)) dol_print_error('','Database type '.$dolibarr_main_db_type.' not supported into etape2.php page');
+//if (empty($choix)) dol_print_error('','Database type '.$dolibarr_main_db_type.' not supported into step2.php page');
// Now we load forced value from install.forced.php file.
$useforcedwizard=false;
@@ -62,14 +63,14 @@ $forcedfile="./install.forced.php";
if ($conffile == "/etc/dolibarr/conf.php") $forcedfile="/etc/dolibarr/install.forced.php";
if (@file_exists($forcedfile)) { $useforcedwizard=true; include_once $forcedfile; }
-dolibarr_install_syslog("--- etape2: Entering etape2.php page");
+dolibarr_install_syslog("--- step2: entering step2.php page");
/*
* View
*/
-pHeader($langs->trans("CreateDatabaseObjects"),"etape4");
+pHeader($langs->trans("CreateDatabaseObjects"),"step4");
// Test if we can run a first install process
if (! is_writable($conffile))
@@ -103,11 +104,11 @@ if ($action == "set")
{
if($db->database_selected)
{
- dolibarr_install_syslog("etape2: Connexion successful to database : ".$conf->db->name);
+ dolibarr_install_syslog("step2: successful connection to database: " . $conf->db->name);
}
else
{
- dolibarr_install_syslog("etape2: Connexion failed to database : ".$conf->db->name);
+ dolibarr_install_syslog("step2: failed connection to database :" . $conf->db->name, LOG_ERR);
print "<tr><td>Failed to select database ".$conf->db->name.'</td><td><img src="../theme/eldy/img/error.png" alt="Error"></td></tr>';
$ok = 0 ;
}
@@ -131,7 +132,7 @@ if ($action == "set")
$requestnb=0;
// To disable some code, so you can call step2 with url like
- // http://localhost/dolibarrnew/install/etape2.php?action=set&createtables=0&createkeys=0&createfunctions=0&createdata=llx_20_c_departements
+ // http://localhost/dolibarrnew/install/step2.php?action=set&createtables=0&createkeys=0&createfunctions=0&createdata=llx_20_c_departements
$createtables=isset($_GET['createtables'])?GETPOST('createtables'):1;
$createkeys=isset($_GET['createkeys'])?GETPOST('createkeys'):1;
$createfunctions=isset($_GET['createfunctions'])?GETPOST('createfunction'):1;
@@ -155,7 +156,7 @@ if ($action == "set")
$ok = 0;
$handle=opendir($dir);
- dolibarr_install_syslog("Open tables directory ".$dir." handle=".$handle,LOG_DEBUG);
+ dolibarr_install_syslog("step2: open tables directory " . $dir . " handle=" . $handle);
$tablefound = 0;
$tabledata=array();
if (is_resource($handle))
@@ -211,7 +212,7 @@ if ($action == "set")
//print "<tr><td>Creation de la table $name/td>";
$requestnb++;
- dolibarr_install_syslog("Request: ".$buffer,LOG_DEBUG);
+ dolibarr_install_syslog("step2: request: " . $buffer);
$resql=$db->query($buffer,0,'dml');
if ($resql)
{
@@ -241,7 +242,7 @@ if ($action == "set")
print "</td>";
print '<td><font class="error">'.$langs->trans("Error").' Failed to open file '.$dir.$file.'</td></tr>';
$error++;
- dolibarr_install_syslog("Failed to open file ".$dir.$file,LOG_ERR);
+ dolibarr_install_syslog("step2: failed to open file " . $dir . $file, LOG_ERR);
}
}
@@ -257,7 +258,7 @@ if ($action == "set")
else
{
print '<tr><td>'.$langs->trans("ErrorFailedToFindSomeFiles",$dir).'</td><td><img src="../theme/eldy/img/error.png" alt="Error"></td></tr>';
- dolibarr_install_syslog("Failed to find files to create database in directory ".$dir,LOG_ERR);
+ dolibarr_install_syslog("step2: failed to find files to create database in directory " . $dir, LOG_ERR);
}
}
@@ -275,7 +276,7 @@ if ($action == "set")
$okkeys = 0;
$handle=opendir($dir);
- dolibarr_install_syslog("Open keys directory ".$dir." handle=".$handle,LOG_DEBUG);
+ dolibarr_install_syslog("step2: open keys directory " . $dir . " handle=" . $handle);
$tablefound = 0;
$tabledata=array();
if (is_resource($handle))
@@ -354,7 +355,7 @@ if ($action == "set")
//print "<tr><td>Creation des cles et index de la table $name: '$buffer'</td>";
$requestnb++;
- dolibarr_install_syslog("Request: ".$buffer,LOG_DEBUG);
+ dolibarr_install_syslog("step2: request: " . $buffer);
$resql=$db->query($buffer,0,'dml');
if ($resql)
{
@@ -390,7 +391,7 @@ if ($action == "set")
print "</td>";
print '<td><font class="error">'.$langs->trans("Error")." Failed to open file ".$dir.$file."</font></td></tr>";
$error++;
- dolibarr_install_syslog("Failed to open file ".$dir.$file,LOG_ERR);
+ dolibarr_install_syslog("step2: failed to open file " . $dir . $file, LOG_ERR);
}
}
@@ -421,7 +422,7 @@ if ($action == "set")
if (file_exists($dir.$file))
{
$fp = fopen($dir.$file,"r");
- dolibarr_install_syslog("Open function file ".$dir.$file." handle=".$fp,LOG_DEBUG);
+ dolibarr_install_syslog("step2: open function file " . $dir . $file . " handle=" . $fp);
if ($fp)
{
$buffer='';
@@ -444,7 +445,7 @@ if ($action == "set")
$buffer=trim($buffer);
if ($buffer)
{
- dolibarr_install_syslog("Request: ".$buffer,LOG_DEBUG);
+ dolibarr_install_syslog("step2: request: " . $buffer);
print "<!-- Insert line : ".$buffer."<br>-->\n";
$resql=$db->query($buffer,0,'dml');
if ($resql)
@@ -500,7 +501,7 @@ if ($action == "set")
// Insert data
$handle=opendir($dir);
- dolibarr_install_syslog("Open directory data ".$dir." handle=".$handle,LOG_DEBUG);
+ dolibarr_install_syslog("step2: open directory data " . $dir . " handle=" . $handle);
$tablefound = 0;
$tabledata=array();
if (is_resource($handle))
@@ -526,7 +527,7 @@ if ($action == "set")
{
$name = substr($file, 0, dol_strlen($file) - 4);
$fp = fopen($dir.$file,"r");
- dolibarr_install_syslog("Open data file ".$dir.$file." handle=".$fp,LOG_DEBUG);
+ dolibarr_install_syslog("step2: open data file " . $dir . $file . " handle=" . $fp);
if ($fp)
{
$arrayofrequests=array();
@@ -555,7 +556,7 @@ if ($action == "set")
}
fclose($fp);
- dolibarr_install_syslog("Found ".$linefound." records, defined ".count($arrayofrequests)." group(s).",LOG_DEBUG);
+ dolibarr_install_syslog("step2: found " . $linefound . " records, defined " . count($arrayofrequests) . " group(s).");
$okallfile=1;
$db->begin();
@@ -569,7 +570,7 @@ if ($action == "set")
$buffer=preg_replace('/llx_/i',$dolibarr_main_db_prefix,$buffer);
}
- //dolibarr_install_syslog("Request: ".$buffer,LOG_DEBUG);
+ //dolibarr_install_syslog("step2: request: " . $buffer);
$resql=$db->query($buffer,1);
if ($resql)
{
@@ -613,7 +614,7 @@ else
print 'Parameter action=set not defined';
}
-dolibarr_install_syslog("--- install/etape2.php end", LOG_INFO);
+dolibarr_install_syslog("--- step2: end");
pFooter(!$ok,$setuplang);
diff --git a/htdocs/install/etape4.php b/htdocs/install/step4.php
similarity index 92%
rename from htdocs/install/etape4.php
rename to htdocs/install/step4.php
index fc4f47f4611d09e6279e5941d6188979f431d6ff..5952080f475f93deda81eab1d8921b17891e1e63 100644
--- a/htdocs/install/etape4.php
+++ b/htdocs/install/step4.php
@@ -3,6 +3,7 @@
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
* Copyright (C) 2004 Sebastien DiCintio <sdicintio@ressource-toi.org>
* Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2015 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -19,7 +20,7 @@
*/
/**
- * \file htdocs/install/etape4.php
+ * \file htdocs/install/step4.php
* \ingroup install
* \brief Ask login and password of Dolibarr admin user
*/
@@ -42,7 +43,7 @@ $forcedfile="./install.forced.php";
if ($conffile == "/etc/dolibarr/conf.php") $forcedfile="/etc/dolibarr/install.forced.php";
if (@file_exists($forcedfile)) { $useforcedwizard=true; include_once $forcedfile; }
-dolibarr_install_syslog("--- etape4: Entering etape4.php page");
+dolibarr_install_syslog("--- step4: entering step4.php page");
$err=0;
$ok = 0;
@@ -53,7 +54,7 @@ $ok = 0;
* View
*/
-pHeader($langs->trans("AdminAccountCreation"),"etape5");
+pHeader($langs->trans("AdminAccountCreation"),"step5");
// Test if we can run a first install process
if (! is_writable($conffile))
@@ -106,7 +107,7 @@ if ($db->ok)
}
-dolibarr_install_syslog("--- install/etape4.php end", LOG_INFO);
+dolibarr_install_syslog("--- step4: end");
pFooter($err,$setuplang);
diff --git a/htdocs/install/etape5.php b/htdocs/install/step5.php
similarity index 86%
rename from htdocs/install/etape5.php
rename to htdocs/install/step5.php
index da871508176e7c447c0a534a473d817dcb80dcc2..2651c45c05c275bfd8a5e01738654330ab909530 100644
--- a/htdocs/install/etape5.php
+++ b/htdocs/install/step5.php
@@ -1,9 +1,10 @@
<?php
-/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2012 Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
- * Copyright (C) 2004 Sebastien DiCintio <sdicintio@ressource-toi.org>
- * Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
+/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2012 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
+ * Copyright (C) 2004 Sebastien DiCintio <sdicintio@ressource-toi.org>
+ * Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
+ * Copyright (C) 2015 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -20,8 +21,8 @@
*/
/**
- * \file htdocs/install/etape5.php
- * \ingroup install
+ * \file htdocs/install/step5.php
+ * \ingroup install
* \brief Last page of upgrade or install process
*/
@@ -68,7 +69,7 @@ $forcedfile="./install.forced.php";
if ($conffile == "/etc/dolibarr/conf.php") $forcedfile="/etc/dolibarr/install.forced.php";
if (@file_exists($forcedfile)) { $useforcedwizard=true; include_once $forcedfile; }
-dolibarr_install_syslog("--- etape5: Entering etape5.php page", LOG_INFO);
+dolibarr_install_syslog("--- step5: entering step5.php page");
/*
@@ -80,19 +81,19 @@ if ($action == "set")
{
if ($_POST["pass"] <> $_POST["pass_verif"])
{
- header("Location: etape4.php?error=1&selectlang=$setuplang".(isset($_POST["login"])?'&login='.$_POST["login"]:''));
+ header("Location: step4.php?error=1&selectlang=$setuplang".(isset($_POST["login"])?'&login='.$_POST["login"]:''));
exit;
}
if (dol_strlen(trim($_POST["pass"])) == 0)
{
- header("Location: etape4.php?error=2&selectlang=$setuplang".(isset($_POST["login"])?'&login='.$_POST["login"]:''));
+ header("Location: step4.php?error=2&selectlang=$setuplang".(isset($_POST["login"])?'&login='.$_POST["login"]:''));
exit;
}
if (dol_strlen(trim($_POST["login"])) == 0)
{
- header("Location: etape4.php?error=3&selectlang=$setuplang".(isset($_POST["login"])?'&login='.$_POST["login"]:''));
+ header("Location: step4.php?error=3&selectlang=$setuplang".(isset($_POST["login"])?'&login='.$_POST["login"]:''));
exit;
}
}
@@ -102,7 +103,7 @@ if ($action == "set")
* View
*/
-pHeader($langs->trans("SetupEnd"),"etape5");
+pHeader($langs->trans("SetupEnd"),"step5");
print '<br>';
// Test if we can run a first install process
@@ -153,7 +154,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action))
// Active module user
$modName='modUser';
$file = $modName . ".class.php";
- dolibarr_install_syslog('install/etape5.php Load module user '.DOL_DOCUMENT_ROOT ."/core/modules/".$file, LOG_INFO);
+ dolibarr_install_syslog('step5: load module user ' . DOL_DOCUMENT_ROOT . "/core/modules/" . $file, LOG_INFO);
include_once DOL_DOCUMENT_ROOT ."/core/modules/".$file;
$objMod = new $modName($db);
$result=$objMod->init();
@@ -188,13 +189,13 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action))
{
if ($newuser->error == 'ErrorLoginAlreadyExists')
{
- dolibarr_install_syslog('install/etape5.php AdminLoginAlreadyExists', LOG_WARNING);
+ dolibarr_install_syslog('step5: AdminLoginAlreadyExists', LOG_WARNING);
print '<br><div class="warning">'.$langs->trans("AdminLoginAlreadyExists",$_POST["login"])."</div><br>";
$success = 1;
}
else
{
- dolibarr_install_syslog('install/etape5.php FailedToCreateAdminLogin '.$newuser->error, LOG_ERR);
+ dolibarr_install_syslog('step5: FailedToCreateAdminLogin ' . $newuser->error, LOG_ERR);
print '<br><div class="error">'.$langs->trans("FailedToCreateAdminLogin").' '.$newuser->error.'</div><br><br>';
}
}
@@ -203,7 +204,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action))
{
$db->begin();
- dolibarr_install_syslog('install/etape5.php set MAIN_VERSION_LAST_INSTALL const to '.$targetversion, LOG_DEBUG);
+ dolibarr_install_syslog('step5: set MAIN_VERSION_LAST_INSTALL const to ' . $targetversion, LOG_DEBUG);
$resql=$db->query("DELETE FROM ".MAIN_DB_PREFIX."const WHERE ".$db->decrypt('name')."='MAIN_VERSION_LAST_INSTALL'");
if (! $resql) dol_print_error($db,'Error in setup program');
$resql=$db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) values(".$db->encrypt('MAIN_VERSION_LAST_INSTALL',1).",".$db->encrypt($targetversion,1).",'chaine',0,'Dolibarr version when install',0)");
@@ -212,7 +213,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action))
if ($useforcedwizard)
{
- dolibarr_install_syslog('install/etape5.php set MAIN_REMOVE_INSTALL_WARNING const to 1', LOG_DEBUG);
+ dolibarr_install_syslog('step5: set MAIN_REMOVE_INSTALL_WARNING const to 1', LOG_DEBUG);
$resql=$db->query("DELETE FROM ".MAIN_DB_PREFIX."const WHERE ".$db->decrypt('name')."='MAIN_REMOVE_INSTALL_WARNING'");
if (! $resql) dol_print_error($db,'Error in setup program');
$resql=$db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) values(".$db->encrypt('MAIN_REMOVE_INSTALL_WARNING',1).",".$db->encrypt(1,1).",'chaine',1,'Disable install warnings',0)");
@@ -232,7 +233,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action))
print $langs->trans("ActivateModule",$modtoactivatenew).'<br>';
$file=$modtoactivatenew.'.class.php';
- dolibarr_install_syslog('install/etape5.php Activate module file='.$file);
+ dolibarr_install_syslog('step5: activate module file=' . $file);
$res=dol_include_once("/core/modules/".$file);
$res=activateModule($modtoactivatenew,1);
@@ -240,7 +241,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action))
}
}
- dolibarr_install_syslog('install/etape5.php Remove MAIN_NOT_INSTALLED const', LOG_DEBUG);
+ dolibarr_install_syslog('step5: remove MAIN_NOT_INSTALLED const');
$resql=$db->query("DELETE FROM ".MAIN_DB_PREFIX."const WHERE ".$db->decrypt('name')."='MAIN_NOT_INSTALLED'");
if (! $resql) dol_print_error($db,'Error in setup program');
@@ -271,7 +272,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action))
if ($tagdatabase)
{
- dolibarr_install_syslog('install/etape5.php set MAIN_VERSION_LAST_UPGRADE const to value '.$targetversion, LOG_DEBUG);
+ dolibarr_install_syslog('step5: set MAIN_VERSION_LAST_UPGRADE const to value ' . $targetversion);
$resql=$db->query("DELETE FROM ".MAIN_DB_PREFIX."const WHERE ".$db->decrypt('name')."='MAIN_VERSION_LAST_UPGRADE'");
if (! $resql) dol_print_error($db,'Error in setup program');
$resql=$db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) VALUES (".$db->encrypt('MAIN_VERSION_LAST_UPGRADE',1).",".$db->encrypt($targetversion,1).",'chaine',0,'Dolibarr version for last upgrade',0)");
@@ -280,7 +281,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action))
}
else
{
- dolibarr_install_syslog('install/etape5.php We run an upgrade to version '.$targetversion.' but database was already upgraded to '.$conf->global->MAIN_VERSION_LAST_UPGRADE.'. We keep MAIN_VERSION_LAST_UPGRADE as it is.', LOG_DEBUG);
+ dolibarr_install_syslog('step5: we run an upgrade to version ' . $targetversion . ' but database was already upgraded to ' . $conf->global->MAIN_VERSION_LAST_UPGRADE . '. We keep MAIN_VERSION_LAST_UPGRADE as it is.');
}
}
else
@@ -290,7 +291,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action))
}
else
{
- dol_print_error('','install/etape5.php Unknown choice of action');
+ dol_print_error('','step5.php: unknown choice of action');
}
// May fail if parameter already defined
@@ -404,7 +405,7 @@ elseif (empty($action) || preg_match('/upgrade/i',$action))
}
else
{
- dol_print_error('','install/etape5.php Unknown choice of action');
+ dol_print_error('','step5.php: unknown choice of action');
}
@@ -413,6 +414,6 @@ else
clearstatcache();
-dolibarr_install_syslog("--- install/etape5.php Dolibarr setup finished", LOG_INFO);
+dolibarr_install_syslog("--- step5: Dolibarr setup finished");
pFooter(1,$setuplang);
diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php
index 9c2832f36233af6fe74a423943e911efe6ed7691..7c9cc7fd325c386eaf91ce7eb5f147a74d508ba0 100644
--- a/htdocs/install/upgrade.php
+++ b/htdocs/install/upgrade.php
@@ -2,6 +2,7 @@
/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2010 Regis Houssin <regis.houssin@capnetworks.com>
+ * Copyright (C) 2015 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -41,7 +42,7 @@ require_once $conffile; if (! isset($dolibarr_main_db_type)) $dolibarr_main_db_t
require_once $dolibarr_main_document_root.'/core/lib/admin.lib.php';
$grant_query='';
-$etape = 2;
+$step = 2;
$ok = 0;
@@ -70,8 +71,8 @@ if ($dolibarr_main_db_type == "pgsql") $choix=2;
if ($dolibarr_main_db_type == "mssql") $choix=3;
-dolibarr_install_syslog("upgrade: Entering upgrade.php page");
-if (! is_object($conf)) dolibarr_install_syslog("upgrade2: conf file not initialized",LOG_ERR);
+dolibarr_install_syslog("--- upgrade: Entering upgrade.php page");
+if (! is_object($conf)) dolibarr_install_syslog("upgrade2: conf file not initialized", LOG_ERR);
/*
@@ -145,13 +146,13 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
{
print '<tr><td class="nowrap">';
print $langs->trans("ServerConnection")." : $dolibarr_main_db_host</td><td align=\"right\">".$langs->trans("OK")."</td></tr>\n";
- dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ServerConnection")." : $dolibarr_main_db_host ".$langs->transnoentities("OK"));
+ dolibarr_install_syslog("upgrade: " . $langs->transnoentities("ServerConnection") . ": $dolibarr_main_db_host " . $langs->transnoentities("OK"));
$ok = 1;
}
else
{
print "<tr><td>".$langs->trans("ErrorFailedToConnectToDatabase",$dolibarr_main_db_name)."</td><td align=\"right\">".$langs->transnoentities("Error")."</td></tr>\n";
- dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ErrorFailedToConnectToDatabase",$dolibarr_main_db_name));
+ dolibarr_install_syslog("upgrade: " . $langs->transnoentities("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name));
$ok = 0;
}
@@ -161,13 +162,13 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
{
print '<tr><td class="nowrap">';
print $langs->trans("DatabaseConnection")." : ".$dolibarr_main_db_name."</td><td align=\"right\">".$langs->trans("OK")."</td></tr>\n";
- dolibarr_install_syslog("upgrade: Database connection successfull : $dolibarr_main_db_name");
+ dolibarr_install_syslog("upgrade: Database connection successful: " . $dolibarr_main_db_name);
$ok=1;
}
else
{
print "<tr><td>".$langs->trans("ErrorFailedToConnectToDatabase",$dolibarr_main_db_name)."</td><td align=\"right\">".$langs->trans("Error")."</td></tr>\n";
- dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ErrorFailedToConnectToDatabase",$dolibarr_main_db_name));
+ dolibarr_install_syslog("upgrade: " . $langs->transnoentities("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name));
$ok=0;
}
}
@@ -179,7 +180,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
$versionarray=$db->getVersionArray();
print '<tr><td>'.$langs->trans("ServerVersion").'</td>';
print '<td align="right">'.$version.'</td></tr>';
- dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ServerVersion")." : $version");
+ dolibarr_install_syslog("upgrade: " . $langs->transnoentities("ServerVersion") . ": " .$version);
// Test database version requirement
$versionmindb=$db::VERSIONMIN;
@@ -189,7 +190,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
{
// Warning: database version too low.
print "<tr><td>".$langs->trans("ErrorDatabaseVersionTooLow",join('.',$versionarray),join('.',$versionmindb))."</td><td align=\"right\">".$langs->trans("Error")."</td></tr>\n";
- dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ErrorDatabaseVersionTooLow",join('.',$versionarray),join('.',$versionmindb)));
+ dolibarr_install_syslog("upgrade: " . $langs->transnoentities("ErrorDatabaseVersionTooLow", join('.', $versionarray), join('.', $versionmindb)));
$ok=0;
}
@@ -216,7 +217,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
{
// Warning: database version too low.
print '<tr><td><div class="warning">'.$langs->trans("ErrorDatabaseVersionForbiddenForMigration",join('.',$versionarray),$listofforbiddenversion)."</div></td><td align=\"right\">".$langs->trans("Error")."</td></tr>\n";
- dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ErrorDatabaseVersionForbiddenForMigration",join('.',$versionarray),$listofforbiddenversion));
+ dolibarr_install_syslog("upgrade: " . $langs->transnoentities("ErrorDatabaseVersionForbiddenForMigration", join('.', $versionarray), $listofforbiddenversion));
$ok=0;
break;
}
@@ -246,7 +247,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
$filles=array();
$sql = "SELECT fk_categorie_mere, fk_categorie_fille";
$sql.= " FROM ".MAIN_DB_PREFIX."categorie_association";
- dolibarr_install_syslog("upgrade: search duplicate", LOG_DEBUG);
+ dolibarr_install_syslog("upgrade: search duplicate");
$resql = $db->query($sql);
if ($resql)
{
@@ -263,7 +264,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
}
}
- dolibarr_install_syslog("upgrade: result is num=".$num." count(couples)=".count($couples));
+ dolibarr_install_syslog("upgrade: result is num=" . $num . " count(couples)=" . count($couples));
// If there is duplicates couples or child with two parents
if (count($couples) > 0 && $num > count($couples))
@@ -274,7 +275,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
// We delete all
$sql="DELETE FROM ".MAIN_DB_PREFIX."categorie_association";
- dolibarr_install_syslog("upgrade: delete association", LOG_DEBUG);
+ dolibarr_install_syslog("upgrade: delete association");
$resqld=$db->query($sql);
if ($resqld)
{
@@ -283,7 +284,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
{
$sql ="INSERT INTO ".MAIN_DB_PREFIX."categorie_association(fk_categorie_mere,fk_categorie_fille)";
$sql.=" VALUES(".$val['mere'].", ".$val['fille'].")";
- dolibarr_install_syslog("upgrade: insert association", LOG_DEBUG);
+ dolibarr_install_syslog("upgrade: insert association");
$resqli=$db->query($sql);
if (! $resqli) $error++;
}
@@ -481,6 +482,7 @@ $ret=0;
if (! $ok && isset($argv[1])) $ret=1;
dol_syslog("Exit ".$ret);
+dolibarr_install_syslog("--- upgrade: end");
pFooter(((! $ok && empty($_GET["ignoreerrors"])) || $dirmodule),$setuplang);
if ($db->connected) $db->close();
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 7b5f299d7580c404d5573344d1ab7239cf78ee5d..214a6c54fbfdc626d32ead892a9c55a9395e585e 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -3,6 +3,7 @@
* Copyright (C) 2005-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2011 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
+ * Copyright (C) 2015 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -47,7 +48,7 @@ require_once $dolibarr_main_document_root . '/core/class/menubase.class.php';
require_once $dolibarr_main_document_root . '/core/lib/files.lib.php';
$grant_query='';
-$etape = 2;
+$step = 2;
$error = 0;
@@ -74,8 +75,8 @@ if ($dolibarr_main_db_type == 'pgsql') $choix=2;
if ($dolibarr_main_db_type == 'mssql') $choix=3;
-dolibarr_install_syslog("upgrade2: Entering upgrade2.php page");
-if (! is_object($conf)) dolibarr_install_syslog("upgrade2: conf file not initialized",LOG_ERR);
+dolibarr_install_syslog("--- upgrade2: entering upgrade2.php page");
+if (! is_object($conf)) dolibarr_install_syslog("upgrade2: conf file not initialized", LOG_ERR);
@@ -98,7 +99,7 @@ if (! $versionfrom && ! $versionto)
exit;
}
-pHeader('','etape5',GETPOST("action")?GETPOST("action"):'upgrade','versionfrom='.$versionfrom.'&versionto='.$versionto);
+pHeader('','step5',GETPOST("action")?GETPOST("action"):'upgrade','versionfrom='.$versionfrom.'&versionto='.$versionto);
if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
@@ -137,7 +138,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
if (!$db->connected)
{
print '<tr><td colspan="4">'.$langs->trans("ErrorFailedToConnectToDatabase",$conf->db->name).'</td><td align="right">'.$langs->trans('Error').'</td></tr>';
- dolibarr_install_syslog('upgrade2: Failed to connect to database : '.$conf->db->name.' on '.$conf->db->host.' for user '.$conf->db->user, LOG_ERR);
+ dolibarr_install_syslog('upgrade2: failed to connect to database :' . $conf->db->name . ' on ' . $conf->db->host . ' for user ' . $conf->db->user, LOG_ERR);
$error++;
}
@@ -145,7 +146,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
{
if($db->database_selected)
{
- dolibarr_install_syslog('upgrade2: Database connection successfull : '.$dolibarr_main_db_name);
+ dolibarr_install_syslog('upgrade2: database connection successful :' . $dolibarr_main_db_name);
}
else
{
@@ -421,6 +422,7 @@ $ret=0;
if ($error && isset($argv[1])) $ret=1;
dol_syslog("Exit ".$ret);
+dolibarr_install_syslog("--- upgrade2: end");
pFooter($error,$setuplang);
if ($db->connected) $db->close();
@@ -455,7 +457,7 @@ function migrate_paiements($db,$langs,$conf)
$resql = $db->query($sql);
- dolibarr_install_syslog("upgrade2::migrate_paiements", LOG_DEBUG);
+ dolibarr_install_syslog("upgrade2::migrate_paiements");
if ($resql)
{
$i = 0;
@@ -555,7 +557,7 @@ function migrate_paiements_orphelins_1($db,$langs,$conf)
$resql = $db->query($sql);
- dolibarr_install_syslog("upgrade2::migrate_paiements_orphelins_1", LOG_DEBUG);
+ dolibarr_install_syslog("upgrade2::migrate_paiements_orphelins_1");
$row = array();
if ($resql)
{
@@ -681,7 +683,7 @@ function migrate_paiements_orphelins_2($db,$langs,$conf)
$resql = $db->query($sql);
- dolibarr_install_syslog("upgrade2::migrate_paiements_orphelins_2", LOG_DEBUG);
+ dolibarr_install_syslog("upgrade2::migrate_paiements_orphelins_2");
$row = array();
if ($resql)
{
@@ -821,7 +823,7 @@ function migrate_contracts_det($db,$langs,$conf)
$sql.= " WHERE cd.rowid IS NULL AND p.rowid IS NOT NULL";
$resql = $db->query($sql);
- dolibarr_install_syslog("upgrade2::migrate_contracts_det", LOG_DEBUG);
+ dolibarr_install_syslog("upgrade2::migrate_contracts_det");
if ($resql)
{
$i = 0;
@@ -917,7 +919,7 @@ function migrate_links_transfert($db,$langs,$conf)
$sql.= " AND bu.fk_bank IS NULL";
$resql = $db->query($sql);
- dolibarr_install_syslog("upgrade2::migrate_links_transfert", LOG_DEBUG);
+ dolibarr_install_syslog("upgrade2::migrate_links_transfert");
if ($resql)
{
$i = 0;
@@ -941,7 +943,7 @@ function migrate_links_transfert($db,$langs,$conf)
$sql.= ")";
print $sql.'<br>';
- dolibarr_install_syslog("migrate_links_transfert", LOG_DEBUG);
+ dolibarr_install_syslog("migrate_links_transfert");
if (! $db->query($sql))
{
@@ -992,7 +994,7 @@ function migrate_contracts_date1($db,$langs,$conf)
print '<b>'.$langs->trans('MigrationContractsEmptyDatesUpdate')."</b><br>\n";
$sql="update llx_contrat set date_contrat=tms where date_contrat is null";
- dolibarr_install_syslog("upgrade2::migrate_contracts_date1", LOG_DEBUG);
+ dolibarr_install_syslog("upgrade2::migrate_contracts_date1");
$resql = $db->query($sql);
if (! $resql) dol_print_error($db);
if ($db->affected_rows($resql) > 0)
@@ -1001,7 +1003,7 @@ function migrate_contracts_date1($db,$langs,$conf)
print $langs->trans('MigrationContractsEmptyDatesNothingToUpdate')."<br>\n";
$sql="update llx_contrat set datec=tms where datec is null";
- dolibarr_install_syslog("upgrade2::migrate_contracts_date1", LOG_DEBUG);
+ dolibarr_install_syslog("upgrade2::migrate_contracts_date1");
$resql = $db->query($sql);
if (! $resql) dol_print_error($db);
if ($db->affected_rows($resql) > 0)
@@ -1031,7 +1033,7 @@ function migrate_contracts_date2($db,$langs,$conf)
$sql.= " GROUP BY c.rowid, c.date_contrat";
$resql = $db->query($sql);
- dolibarr_install_syslog("upgrade2::migrate_contracts_date2", LOG_DEBUG);
+ dolibarr_install_syslog("upgrade2::migrate_contracts_date2");
if ($resql)
{
$i = 0;
@@ -1092,7 +1094,7 @@ function migrate_contracts_date3($db,$langs,$conf)
print '<b>'.$langs->trans('MigrationContractsIncoherentCreationDateUpdate')."</b><br>\n";
$sql="update llx_contrat set datec=date_contrat where datec is null or datec > date_contrat";
- dolibarr_install_syslog("upgrade2::migrate_contracts_date3", LOG_DEBUG);
+ dolibarr_install_syslog("upgrade2::migrate_contracts_date3");
$resql = $db->query($sql);
if (! $resql) dol_print_error($db);
if ($db->affected_rows($resql) > 0)
@@ -1120,7 +1122,7 @@ function migrate_contracts_open($db,$langs,$conf)
$sql = "SELECT c.rowid as cref FROM llx_contrat as c, llx_contratdet as cd";
$sql.= " WHERE cd.statut = 4 AND c.statut=2 AND c.rowid=cd.fk_contrat";
- dolibarr_install_syslog("upgrade2::migrate_contracts_open", LOG_DEBUG);
+ dolibarr_install_syslog("upgrade2::migrate_contracts_open");
$resql = $db->query($sql);
if (! $resql) dol_print_error($db);
if ($db->affected_rows($resql) > 0) {
@@ -1190,7 +1192,7 @@ function migrate_paiementfourn_facturefourn($db,$langs,$conf)
$select_sql.= ' FROM '.MAIN_DB_PREFIX.'paiementfourn';
$select_sql.= ' WHERE fk_facture_fourn IS NOT NULL';
- dolibarr_install_syslog("upgrade2::migrate_paiementfourn_facturefourn", LOG_DEBUG);
+ dolibarr_install_syslog("upgrade2::migrate_paiementfourn_facturefourn");
$select_resql = $db->query($select_sql);
if ($select_resql)
{
@@ -1306,7 +1308,7 @@ function migrate_price_facture($db,$langs,$conf)
$sql.= " AND (((fd.total_ttc = 0 AND fd.remise_percent != 100) or fd.total_ttc IS NULL) or f.total_ttc IS NULL)";
//print $sql;
- dolibarr_install_syslog("upgrade2::migrate_price_facture", LOG_DEBUG);
+ dolibarr_install_syslog("upgrade2::migrate_price_facture");
$resql=$db->query($sql);
if ($resql)
{
@@ -1340,7 +1342,7 @@ function migrate_price_facture($db,$langs,$conf)
$facligne->total_tva = $total_tva;
$facligne->total_ttc = $total_ttc;
- dolibarr_install_syslog("upgrade2: Line $rowid: facid=$obj->facid pu=$pu qty=$qty vatrate=$vatrate 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 . " vatrate=" . $vatrate . " remise_percent=" . $remise_percent . " remise_global=" . $remise_percent_global . " -> " . $total_ht . ", " . $total_tva . ", " . $total_ttc);
print ". ";
$facligne->update_total();
@@ -1419,7 +1421,7 @@ function migrate_price_propal($db,$langs,$conf)
$sql.= " WHERE pd.fk_propal = p.rowid";
$sql.= " AND ((pd.total_ttc = 0 AND pd.remise_percent != 100) or pd.total_ttc IS NULL)";
- dolibarr_install_syslog("upgrade2::migrate_price_propal", LOG_DEBUG);
+ dolibarr_install_syslog("upgrade2::migrate_price_propal");
$resql=$db->query($sql);
if ($resql)
{
@@ -1452,7 +1454,7 @@ function migrate_price_propal($db,$langs,$conf)
$propalligne->total_tva = $total_tva;
$propalligne->total_ttc = $total_ttc;
- dolibarr_install_syslog("upgrade2: Line $rowid: propalid=$obj->rowid pu=$pu qty=$qty vatrate=$vatrate 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 . " vatrate=" . $vatrate . " remise_percent=" . $remise_percent . " remise_global=" . $remise_percent_global . " -> " . $total_ht . ", " . $total_tva. ", " . $total_ttc);
print ". ";
$propalligne->update_total();
@@ -1528,7 +1530,7 @@ function migrate_price_contrat($db,$langs,$conf)
$sql.= " WHERE cd.fk_contrat = c.rowid";
$sql.= " AND ((cd.total_ttc = 0 AND cd.remise_percent != 100 AND cd.subprice > 0) or cd.total_ttc IS NULL)";
- dolibarr_install_syslog("upgrade2::migrate_price_contrat", LOG_DEBUG);
+ dolibarr_install_syslog("upgrade2::migrate_price_contrat");
$resql=$db->query($sql);
if ($resql)
{
@@ -1561,7 +1563,7 @@ function migrate_price_contrat($db,$langs,$conf)
$contratligne->total_tva = $total_tva;
$contratligne->total_ttc = $total_ttc;
- dolibarr_install_syslog("upgrade2: Line $rowid: contratdetid=$obj->rowid pu=$pu qty=$qty vatrate=$vatrate remise_percent=$remise_percent -> $total_ht, $total_tva, $total_ttc");
+ dolibarr_install_syslog("upgrade2: Line " . $rowid . ": contratdetid=" . $obj->rowid . " pu=" . $pu . " qty=" . $qty . " vatrate=" . $vatrate . " remise_percent=" . $remise_percent. " -> " . $total_ht . ", " . $total_tva. " , " . $total_ttc);
print ". ";
$contratligne->update_total();
@@ -1613,7 +1615,7 @@ function migrate_price_commande($db,$langs,$conf)
$sql.= " WHERE cd.fk_commande = c.rowid";
$sql.= " AND ((cd.total_ttc = 0 AND cd.remise_percent != 100) or cd.total_ttc IS NULL)";
- dolibarr_install_syslog("upgrade2::migrate_price_commande", LOG_DEBUG);
+ dolibarr_install_syslog("upgrade2::migrate_price_commande");
$resql=$db->query($sql);
if ($resql)
{
@@ -1646,7 +1648,7 @@ function migrate_price_commande($db,$langs,$conf)
$commandeligne->total_tva = $total_tva;
$commandeligne->total_ttc = $total_ttc;
- dolibarr_install_syslog("upgrade2: Line $rowid: commandeid=$obj->rowid pu=$pu qty=$qty vatrate=$vatrate 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 . " vatrate=" . $vatrate . " remise_percent=" . $remise_percent . " remise_global=" . $remise_percent_global. " -> " . $total_ht . ", " . $total_tva . ", " . $total_ttc);
print ". ";
$commandeligne->update_total();
@@ -1727,7 +1729,7 @@ function migrate_price_commande_fournisseur($db,$langs,$conf)
$sql.= " WHERE cd.fk_commande = c.rowid";
$sql.= " AND ((cd.total_ttc = 0 AND cd.remise_percent != 100) or cd.total_ttc IS NULL)";
- dolibarr_install_syslog("upgrade2::migrate_price_commande_fournisseur", LOG_DEBUG);
+ dolibarr_install_syslog("upgrade2::migrate_price_commande_fournisseur");
$resql=$db->query($sql);
if ($resql)
{
@@ -1760,7 +1762,7 @@ function migrate_price_commande_fournisseur($db,$langs,$conf)
$commandeligne->total_tva = $total_tva;
$commandeligne->total_ttc = $total_ttc;
- dolibarr_install_syslog("upgrade2: Line $rowid: commandeid=$obj->rowid pu=$pu qty=$qty vatrate=$vatrate 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 . " vatrate=" . $vatrate . " remise_percent=" . $remise_percent . " remise_global=" . $remise_percent_global . " -> " . $total_ht . ", " . $total_tva . ", " . $total_ttc);
print ". ";
$commandeligne->update_total();
@@ -2448,7 +2450,7 @@ function migrate_restore_missing_links($db,$langs,$conf)
$sql.= " (SELECT t2.rowid FROM ".MAIN_DB_PREFIX.$table2." as t2";
$sql.= " WHERE t1.rowid = t2.".$field2.")";
- dolibarr_install_syslog("upgrade2:migrate_restore_missing_links DIRECTION 1", LOG_DEBUG);
+ dolibarr_install_syslog("upgrade2::migrate_restore_missing_links DIRECTION 1");
$resql = $db->query($sql);
if ($resql)
{
@@ -2514,7 +2516,7 @@ function migrate_restore_missing_links($db,$langs,$conf)
$sql.= " (SELECT t2.rowid FROM ".MAIN_DB_PREFIX.$table2." as t2";
$sql.= " WHERE t1.rowid = t2.".$field2.")";
- dolibarr_install_syslog("upgrade2:migrate_restore_missing_links DIRECTION 2", LOG_DEBUG);
+ dolibarr_install_syslog("upgrade2::migrate_restore_missing_links DIRECTION 2");
$resql = $db->query($sql);
if ($resql)
{
@@ -2779,7 +2781,7 @@ function migrate_relationship_tables($db,$langs,$conf,$table,$fk_source,$sourcet
if ($db->DDLInfoTable(MAIN_DB_PREFIX.$table))
{
- dolibarr_install_syslog("upgrade2::migrate_relationship_tables table = ".MAIN_DB_PREFIX.$table);
+ dolibarr_install_syslog("upgrade2::migrate_relationship_tables table = " . MAIN_DB_PREFIX . $table);
$db->begin();
@@ -3304,7 +3306,7 @@ function migrate_actioncomm_element($db,$langs,$conf)
$obj = $db->fetch_object($result);
if ($obj)
{
- dolibarr_install_syslog("upgrade2::migrate_actioncomm_element field=".$field);
+ dolibarr_install_syslog("upgrade2::migrate_actioncomm_element field=" . $field);
$db->begin();
@@ -3367,7 +3369,7 @@ function migrate_mode_reglement($db,$langs,$conf)
{
$error=0;
- dolibarr_install_syslog("upgrade2::migrate_mode_reglement code=".$elements['code'][$key]);
+ dolibarr_install_syslog("upgrade2::migrate_mode_reglement code=" . $elements['code'][$key]);
$sqlSelect = "SELECT id";
$sqlSelect.= " FROM ".MAIN_DB_PREFIX."c_paiement";
@@ -3624,7 +3626,7 @@ function migrate_directories($db,$langs,$conf,$oldname,$newname)
if (is_dir(DOL_DATA_ROOT.$oldname) && ! file_exists(DOL_DATA_ROOT.$newname))
{
- dolibarr_install_syslog("upgrade2::migrate_directories move ".DOL_DATA_ROOT.$oldname.' into '.DOL_DATA_ROOT.$newname);
+ dolibarr_install_syslog("upgrade2::migrate_directories move " . DOL_DATA_ROOT . $oldname . ' into ' . DOL_DATA_ROOT . $newname);
@rename(DOL_DATA_ROOT.$oldname,DOL_DATA_ROOT.$newname);
}
}
@@ -3774,7 +3776,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
if ($moduletoreload == 'MAIN_MODULE_AGENDA')
{
- dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Agenda");
+ dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Agenda module");
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modAgenda.class.php';
if ($res) {
$mod=new modAgenda($db);
@@ -3784,7 +3786,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
}
if ($moduletoreload == 'MAIN_MODULE_BARCODE')
{
- dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Barcode");
+ dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Barcode module");
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modBarcode.class.php';
if ($res) {
$mod=new modBarcode($db);
@@ -3794,7 +3796,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
}
if ($moduletoreload == 'MAIN_MODULE_CRON')
{
- dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Cron");
+ dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Cron module");
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modCron.class.php';
if ($res) {
$mod=new modCron($db);
@@ -3804,7 +3806,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
}
if ($moduletoreload == 'MAIN_MODULE_SOCIETE')
{
- dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Societe");
+ dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Societe module");
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modSociete.class.php';
if ($res) {
$mod=new modSociete($db);
@@ -3814,7 +3816,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
}
if ($moduletoreload == 'MAIN_MODULE_PRODUIT') // Permission has changed into 2.7
{
- dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Produit");
+ dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Produit module");
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modProduct.class.php';
if ($res) {
$mod=new modProduct($db);
@@ -3824,7 +3826,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
}
if ($moduletoreload == 'MAIN_MODULE_SERVICE') // Permission has changed into 2.7
{
- dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Service");
+ dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Service module");
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modService.class.php';
if ($res) {
@@ -3835,7 +3837,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
}
if ($moduletoreload == 'MAIN_MODULE_COMMANDE') // Permission has changed into 2.9
{
- dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Commande");
+ dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Commande module");
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modCommande.class.php';
if ($res) {
@@ -3846,7 +3848,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
}
if ($moduletoreload == 'MAIN_MODULE_FACTURE') // Permission has changed into 2.9
{
- dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Facture");
+ dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Facture module");
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modFacture.class.php';
if ($res) {
$mod=new modFacture($db);
@@ -3856,7 +3858,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
}
if ($moduletoreload == 'MAIN_MODULE_FOURNISSEUR') // Permission has changed into 2.9
{
- dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Fournisseur");
+ dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Fournisseur module");
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modFournisseur.class.php';
if ($res) {
$mod=new modFournisseur($db);
@@ -3866,7 +3868,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
}
if ($moduletoreload == 'MAIN_MODULE_DEPLACEMENT') // Permission has changed into 3.0
{
- dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Deplacement");
+ dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Deplacement module");
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modDeplacement.class.php';
if ($res) {
$mod=new modDeplacement($db);
@@ -3876,7 +3878,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
}
if ($moduletoreload == 'MAIN_MODULE_DON') // Permission has changed into 3.0
{
- dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Don");
+ dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Don module");
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modDon.class.php';
if ($res) {
$mod=new modDon($db);
@@ -3886,7 +3888,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
}
if ($moduletoreload == 'MAIN_MODULE_ECM') // Permission has changed into 3.0 and 3.1
{
- dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module ECM");
+ dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate ECM module");
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modECM.class.php';
if ($res) {
$mod=new modECM($db);
@@ -3896,7 +3898,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
}
if ($moduletoreload == 'MAIN_MODULE_PAYBOX') // Permission has changed into 3.0
{
- dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Paybox");
+ dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Paybox module");
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modPaybox.class.php';
if ($res) {
$mod=new modPaybox($db);
@@ -3906,7 +3908,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
}
if ($moduletoreload == 'MAIN_MODULE_OPENSURVEY') // Permission has changed into 3.0
{
- dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Opensurvey");
+ dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Opensurvey module");
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modOpenSurvey.class.php';
if ($res) {
$mod=new modOpenSurvey($db);
@@ -3916,7 +3918,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
}
if ($moduletoreload == 'MAIN_MODULE_USER') // Permission has changed into 3.0
{
- dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module User");
+ dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate User module");
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modUser.class.php';
if ($res) {
$mod=new modUser($db);