Merge remote branch 'dolibarr/develop' into develop

This commit is contained in:
Regis Houssin 2011-09-22 17:12:41 +02:00
commit 4a3a158ed1

View File

@ -55,13 +55,15 @@ function check_authentication($authentication,&$error,&$errorcode,&$errorlabel)
// Validation of login with a third party login module method
if (! $error)
{
$test=true;
if (is_array($conf->login_method_modules) && !empty($conf->login_method_modules))
{
$login = getLoginMethod($authentication['login'],$authentication['password'],$authentication['entity']);
if ($login) $test=false;
if (empty($login)) $error++;
}
else
{
$errorcode='BAD_LOGIN_METHOD'; $errorlabel='Bad value for login method';
}
if ($test) $error++;
}
if ($error)