diff options
| author | Michael Göhler <somebody.here@gmx.de> | 2012-10-12 16:12:43 +0200 |
|---|---|---|
| committer | Michael Göhler <somebody.here@gmx.de> | 2012-10-14 19:57:24 +0200 |
| commit | 7095b3a083041a435adc50afbec397bd9be614c6 (patch) | |
| tree | 984570129fa1f2e4c70d9d0db877f081ec527205 /lib/base.php | |
| parent | 9f9206cd0b6e9ef308a030bb850389d68799efa8 (diff) | |
| download | nextcloud-server-7095b3a083041a435adc50afbec397bd9be614c6.tar.gz nextcloud-server-7095b3a083041a435adc50afbec397bd9be614c6.zip | |
extend logon page to display multiple error messages
Diffstat (limited to 'lib/base.php')
| -rw-r--r-- | lib/base.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/base.php b/lib/base.php index 51f8f4efc5b..9f21e26279f 100644 --- a/lib/base.php +++ b/lib/base.php @@ -494,20 +494,20 @@ class OC{ protected static function handleLogin() { OC_App::loadApps(array('prelogin')); - $error = false; + $error = array(); // remember was checked after last login if (OC::tryRememberLogin()) { - // nothing more to do + $error[] = 'invalidcookie'; // Someone wants to log in : } elseif (OC::tryFormLogin()) { - $error = true; + $error[] = 'invalidpassword'; // The user is already authenticated using Apaches AuthType Basic... very usable in combination with LDAP } elseif (OC::tryBasicAuthLogin()) { - $error = true; + $error[] = 'invalidpassword'; } - OC_Util::displayLoginPage($error); + OC_Util::displayLoginPage(array_unique($error)); } protected static function tryRememberLogin() { |