|
|
|
@ -123,8 +123,7 @@ class FreshRSS_auth_Controller extends Minz_ActionController { |
|
|
|
|
|
|
|
|
|
$conf = get_user_configuration($username); |
|
|
|
|
if (is_null($conf)) { |
|
|
|
|
Minz_Request::bad(_t('feedback.auth.login.invalid'), |
|
|
|
|
array('c' => 'auth', 'a' => 'login')); |
|
|
|
|
Minz_Error::error(403, array(_t('feedback.auth.login.invalid')), false); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
$ok = FreshRSS_FormAuth::checkCredentials( |
|
|
|
@ -151,8 +150,7 @@ class FreshRSS_auth_Controller extends Minz_ActionController { |
|
|
|
|
' user=' . $username . |
|
|
|
|
', nonce=' . $nonce . |
|
|
|
|
', c=' . $challenge); |
|
|
|
|
Minz_Request::bad(_t('feedback.auth.login.invalid'), |
|
|
|
|
array('c' => 'auth', 'a' => 'login')); |
|
|
|
|
Minz_Error::error(403, array(_t('feedback.auth.login.invalid')), false); |
|
|
|
|
} |
|
|
|
|
} elseif (FreshRSS_Context::$system_conf->unsafe_autologin_enabled) { |
|
|
|
|
$username = Minz_Request::param('u', ''); |
|
|
|
@ -184,8 +182,7 @@ class FreshRSS_auth_Controller extends Minz_ActionController { |
|
|
|
|
array('c' => 'index', 'a' => 'index')); |
|
|
|
|
} else { |
|
|
|
|
Minz_Log::warning('Unsafe password mismatch for user ' . $username); |
|
|
|
|
Minz_Request::bad(_t('feedback.auth.login.invalid'), |
|
|
|
|
array('c' => 'auth', 'a' => 'login')); |
|
|
|
|
Minz_Error::error(403, array(_t('feedback.auth.login.invalid')), false); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|