diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-03-10 12:19:10 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-03-10 12:19:10 +0100 |
| commit | 0e84856a45670a3f27c41e439e880f2cdcf81bbc (patch) | |
| tree | 030a24114c7254a9baa020e9246ed0f538386987 /phpBB/includes/functions.php | |
| parent | 2c813e6e5ebc911153a23e75c459e2f80de67f25 (diff) | |
| parent | 9bcf8df5d0bf1ca813f4fb860ea3128aa905104a (diff) | |
| download | forums-0e84856a45670a3f27c41e439e880f2cdcf81bbc.tar forums-0e84856a45670a3f27c41e439e880f2cdcf81bbc.tar.gz forums-0e84856a45670a3f27c41e439e880f2cdcf81bbc.tar.bz2 forums-0e84856a45670a3f27c41e439e880f2cdcf81bbc.tar.xz forums-0e84856a45670a3f27c41e439e880f2cdcf81bbc.zip | |
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 94a8e7a405..be51a7342d 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2233,6 +2233,21 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa $user->setup(); } + /** + * This event allows an extension to modify the login process + * + * @event core.login_box_before + * @var string redirect Redirect string + * @var string l_explain Explain language string + * @var string l_success Success language string + * @var bool admin Is admin? + * @var bool s_display Display full login form? + * @var string err Error string + * @since 3.1.9-RC1 + */ + $vars = array('redirect', 'l_explain', 'l_success', 'admin', 's_display', 'err'); + extract($phpbb_dispatcher->trigger_event('core.login_box_before', compact($vars))); + // Print out error if user tries to authenticate as an administrator without having the privileges... if ($admin && !$auth->acl_get('a_')) { @@ -2245,7 +2260,7 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa trigger_error('NO_AUTH_ADMIN'); } - if ($request->is_set_post('login') || ($request->is_set('login') && $request->variable('login', '') == 'external')) + if (empty($err) && ($request->is_set_post('login') || ($request->is_set('login') && $request->variable('login', '') == 'external'))) { // Get credential if ($admin) @@ -2314,11 +2329,11 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa * * @event core.login_box_redirect * @var string redirect Redirect string - * @var boolean admin Is admin? - * @var bool return If true, do not redirect but return the sanitized URL. + * @var bool admin Is admin? * @since 3.1.0-RC5 + * @changed 3.1.9-RC1 Removed undefined return variable */ - $vars = array('redirect', 'admin', 'return'); + $vars = array('redirect', 'admin'); extract($phpbb_dispatcher->trigger_event('core.login_box_redirect', compact($vars))); // append/replace SID (may change during the session for AOL users) |