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

Merge remote-tracking branch 'upstream/develop' into patch-2

Browse Source
This commit is contained in:
Frédéric FRANCE 2019-03-04 20:21:53 +01:00
commit 098bab8b1a
No known key found for this signature in database
GPG Key ID: 06809324E4B2ABC1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/admin/security.php
View File

@ -212,7 +212,7 @@ if (is_resource($handle))
{ {
while (($file = readdir($handle))!==false) while (($file = readdir($handle))!==false)
{ {
if (preg_match('/(modGeneratePass[a-z]+)\.class\.php/i', $file, $reg)) if (preg_match('/(modGeneratePass[a-z]+)\.class\.php$/i', $file, $reg))
{ {
// Charging the numbering class // Charging the numbering class
$classname = $reg[1]; $classname = $reg[1];

4
htdocs/core/login/functions_dolibarr.php
View File

@ -109,8 +109,8 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
} }
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'));