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

Fix better error message if password is empty

Browse Source
This commit is contained in:
Laurent Destailleur 2021-07-12 10:35:25 +02:00
parent 4b2bbd0364
commit aece3844c6
1 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
htdocs/install/step1.php
View File

@ -531,39 +531,48 @@ if (!$error && $db->connected && $action == "set") {
if ($db->connected) { if ($db->connected) {
$resultbis = 1; $resultbis = 1;
// Create user if (empty($dolibarr_main_db_pass)) {
$result = $db->DDLCreateUser($dolibarr_main_db_host, $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name); dolibarr_install_syslog("step1: failed to create user, password is empty", LOG_ERR);
// Create user bis
if ($databasefortest == 'mysql') {
if (!in_array($dolibarr_main_db_host, array('127.0.0.1', '::1', 'localhost', 'localhost.local'))) {
$resultbis = $db->DDLCreateUser('%', $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name);
}
}
if ($result > 0 && $resultbis > 0) {
print '<tr><td>'; print '<tr><td>';
print $langs->trans("UserCreation").' : '; print $langs->trans("UserCreation").' : ';
print $dolibarr_main_db_user; print $dolibarr_main_db_user;
print '</td>'; print '</td>';
print '<td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>'; print '<td>'.$langs->trans("Error").": A password for database user is mandatory.</td></tr>";
} else { } else {
if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS' // Create user
|| $db->errno() == 'DB_ERROR_KEY_NAME_ALREADY_EXISTS' $result = $db->DDLCreateUser($dolibarr_main_db_host, $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name);
|| $db->errno() == 'DB_ERROR_USER_ALREADY_EXISTS') {
dolibarr_install_syslog("step1: user already exists"); // Create user bis
if ($databasefortest == 'mysql') {
if (!in_array($dolibarr_main_db_host, array('127.0.0.1', '::1', 'localhost', 'localhost.local'))) {
$resultbis = $db->DDLCreateUser('%', $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name);
}
}
if ($result > 0 && $resultbis > 0) {
print '<tr><td>'; print '<tr><td>';
print $langs->trans("UserCreation").' : '; print $langs->trans("UserCreation").' : ';
print $dolibarr_main_db_user; print $dolibarr_main_db_user;
print '</td>'; print '</td>';
print '<td>'.$langs->trans("LoginAlreadyExists").'</td></tr>'; print '<td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
} else { } else {
dolibarr_install_syslog("step1: failed to create user", LOG_ERR); if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS'
print '<tr><td>'; || $db->errno() == 'DB_ERROR_KEY_NAME_ALREADY_EXISTS'
print $langs->trans("UserCreation").' : '; || $db->errno() == 'DB_ERROR_USER_ALREADY_EXISTS') {
print $dolibarr_main_db_user; dolibarr_install_syslog("step1: user already exists");
print '</td>'; print '<tr><td>';
print '<td>'.$langs->trans("Error").': '.$db->errno().' '.$db->error().($db->error ? '. '.$db->error : '')."</td></tr>"; print $langs->trans("UserCreation").' : ';
print $dolibarr_main_db_user;
print '</td>';
print '<td>'.$langs->trans("LoginAlreadyExists").'</td></tr>';
} else {
dolibarr_install_syslog("step1: failed to create user", LOG_ERR);
print '<tr><td>';
print $langs->trans("UserCreation").' : ';
print $dolibarr_main_db_user;
print '</td>';
print '<td>'.$langs->trans("Error").': '.$db->errno().' '.$db->error().($db->error ? '. '.$db->error : '')."</td></tr>";
}
} }
} }