mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

[feature/oauth] Refactor oauth::link_account for two paths

Browse Source 
PHPBB3-11673
This commit is contained in:
Joseph Warner
2013-08-14 15:55:38 -04:00
parent afebbf231a
commit bb68338861
2 changed files with 62 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
phpBB/includes/ucp/ucp_auth_link.php
View File

@@ -39,6 +39,7 @@ class ucp_auth_link
$submit = $request->variable('submit', false, false, phpbb_request_interface::POST);
// This path is only for primary actions
if (!sizeof($error) && $submit)
{
if (!check_form_key('ucp_auth_link'))
@@ -57,7 +58,7 @@ class ucp_auth_link
// Tell the provider that the method is auth_link not login_link
$link_data['link_method'] = 'auth_link';
if ($request->variable('link', null))
if ($request->variable('link', null, false, phpbb_request_interface::POST))
{
$error[] = $auth_provider->link_account($link_data);
}
@@ -68,6 +69,17 @@ class ucp_auth_link
}
}
// In some cases, an request to an external server may be required in
// these cases, the GET parameter 'link' should exist and should be true
if ($request->variable('link', false))
{
// In this case the link data should only be populated with the
// link_method as the provider dictates how data is returned to it.
$link_data = array('link_method' => 'auth_link');
$error[] = $auth_provider->link_account($link_data);
}
if (isset($provider_data['VARS']))
{
// Handle hidden fields separately