makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5303 from senky/ticket/11838

Browse source 
[ticket/11838] OAuth registration from ucp_register
This commit is contained in:
Marc Alexander 2018-09-16 13:26:19 +02:00 • committed by GitHub
commit d80b208a4b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 38 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
phpBB/includes/ucp/ucp_register.php
View file

@ -552,6 +552,31 @@ class ucp_register
break; break;
} }
/* @var $provider_collection \phpbb\auth\provider_collection */
$provider_collection = $phpbb_container->get('auth.provider_collection');
$auth_provider = $provider_collection->get_provider();
$auth_provider_data = $auth_provider->get_login_data();
if ($auth_provider_data)
{
if (isset($auth_provider_data['VARS']))
{
$template->assign_vars($auth_provider_data['VARS']);
}
if (isset($auth_provider_data['BLOCK_VAR_NAME']))
{
foreach ($auth_provider_data['BLOCK_VARS'] as $block_vars)
{
$template->assign_block_vars($auth_provider_data['BLOCK_VAR_NAME'], $block_vars);
}
}
$template->assign_vars(array(
'PROVIDER_TEMPLATE_FILE' => $auth_provider_data['TEMPLATE_FILE'],
));
}
// Assign template vars for timezone select // Assign template vars for timezone select
phpbb_timezone_select($template, $user, $data['tz'], true); phpbb_timezone_select($template, $user, $data['tz'], true);

1
phpBB/language/en/ucp.php
View file

@ -446,6 +446,7 @@ $lang = array_merge($lang, array(
'RECIPIENT' => 'Recipient', 'RECIPIENT' => 'Recipient',
'RECIPIENTS' => 'Recipients', 'RECIPIENTS' => 'Recipients',
'REGISTRATION' => 'Registration', 'REGISTRATION' => 'Registration',
'OAUTH_REGISTRATION' => 'Registration using external services',
'RELEASE_MESSAGES' => '%sRelease all on-hold messages%s… they will be re-sorted into the appropriate folder if enough space is made available.', 'RELEASE_MESSAGES' => '%sRelease all on-hold messages%s… they will be re-sorted into the appropriate folder if enough space is made available.',
'REMOVE_ADDRESS' => 'Remove address', 'REMOVE_ADDRESS' => 'Remove address',
'REMOVE_SELECTED_BOOKMARKS' => 'Remove selected bookmarks', 'REMOVE_SELECTED_BOOKMARKS' => 'Remove selected bookmarks',

2
phpBB/phpbb/auth/provider/oauth/oauth.php
View file

@ -392,7 +392,7 @@ class oauth extends \phpbb\auth\provider\base
if ($credentials['key'] && $credentials['secret']) if ($credentials['key'] && $credentials['secret'])
{ {
$actual_name = str_replace('auth.provider.oauth.service.', '', $service_name); $actual_name = str_replace('auth.provider.oauth.service.', '', $service_name);
$redirect_url = build_url(false) . '&login=external&oauth_service=' . $actual_name; $redirect_url = generate_board_url() . '/ucp.' . $this->php_ext . '?mode=login&login=external&oauth_service=' . $actual_name;
$login_data['BLOCK_VARS'][$service_name] = array( $login_data['BLOCK_VARS'][$service_name] = array(
'REDIRECT_URL' => redirect($redirect_url, true), 'REDIRECT_URL' => redirect($redirect_url, true),
'SERVICE_NAME' => $this->user->lang['AUTH_PROVIDER_OAUTH_SERVICE_' . strtoupper($actual_name)], 'SERVICE_NAME' => $this->user->lang['AUTH_PROVIDER_OAUTH_SERVICE_' . strtoupper($actual_name)],

11
phpBB/styles/prosilver/template/ucp_register.html
View file

@ -12,6 +12,17 @@
} }
</script> </script>
<div class="panel">
<div class="inner">
<h2>{{ SITENAME }} - {{ lang('OAUTH_REGISTRATION') }}</h2>
{% if PROVIDER_TEMPLATE_FILE %}
{% include PROVIDER_TEMPLATE_FILE %}
{% endif %}
</div>
</div>
<form id="register" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}> <form id="register" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}>
<div class="panel"> <div class="panel">