diff --git a/htdocs/install/default.css b/htdocs/install/default.css
index f1aa9192e59..446bb06893f 100644
--- a/htdocs/install/default.css
+++ b/htdocs/install/default.css
@@ -62,7 +62,6 @@
}
body {
- font-size:14px;
font-family: roboto,arial,tahoma,verdana,helvetica;
/* background: #fcfcfc; */
margin: 15px 30px 10px;
diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php
index 00fb490161e..f57c9b982b3 100644
--- a/htdocs/install/repair.php
+++ b/htdocs/install/repair.php
@@ -29,9 +29,7 @@
*/
include_once 'inc.php';
-if (file_exists($conffile)) {
- include_once $conffile;
-}
+
/**
* @var Conf $conf
* @var Translate $langs
@@ -42,8 +40,14 @@ if (file_exists($conffile)) {
* @var string $dolibarr_main_db_name
* @var string $dolibarr_main_db_user
* @var string $dolibarr_main_db_pass
+ * @var string $dolibarr_main_db_type
+ * @var string $conffile
*/
+if (file_exists($conffile)) {
+ include_once $conffile;
+}
+
'
@phan-var-force ?string $dolibarr_main_db_encryption
@phan-var-force ?string $dolibarr_main_db_cryptkey
@@ -54,7 +58,6 @@ include_once $dolibarr_main_document_root.'/core/lib/images.lib.php';
require_once $dolibarr_main_document_root.'/core/class/extrafields.class.php';
require_once 'lib/repair.lib.php';
-$step = 2;
$ok = 0;
@@ -96,18 +99,88 @@ pHeader($langs->trans("Repair"), "upgrade2", GETPOST('action', 'aZ09'));
// Action to launch the repair script
$actiondone = 1;
+
+print '
';
+$error = 0;
+
+// If password is encoded, we decode it
+if (preg_match('/crypted:/i', $dolibarr_main_db_pass) || !empty($dolibarr_main_db_encrypted_pass)) {
+ require_once $dolibarr_main_document_root.'/core/lib/security.lib.php';
+ if (preg_match('/crypted:/i', $dolibarr_main_db_pass)) {
+ $dolibarr_main_db_pass = preg_replace('/crypted:/i', '', $dolibarr_main_db_pass);
+ $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_pass);
+ $dolibarr_main_db_encrypted_pass = $dolibarr_main_db_pass; // We need to set this as it is used to know the password was initially encrypted
+ } else {
+ $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
+ }
+}
+
+// $conf is already instancied inside inc.php
+$conf->db->type = $dolibarr_main_db_type;
+$conf->db->host = $dolibarr_main_db_host;
+$conf->db->port = $dolibarr_main_db_port;
+$conf->db->name = $dolibarr_main_db_name;
+$conf->db->user = $dolibarr_main_db_user;
+$conf->db->pass = $dolibarr_main_db_pass;
+
+// For encryption
+$conf->db->dolibarr_main_db_encryption = isset($dolibarr_main_db_encryption) ? $dolibarr_main_db_encryption : 0;
+$conf->db->dolibarr_main_db_cryptkey = isset($dolibarr_main_db_cryptkey) ? $dolibarr_main_db_cryptkey : '';
+
+$db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, (int) $conf->db->port);
+
+if ($db->connected) {
+ print '| ';
+ print $langs->trans("ServerConnection")." : $dolibarr_main_db_host | ".$langs->trans("OK")." |
";
+ dolibarr_install_syslog("repair: ".$langs->transnoentities("ServerConnection").": ".$dolibarr_main_db_host.$langs->transnoentities("OK"));
+ $ok = 1;
+} else {
+ print "| ".$langs->trans("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name)." | ".$langs->transnoentities("Error")." |
";
+ dolibarr_install_syslog("repair: ".$langs->transnoentities("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name));
+ $ok = 0;
+}
+
+if ($ok) {
+ if ($db->database_selected) {
+ print '| ';
+ print $langs->trans("DatabaseConnection")." : ".$dolibarr_main_db_name." | ".$langs->trans("OK")." |
";
+ dolibarr_install_syslog("repair: database connection successful: ".$dolibarr_main_db_name);
+ $ok = 1;
+ } else {
+ print "| ".$langs->trans("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name)." | ".$langs->trans("Error")." |
";
+ dolibarr_install_syslog("repair: ".$langs->transnoentities("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name));
+ $ok = 0;
+ }
+}
+
+// Show database version
+if ($ok) {
+ $version = $db->getVersion();
+ $versionarray = $db->getVersionArray();
+ print '| '.$langs->trans("ServerVersion").' | ';
+ print ''.$version.' |
';
+ dolibarr_install_syslog("repair: ".$langs->transnoentities("ServerVersion").": ".$version);
+ //print ''.join('.',$versionarray).' | ';
+}
+
+print '
';
+
+
+print '
';
+
+
print '';
-print 'Select a link "test" or "confirmed" to launch a reparation on the chosen option';
+print 'Select a link "test" or "confirmed" to launch a reparation on the chosen option...';
print '
';
print '
';
-print '';
+
+print '';
print '';
print '| Option | ';
print 'Information | ';
print 'Launch test | ';
print 'Launch confirmed | ';
-print 'Actual value | ';
print '
';
$warning_using_utf8mb4 = '';
@@ -212,78 +285,18 @@ foreach ($sections as $section => $options) {
print '';
print '| ' . $option . ' | ';
print '' . $info . ' | ';
- print 'test | ';
- print 'confirmed | ';
- print '' . $value . ' | ';
+ print 'test'.($value == 'test' ? ' (X)' : '').' | ';
+ print 'confirmed'.($value == 'confirmed' ? ' (X)' : '').' | ';
print '
';
}
}
print '
';
-print '
';
+
+print '
';
print '';
-$error = 0;
-// If password is encoded, we decode it
-if (preg_match('/crypted:/i', $dolibarr_main_db_pass) || !empty($dolibarr_main_db_encrypted_pass)) {
- require_once $dolibarr_main_document_root.'/core/lib/security.lib.php';
- if (preg_match('/crypted:/i', $dolibarr_main_db_pass)) {
- $dolibarr_main_db_pass = preg_replace('/crypted:/i', '', $dolibarr_main_db_pass);
- $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_pass);
- $dolibarr_main_db_encrypted_pass = $dolibarr_main_db_pass; // We need to set this as it is used to know the password was initially encrypted
- } else {
- $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
- }
-}
-
-// $conf is already instancied inside inc.php
-$conf->db->type = $dolibarr_main_db_type;
-$conf->db->host = $dolibarr_main_db_host;
-$conf->db->port = $dolibarr_main_db_port;
-$conf->db->name = $dolibarr_main_db_name;
-$conf->db->user = $dolibarr_main_db_user;
-$conf->db->pass = $dolibarr_main_db_pass;
-
-// For encryption
-$conf->db->dolibarr_main_db_encryption = isset($dolibarr_main_db_encryption) ? $dolibarr_main_db_encryption : 0;
-$conf->db->dolibarr_main_db_cryptkey = isset($dolibarr_main_db_cryptkey) ? $dolibarr_main_db_cryptkey : '';
-
-$db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, (int) $conf->db->port);
-
-if ($db->connected) {
- print '| ';
- print $langs->trans("ServerConnection")." : $dolibarr_main_db_host | ".$langs->trans("OK")." |
";
- dolibarr_install_syslog("repair: ".$langs->transnoentities("ServerConnection").": ".$dolibarr_main_db_host.$langs->transnoentities("OK"));
- $ok = 1;
-} else {
- print "| ".$langs->trans("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name)." | ".$langs->transnoentities("Error")." |
";
- dolibarr_install_syslog("repair: ".$langs->transnoentities("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name));
- $ok = 0;
-}
-
-if ($ok) {
- if ($db->database_selected) {
- print '| ';
- print $langs->trans("DatabaseConnection")." : ".$dolibarr_main_db_name." | ".$langs->trans("OK")." |
";
- dolibarr_install_syslog("repair: database connection successful: ".$dolibarr_main_db_name);
- $ok = 1;
- } else {
- print "| ".$langs->trans("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name)." | ".$langs->trans("Error")." |
";
- dolibarr_install_syslog("repair: ".$langs->transnoentities("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name));
- $ok = 0;
- }
-}
-
-// Show database version
-if ($ok) {
- $version = $db->getVersion();
- $versionarray = $db->getVersionArray();
- print '| '.$langs->trans("ServerVersion").' | ';
- print ''.$version.' |
';
- dolibarr_install_syslog("repair: ".$langs->transnoentities("ServerVersion").": ".$version);
- //print ''.join('.',$versionarray).' | ';
-}
$conf->setValues($db);
// Reset forced setup after the setValues