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

[feature/oauth] Get the OAuth template in place for ucp_auth_link

Browse source 
PHPBB3-11673
This commit is contained in:
Joseph Warner 2013-08-12 14:43:18 -04:00
parent e04844c95f
commit 4003e077c1
4 changed files with 49 additions and 9 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

@ -52,6 +52,19 @@ class ucp_auth_link
} }
} }
if (isset($provider_data['VARS']))
{
$template->assign_vars($provider_data['VARS']);
}
if (isset($provider_data['BLOCK_VAR_NAME']))
{
foreach ($provider_data['BLOCK_VARS'] as $block_vars)
{
$template->assign_block_vars($provider_data['BLOCK_VAR_NAME'], $block_vars);
}
}
$s_hidden_fields = build_hidden_fields($s_hidden_fields); $s_hidden_fields = build_hidden_fields($s_hidden_fields);
$template->assign_vars(array( $template->assign_vars(array(

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

@ -452,7 +452,7 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base
// Get all external accounts tied to the current user // Get all external accounts tied to the current user
$data = array( $data = array(
'user_id' => $user->data['user_id'], 'user_id' => $this->user->data['user_id'],
); );
$sql = 'SELECT oauth_provider_id, provider FROM ' . $this->auth_provider_oauth_token_account_assoc . ' $sql = 'SELECT oauth_provider_id, provider FROM ' . $this->auth_provider_oauth_token_account_assoc . '
WHERE ' . $this->db->sql_build_array('SELECT', $data); WHERE ' . $this->db->sql_build_array('SELECT', $data);
@ -462,9 +462,9 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base
$oauth_user_ids = array(); $oauth_user_ids = array();
if ($row !== false && !empty($rows)) if ($rows !== false && !empty($rows))
{ {
foreach ($row as $row) foreach ($rows as $row)
{ {
$oauth_user_ids[$row['provider']] = $row['oauth_provider_id']; $oauth_user_ids[$row['provider']] = $row['oauth_provider_id'];
} }

8
phpBB/styles/prosilver/template/ucp_auth_link.html
View file

@ -2,8 +2,12 @@
<h2>{L_UCP_AUTH_LINK_TITLE}</h2> <h2>{L_UCP_AUTH_LINK_TITLE}</h2>
<!-- IF ERROR --><dl><dd class="error">{ERROR}</dd></dl><!-- ENDIF --> <div class="panel">
<div class="inner">
<!-- IF ERROR --><dl><dd class="error">{ERROR}</dd></dl><!-- ENDIF -->
<!-- INCLUDE {PROVIDER_TEMPLATE_FILE} --> <!-- INCLUDE {PROVIDER_TEMPLATE_FILE} -->
</div>
</div>
<!-- INCLUDE ucp_footer.html --> <!-- INCLUDE ucp_footer.html -->

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

@ -1,5 +1,28 @@
<form id="ucp" method="post" action="{S_UCP_ACTION}"> <!-- BEGIN oauth -->
<form id="ucp" method="post" action="{S_UCP_ACTION}">
<h3>{oauth.SERVICE_NAME}</h3>
{S_HIDDEN_FIELDS} <fieldset class="fields2">
{S_FORM_TOKEN} <!-- IF oauth.UNIQUE_ID -->
</form> <dl>
<dt>{L_UCP_AUTH_LINK_ID}{L_COLON}</dt>
<dd>{oauth.UNIQUE_ID}</dd>
</dl>
<dl>
<dt>&nbsp;</dt>
<dd>{S_HIDDEN_FIELDS}<input type="submit" name="unlink" tabindex="6" value="{L_UNLINK}" class="button1" /></dd>
</dl>
<!-- ELSE -->
<dl>
<dd>{L_UCP_AUTH_LINK_ASK}</dd>
</dl>
<dl>
<dt>&nbsp;</dt>
<dd>{S_HIDDEN_FIELDS}<input type="submit" name="link" tabindex="6" value="{L_LINK}" class="button1" /></dd>
</dl>
<!-- ENDIF-->
</fieldset>
{S_HIDDEN_FIELDS}
{S_FORM_TOKEN}
</form>
<!-- END oauth -->