mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-09 00:55:23 +02:00
Code Issues Releases Wiki Activity

[feature/oauth] Finish updating interface and related code

Browse Source 
PHPBB3-11673
This commit is contained in:
Joseph Warner 2013-08-02 14:21:07 -04:00
parent 245e71e4e2
commit 1ae2283b34
4 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
phpBB/includes/functions.php
View File

@ -3379,7 +3379,10 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa
if (isset($auth_provider_data['BLOCK_VAR_NAME'])) if (isset($auth_provider_data['BLOCK_VAR_NAME']))
{ {
$template->assign_block_vars($auth_provider_data['BLOCK_VAR_NAME'], $auth_provider_data['BLOCK_VARS']); 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( $template->assign_vars(array(
@ -3387,26 +3390,12 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa
)); ));
} }
$oauth_login = ($config['auth_method'] == 'oauth') ? true : false;
if ($oauth_login)
{
$auth_provider = $phpbb_container->get('auth.provider.oauth');
$oauth_box_data = $auth_provider->get_login_data();
foreach ($oauth_box_data as $data)
{
$template->assign_block_vars('oauth', $data);
}
}
$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(
'LOGIN_ERROR' => $err, 'LOGIN_ERROR' => $err,
'LOGIN_EXPLAIN' => $l_explain, 'LOGIN_EXPLAIN' => $l_explain,
'OAUTH_LOGIN' => $oauth_login,
'U_SEND_PASSWORD' => ($config['email_enable']) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=sendpassword') : '', 'U_SEND_PASSWORD' => ($config['email_enable']) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=sendpassword') : '',
'U_RESEND_ACTIVATION' => ($config['require_activation'] == USER_ACTIVATION_SELF && $config['email_enable']) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=resend_act') : '', 'U_RESEND_ACTIVATION' => ($config['require_activation'] == USER_ACTIVATION_SELF && $config['email_enable']) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=resend_act') : '',
'U_TERMS_USE' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=terms'), 'U_TERMS_USE' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=terms'),

8
phpBB/phpbb/auth/provider/oauth/oauth.php
View File

@ -278,7 +278,11 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base
*/ */
public function get_login_data() public function get_login_data()
{ {
$login_data = array(); $login_data = array(
'TEMPLATE_FILE' => 'login_body_oauth.html',
'BLOCK_VAR_NAME' => 'oauth',
'BLOCK_VARS' => array(),
);
foreach ($this->service_providers as $service_name => $service_provider) foreach ($this->service_providers as $service_name => $service_provider)
{ {
@ -288,7 +292,7 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base
{ {
$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 = build_url(false) . '&login=external&oauth_service=' . $actual_name;
$login_data[$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)],
); );

13
phpBB/styles/prosilver/template/login_body.html
View File

@ -46,16 +46,11 @@
<dd>{S_HIDDEN_FIELDS}<input type="submit" name="login" tabindex="6" value="{L_LOGIN}" class="button1" /></dd> <dd>{S_HIDDEN_FIELDS}<input type="submit" name="login" tabindex="6" value="{L_LOGIN}" class="button1" /></dd>
</dl> </dl>
</fieldset> </fieldset>
</div><!-- IF OAUTH_LOGIN --> </div>
<div class="content"> <!-- IF PROVIDER_TEMPLATE_FILE -->
<!-- BEGIN oauth --> <!-- INCLUDE {PROVIDER_TEMPLATE_FILE} -->
<dl> <!-- ENDIF -->
<dt>&nbsp;</dt>
<dd><a href="{oauth.REDIRECT_URL}" class="button2">{oauth.SERVICE_NAME}</a></dd>
</dl>
<!-- END oauth -->
</div><!-- ENDIF -->
</div> </div>
</div> </div>

8
phpBB/styles/prosilver/template/login_body_oauth.html Normal file
View File

@ -0,0 +1,8 @@
<div class="content">
<!-- BEGIN oauth -->
<dl>
<dt>&nbsp;</dt>
<dd><a href="{oauth.REDIRECT_URL}" class="button2">{oauth.SERVICE_NAME}</a></dd>
</dl>
<!-- END oauth -->
</div>