Debug
This commit is contained in:
parent
e99355a0c2
commit
278d8c1317
@ -64,7 +64,7 @@ pHeader('', ''); // No next step for navigation buttons. Next step is defined by
|
|||||||
//print "<br>\n";
|
//print "<br>\n";
|
||||||
//print $langs->trans("InstallEasy")."<br><br>\n";
|
//print $langs->trans("InstallEasy")."<br><br>\n";
|
||||||
|
|
||||||
print '<h3><img class="valigntextbottom inline-block" src="../theme/common/octicons/build/svg/gear.svg" width="20" alt="Database"> ';
|
print '<h3><img class="valignmiddle inline-block paddingright" src="../theme/common/octicons/build/svg/gear.svg" width="20" alt="Database"> ';
|
||||||
print '<span class="inline-block">'.$langs->trans("MiscellaneousChecks")."</span></h3>\n";
|
print '<span class="inline-block">'.$langs->trans("MiscellaneousChecks")."</span></h3>\n";
|
||||||
|
|
||||||
// Check browser
|
// Check browser
|
||||||
|
|||||||
@ -16,6 +16,10 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
.paddingright {
|
||||||
|
padding-right: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
.opacitymedium {
|
.opacitymedium {
|
||||||
opacity: 0.5;
|
opacity: 0.5;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -134,7 +134,7 @@ if (!empty($force_install_message)) {
|
|||||||
|
|
||||||
<tr>
|
<tr>
|
||||||
<td colspan="3" class="label">
|
<td colspan="3" class="label">
|
||||||
<h3><img class="valigntextbottom" src="../theme/common/octicons/build/svg/globe.svg" width="20" alt="webserver"> <?php echo $langs->trans("WebServer"); ?></h3>
|
<h3><img class="valignmiddle inline-block paddingright" src="../theme/common/octicons/build/svg/globe.svg" width="20" alt="webserver"> <?php echo $langs->trans("WebServer"); ?></h3>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
@ -261,7 +261,7 @@ if (!empty($force_install_noedit)) {
|
|||||||
|
|
||||||
<tr>
|
<tr>
|
||||||
<td colspan="3" class="label"><br>
|
<td colspan="3" class="label"><br>
|
||||||
<h3><img class="valigntextbottom" src="../theme/common/octicons/build/svg/database.svg" width="20" alt="webserver"> <?php echo $langs->trans("DolibarrDatabase"); ?></h3>
|
<h3><img class="valignmiddle inline-block paddingright" src="../theme/common/octicons/build/svg/database.svg" width="20" alt="webserver"> <?php echo $langs->trans("DolibarrDatabase"); ?></h3>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
@ -521,7 +521,7 @@ if (!empty($force_install_noedit)) {
|
|||||||
?>
|
?>
|
||||||
<tr class="hidesqlite hideroot">
|
<tr class="hidesqlite hideroot">
|
||||||
<td colspan="3" class="label"><br>
|
<td colspan="3" class="label"><br>
|
||||||
<h3><img class="valigntextbottom" src="../theme/common/octicons/build/svg/shield.svg" width="20" alt="webserver"> <?php echo $langs->trans("DatabaseSuperUserAccess"); ?></h3>
|
<h3><img class="valignmiddle inline-block paddingright" src="../theme/common/octicons/build/svg/shield.svg" width="20" alt="webserver"> <?php echo $langs->trans("DatabaseSuperUserAccess"); ?></h3>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
|
|||||||
@ -347,7 +347,7 @@ if (!$error && $db->connected && $action == "set") {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Show title of step
|
// Show title of step
|
||||||
print '<h3><img class="valigntextbottom" src="../theme/common/octicons/build/svg/gear.svg" width="20" alt="Configuration"> '.$langs->trans("ConfigurationFile").'</h3>';
|
print '<h3><img class="valignmiddle inline-block paddingright" src="../theme/common/octicons/build/svg/gear.svg" width="20" alt="Configuration"> '.$langs->trans("ConfigurationFile").'</h3>';
|
||||||
print '<table cellspacing="0" width="100%" cellpadding="1" border="0">';
|
print '<table cellspacing="0" width="100%" cellpadding="1" border="0">';
|
||||||
|
|
||||||
// Check parameter main_dir
|
// Check parameter main_dir
|
||||||
|
|||||||
@ -99,7 +99,7 @@ if (!is_writable($conffile)) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ($action == "set") {
|
if ($action == "set") {
|
||||||
print '<h3><img class="valigntextbottom" src="../theme/common/octicons/build/svg/database.svg" width="20" alt="Database"> '.$langs->trans("Database").'</h3>';
|
print '<h3><img class="valignmiddle inline-block paddingright" src="../theme/common/octicons/build/svg/database.svg" width="20" alt="Database"> '.$langs->trans("Database").'</h3>';
|
||||||
|
|
||||||
print '<table cellspacing="0" style="padding: 4px 4px 4px 0" border="0" width="100%">';
|
print '<table cellspacing="0" style="padding: 4px 4px 4px 0" border="0" width="100%">';
|
||||||
$error = 0;
|
$error = 0;
|
||||||
|
|||||||
@ -69,7 +69,7 @@ if (!is_writable($conffile)) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
print '<h3><img class="valigntextbottom" src="../theme/common/octicons/build/svg/key.svg" width="20" alt="Database"> '.$langs->trans("DolibarrAdminLogin").'</h3>';
|
print '<h3><img class="valignmiddle inline-block paddingright" src="../theme/common/octicons/build/svg/key.svg" width="20" alt="Database"> '.$langs->trans("DolibarrAdminLogin").'</h3>';
|
||||||
|
|
||||||
print $langs->trans("LastStepDesc").'<br><br>';
|
print $langs->trans("LastStepDesc").'<br><br>';
|
||||||
|
|
||||||
|
|||||||
@ -404,7 +404,7 @@ if ($action == "set" && $success) {
|
|||||||
// If upgrade
|
// If upgrade
|
||||||
if (empty($conf->global->MAIN_VERSION_LAST_UPGRADE) || ($conf->global->MAIN_VERSION_LAST_UPGRADE == DOL_VERSION)) {
|
if (empty($conf->global->MAIN_VERSION_LAST_UPGRADE) || ($conf->global->MAIN_VERSION_LAST_UPGRADE == DOL_VERSION)) {
|
||||||
// Upgrade is finished
|
// Upgrade is finished
|
||||||
print $langs->trans("SystemIsUpgraded")."<br>";
|
print '<img class="valignmiddle inline-block paddingright" src="../theme/common/octicons/build/svg/checklist.svg" width="20" alt="Configuration"> '.$langs->trans("SystemIsUpgraded")."<br>";
|
||||||
|
|
||||||
$createlock = 0;
|
$createlock = 0;
|
||||||
|
|
||||||
|
|||||||
@ -110,7 +110,7 @@ $actiondone = 0;
|
|||||||
if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ09'))) {
|
if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ09'))) {
|
||||||
$actiondone = 1;
|
$actiondone = 1;
|
||||||
|
|
||||||
print '<h3><img class="valigntextbottom inline-block" src="../theme/common/octicons/build/svg/database.svg" width="20" alt="Database"> ';
|
print '<h3><img class="valignmiddle inline-block paddingright" src="../theme/common/octicons/build/svg/database.svg" width="20" alt="Database"> ';
|
||||||
print '<span class="inline-block">'.$langs->trans("DatabaseMigration").'</span></h3>';
|
print '<span class="inline-block">'.$langs->trans("DatabaseMigration").'</span></h3>';
|
||||||
|
|
||||||
print '<table cellspacing="0" cellpadding="1" border="0" width="100%">';
|
print '<table cellspacing="0" cellpadding="1" border="0" width="100%">';
|
||||||
|
|||||||
@ -117,10 +117,10 @@ pHeader('', 'step5', GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'upg
|
|||||||
|
|
||||||
|
|
||||||
if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ09'))) {
|
if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ09'))) {
|
||||||
print '<h3><img class="valigntextbottom inline-block" src="../theme/common/octicons/build/svg/database.svg" width="20" alt="Database"> ';
|
print '<h3><img class="valignmiddle inline-block paddingright" src="../theme/common/octicons/build/svg/database.svg" width="20" alt="Database"> ';
|
||||||
print '<span class="inline-block">'.$langs->trans('DataMigration').'</span></h3>';
|
print '<span class="inline-block">'.$langs->trans('DataMigration').'</span></h3>';
|
||||||
|
|
||||||
print '<table cellspacing="0" cellpadding="1" border="0" width="100%">';
|
print '<table border="0" width="100%">';
|
||||||
|
|
||||||
// If password is encoded, we decode it
|
// If password is encoded, we decode it
|
||||||
if (preg_match('/crypted:/i', $dolibarr_main_db_pass) || !empty($dolibarr_main_db_encrypted_pass)) {
|
if (preg_match('/crypted:/i', $dolibarr_main_db_pass) || !empty($dolibarr_main_db_encrypted_pass)) {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user