1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-30 04:38:21 +02:00

Merge branch '3.1.x'

This commit is contained in:
Marc Alexander 2015-10-24 18:23:52 +02:00
commit 5f85f19a5e

View File

@ -928,6 +928,7 @@ class auth
function login($username, $password, $autologin = false, $viewonline = 1, $admin = 0)
{
global $db, $user, $phpbb_root_path, $phpEx, $phpbb_container;
global $phpbb_dispatcher;
/* @var $provider_collection \phpbb\auth\provider_collection */
$provider_collection = $phpbb_container->get('auth.provider_collection');
@ -983,6 +984,24 @@ class auth
redirect($url);
}
/**
* Event is triggered after checking for valid username and password, and before the actual session creation.
*
* @event core.auth_login_session_create_before
* @var array login Variable containing login array
* @var bool admin Boolean variable whether user is logging into the ACP
* @var string username Username of user to log in
* @var bool autologin Boolean variable signaling whether login is triggered via auto login
* @since 3.1.7-RC1
*/
$vars = array(
'login',
'admin',
'username',
'autologin',
);
extract($phpbb_dispatcher->trigger_event('core.auth_login_session_create_before', compact($vars)));
// If login succeeded, we will log the user in... else we pass the login array through...
if ($login['status'] == LOGIN_SUCCESS)
{