From 3645308d0bd7742a84323f92be842d9fef84bc0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20B=C3=B6hler?= Date: Tue, 28 Jul 2015 10:31:49 +0200 Subject: [PATCH 1/2] Add possibility for alternative logins to force redirection of login page --- lib/private/util.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/private/util.php b/lib/private/util.php index 39d64952dc..4f988abfe1 100644 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -901,6 +901,14 @@ class OC_Util { $parameters['alt_login'] = OC_App::getAlternativeLogIns(); $parameters['rememberLoginAllowed'] = self::rememberLoginAllowed(); + foreach($parameters['alt_login'] as $params) + { + if(isset($params['forceredirect']) && ($params['forceredirect'] === true)) + { + \OCP\Response::redirect($params['href']); + exit(); + } + } OC_Template::printGuestPage("", "login", $parameters); } From 3a0d42ecf3da8cd7c0123131c096dd7fd4d4b4fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20B=C3=B6hler?= Date: Tue, 28 Jul 2015 13:00:18 +0200 Subject: [PATCH 2/2] Add hook 'pre_displayLoginPage' --- lib/private/util.php | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/lib/private/util.php b/lib/private/util.php index 4f988abfe1..c3a15a402c 100644 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -901,14 +901,7 @@ class OC_Util { $parameters['alt_login'] = OC_App::getAlternativeLogIns(); $parameters['rememberLoginAllowed'] = self::rememberLoginAllowed(); - foreach($parameters['alt_login'] as $params) - { - if(isset($params['forceredirect']) && ($params['forceredirect'] === true)) - { - \OCP\Response::redirect($params['href']); - exit(); - } - } + \OC_Hook::emit('OC_Util', 'pre_displayLoginPage', array('parameters' => $parameters)); OC_Template::printGuestPage("", "login", $parameters); }