From 182fa706f622aac7858375b611ed94e79df21fd9 Mon Sep 17 00:00:00 2001 From: sarryru Date: Fri, 20 Jan 2017 21:51:24 +0300 Subject: [PATCH 1/2] Update listener.php Change for using oauth buttons in quick login form. --- event/listener.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/event/listener.php b/event/listener.php index fcc5c32..64d3e93 100644 --- a/event/listener.php +++ b/event/listener.php @@ -63,7 +63,8 @@ public function quick_login() { foreach ($auth_provider_data['BLOCK_VARS'] as $block_vars) { - // $this->template->assign_block_vars('ql_' . $auth_provider_data['BLOCK_VAR_NAME'], $block_vars); TODO: needs redirect fix for provider oauth.php + $block_vars['REDIRECT_URL'] = './ucp.php?mode=login&login=external&oauth_service='.$block_vars['HIDDEN_FIELDS']['oauth_service']; + $this->template->assign_block_vars('ql_' . $auth_provider_data['BLOCK_VAR_NAME'], $block_vars); } } } From b90b824f6a2c6992a8c21e118e9879845285a8cb Mon Sep 17 00:00:00 2001 From: sarryru Date: Fri, 20 Jan 2017 22:08:45 +0300 Subject: [PATCH 2/2] Update listener.php --- event/listener.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/event/listener.php b/event/listener.php index 64d3e93..36b559f 100644 --- a/event/listener.php +++ b/event/listener.php @@ -61,10 +61,14 @@ public function quick_login() { if (isset($auth_provider_data['BLOCK_VAR_NAME']) && ($auth_provider_data['BLOCK_VAR_NAME'] == 'oauth')) { - foreach ($auth_provider_data['BLOCK_VARS'] as $block_vars) + foreach ($auth_provider_data['BLOCK_VARS'] as $oauth_provider => $block_vars) { - $block_vars['REDIRECT_URL'] = './ucp.php?mode=login&login=external&oauth_service='.$block_vars['HIDDEN_FIELDS']['oauth_service']; - $this->template->assign_block_vars('ql_' . $auth_provider_data['BLOCK_VAR_NAME'], $block_vars); + + $oauth_provider = str_replace('auth.provider.oauth.service.', '', $oauth_provider); + $redirect_url = './ucp.php?mode=login&login=external&oauth_service='.$oauth_provider; + $block_vars['REDIRECT_URL'] = $redirect_url; + $this->template->assign_block_vars('ql_' . $auth_provider_data['BLOCK_VAR_NAME'], $block_vars); + } } }