From 0750d1574d2a0933bc6ee13eb82c01ed82054280 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Tue, 10 Apr 2012 18:08:29 +0200 Subject: [PATCH] Fixing error message when login using SSO BT#4158 --- main/inc/lib/userportal.lib.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/main/inc/lib/userportal.lib.php b/main/inc/lib/userportal.lib.php index 4e1bd2b792..3e266474b7 100644 --- a/main/inc/lib/userportal.lib.php +++ b/main/inc/lib/userportal.lib.php @@ -385,15 +385,15 @@ class IndexManager { * @version 1.0.1 */ function handle_login_failed() { - if (!isset($_GET['error'])) { - $message = get_lang('InvalidId'); + $message = get_lang('InvalidId'); + + if (!isset($_GET['error'])) { if (api_is_self_registration_allowed()) { $message = get_lang('InvalidForSelfRegistration'); } } else { switch ($_GET['error']) { - case '': - $message = get_lang('InvalidId'); + case '': if (api_is_self_registration_allowed()) { $message = get_lang('InvalidForSelfRegistration'); } @@ -410,6 +410,9 @@ class IndexManager { case 'access_url_inactive': $message = get_lang('AccountURLInactive'); break; + case 'unrecognize_sso_origin': + //$message = get_lang('SSOError'); + break; } } return Display::return_message($message, 'error');