Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0

Conflicts:
	htdocs/core/login/functions_dolibarr.php
This commit is contained in:
Laurent Destailleur 2019-03-04 20:17:16 +01:00
commit c95c8b4dcb

View File

@ -109,8 +109,8 @@ function check_user_password_dolibarr($usertotest,$passwordtotest,$entitytotest=
} }
else else
{ {
dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko bad password for '".$usertotest."'");
sleep(2); // Anti brut force protection sleep(2); // Anti brut force protection
dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko bad password for '".$usertotest."', cryptType=".$cryptType);
// Load translation files required by the page // Load translation files required by the page
$langs->loadLangs(array('main', 'errors')); $langs->loadLangs(array('main', 'errors'));