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

[feature/oauth] Handle hidden fields

Browse source 
PHPBB3-11673
This commit is contained in:
Joseph Warner 2013-08-12 15:29:08 -04:00
parent 4003e077c1
commit 836d3ba22e
3 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
phpBB/includes/ucp/ucp_auth_link.php
View file

@ -54,6 +54,13 @@ class ucp_auth_link
if (isset($provider_data['VARS'])) if (isset($provider_data['VARS']))
{ {
// Handle hidden fields separately
if (isset($provider_data['VARS']['HIDDEN_FIELDS']))
{
$s_hidden_fields = array_merge($s_hidden_fields, $provider_data['VARS']['HIDDEN_FIELDS']);
unset($provider_data['VARS']['HIDDEN_FIELDS']);
}
$template->assign_vars($provider_data['VARS']); $template->assign_vars($provider_data['VARS']);
} }
@ -61,6 +68,12 @@ class ucp_auth_link
{ {
foreach ($provider_data['BLOCK_VARS'] as $block_vars) foreach ($provider_data['BLOCK_VARS'] as $block_vars)
{ {
// See if there are additional hidden fields. This should be an associative array
if (isset($block_vars['HIDDEN_FIELDS']))
{
$block_vars['HIDDEN_FIELDS'] = build_hidden_fields($block_vars['HIDDEN_FIELDS']);
}
$template->assign_block_vars($provider_data['BLOCK_VAR_NAME'], $block_vars); $template->assign_block_vars($provider_data['BLOCK_VAR_NAME'], $block_vars);
} }
} }

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

@ -481,6 +481,10 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base
$redirect_url = build_url(false) . '&login=external&oauth_service=' . $actual_name; $redirect_url = build_url(false) . '&login=external&oauth_service=' . $actual_name;
$block_vars[$service_name] = array( $block_vars[$service_name] = array(
'HIDDEN_FIELDS' => array(
'oauth_service' => $actual_name,
),
'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)],
'UNIQUE_ID' => (isset($oauth_user_ids[$actual_name])) ? $oauth_user_ids[$actual_name] : null, 'UNIQUE_ID' => (isset($oauth_user_ids[$actual_name])) ? $oauth_user_ids[$actual_name] : null,

5
phpBB/styles/prosilver/template/ucp_auth_link_oauth.html
View file

@ -10,7 +10,7 @@
</dl> </dl>
<dl> <dl>
<dt>&nbsp;</dt> <dt>&nbsp;</dt>
<dd>{S_HIDDEN_FIELDS}<input type="submit" name="unlink" tabindex="6" value="{L_UNLINK}" class="button1" /></dd> <dd><input type="submit" name="unlink" tabindex="6" value="{L_UNLINK}" class="button1" /></dd>
</dl> </dl>
<!-- ELSE --> <!-- ELSE -->
<dl> <dl>
@ -18,10 +18,11 @@
</dl> </dl>
<dl> <dl>
<dt>&nbsp;</dt> <dt>&nbsp;</dt>
<dd>{S_HIDDEN_FIELDS}<input type="submit" name="link" tabindex="6" value="{L_LINK}" class="button1" /></dd> <dd><input type="submit" name="link" tabindex="6" value="{L_LINK}" class="button1" /></dd>
</dl> </dl>
<!-- ENDIF--> <!-- ENDIF-->
</fieldset> </fieldset>
{oauth.HIDDEN_FIELDS}
{S_HIDDEN_FIELDS} {S_HIDDEN_FIELDS}
{S_FORM_TOKEN} {S_FORM_TOKEN}
</form> </form>