From 7095b3a083041a435adc50afbec397bd9be614c6 Mon Sep 17 00:00:00 2001
From: Michael Göhler <somebody.here@gmx.de>
Date: Fri, 12 Oct 2012 16:12:43 +0200
Subject: extend logon page to display multiple error messages

---
 lib/base.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'lib/base.php')

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() {
-- 
cgit v1.2.3