mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-10 21:38:54 +00:00
Merge branch '3.1.x'
This commit is contained in:
commit
5f85f19a5e
1 changed files with 19 additions and 0 deletions
|
@ -928,6 +928,7 @@ class auth
|
||||||
function login($username, $password, $autologin = false, $viewonline = 1, $admin = 0)
|
function login($username, $password, $autologin = false, $viewonline = 1, $admin = 0)
|
||||||
{
|
{
|
||||||
global $db, $user, $phpbb_root_path, $phpEx, $phpbb_container;
|
global $db, $user, $phpbb_root_path, $phpEx, $phpbb_container;
|
||||||
|
global $phpbb_dispatcher;
|
||||||
|
|
||||||
/* @var $provider_collection \phpbb\auth\provider_collection */
|
/* @var $provider_collection \phpbb\auth\provider_collection */
|
||||||
$provider_collection = $phpbb_container->get('auth.provider_collection');
|
$provider_collection = $phpbb_container->get('auth.provider_collection');
|
||||||
|
@ -983,6 +984,24 @@ class auth
|
||||||
redirect($url);
|
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 succeeded, we will log the user in... else we pass the login array through...
|
||||||
if ($login['status'] == LOGIN_SUCCESS)
|
if ($login['status'] == LOGIN_SUCCESS)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Reference in a new issue