diff options
| author | David King <imkingdavid@gmail.com> | 2013-09-10 15:48:29 -0700 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2013-09-10 15:48:29 -0700 |
| commit | fc1dfd779da37128382322ffdc75bf751a0834a3 (patch) | |
| tree | 5d43d1847832169510c55c3358c42ccd095b2128 /phpBB/includes/functions.php | |
| parent | 71aeec40f6c4c5e6a69699486b618c2ba67dff2d (diff) | |
| parent | 18f6a161017f5350d9487181f4b4ed66a53a0284 (diff) | |
| download | forums-fc1dfd779da37128382322ffdc75bf751a0834a3.tar forums-fc1dfd779da37128382322ffdc75bf751a0834a3.tar.gz forums-fc1dfd779da37128382322ffdc75bf751a0834a3.tar.bz2 forums-fc1dfd779da37128382322ffdc75bf751a0834a3.tar.xz forums-fc1dfd779da37128382322ffdc75bf751a0834a3.zip | |
Merge remote-tracking branch 'Hardolaf/feature/oauth' into develop
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 7cc3e11129..bf973fe141 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3206,7 +3206,7 @@ function confirm_box($check, $title = '', $hidden = '', $html_body = 'confirm_bo function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = false, $s_display = true) { global $db, $user, $template, $auth, $phpEx, $phpbb_root_path, $config; - global $request; + global $request, $phpbb_container; if (!class_exists('phpbb_captcha_factory', false)) { @@ -3233,7 +3233,7 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa trigger_error('NO_AUTH_ADMIN'); } - if (isset($_POST['login'])) + if ($request->is_set_post('login') || ($request->is_set('login') && $request->variable('login', '') == 'external')) { // Get credential if ($admin) @@ -3374,6 +3374,29 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa $s_hidden_fields['credential'] = $credential; } + $auth_provider = $phpbb_container->get('auth.provider.' . $config['auth_method']); + + $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'], + )); + } + $s_hidden_fields = build_hidden_fields($s_hidden_fields); $template->assign_vars(array( |