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] Error handling on page

Browse source 
PHPBB3-11673
This commit is contained in:
Joseph Warner 2013-08-12 12:53:10 -04:00
parent 69cb2e4c60
commit a479f919ff
2 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -23,23 +23,23 @@ class ucp_auth_link
{ {
global $config, $request, $template, $phpbb_container; global $config, $request, $template, $phpbb_container;
$error = array();
$auth_provider = $phpbb_container->get('auth.provider.' . $config['auth_method']); $auth_provider = $phpbb_container->get('auth.provider.' . $config['auth_method']);
// confirm that the auth provider supports this page // confirm that the auth provider supports this page
$provider_data = $auth_provider->get_auth_link_data(); $provider_data = $auth_provider->get_auth_link_data();
if ($provider_data === null) if ($provider_data === null)
{ {
// does not support this page, throw error? $error[] = 'UCP_AUTH_LINK_NOT_SUPPORTED';
throw new Exception('TEMPORARY EXCEPTION');
} }
$error = array();
$s_hidden_fields = array(); $s_hidden_fields = array();
add_form_key('ucp_auth_link'); add_form_key('ucp_auth_link');
$submit = $request->variable('submit', false, false, phpbb_request_interface::POST); $submit = $request->variable('submit', false, false, phpbb_request_interface::POST);
if ($submit) if (!sizeof($error) && $submit)
{ {
if (!check_form_key('ucp_reg_details')) if (!check_form_key('ucp_reg_details'))
{ {
@ -55,6 +55,8 @@ class ucp_auth_link
$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(
'ERROR' => $this->build_error_text($error),
'PROVIDER_TEMPLATE_FILE' => $provider_data['TEMPLATE_FILE'], 'PROVIDER_TEMPLATE_FILE' => $provider_data['TEMPLATE_FILE'],
'S_HIDDEN_FIELDS' => $s_hidden_fields, 'S_HIDDEN_FIELDS' => $s_hidden_fields,
@ -64,4 +66,20 @@ class ucp_auth_link
$this->tpl_name = 'ucp_auth_link'; $this->tpl_name = 'ucp_auth_link';
$this->page_title = 'UCP_AUTH_LINK'; $this->page_title = 'UCP_AUTH_LINK';
} }
private function build_error_text(array $errors)
{
global $user;
// Replace all errors that are language constants
foreach ($errors as $key => $error)
{
if (isset($user->lang[$error]))
{
$errors[$key] = $user->lang($error);
}
}
return implode('<br />', $errors);
}
} }

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

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