diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-10-24 18:23:52 +0200 | 
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-10-24 18:23:52 +0200 | 
| commit | 5f85f19a5ea9f89a869c9fcb6391e48faa5cbd0c (patch) | |
| tree | 859e3bb3b7ab11e2b6af4522ede677cca2280a44 /phpBB | |
| parent | 7338c5d84592c29ebbb4e5f55cbbd4cda71ec925 (diff) | |
| parent | 6a7567459d62c8c186c5b1b36dc5345e5d36461a (diff) | |
| download | forums-5f85f19a5ea9f89a869c9fcb6391e48faa5cbd0c.tar forums-5f85f19a5ea9f89a869c9fcb6391e48faa5cbd0c.tar.gz forums-5f85f19a5ea9f89a869c9fcb6391e48faa5cbd0c.tar.bz2 forums-5f85f19a5ea9f89a869c9fcb6391e48faa5cbd0c.tar.xz forums-5f85f19a5ea9f89a869c9fcb6391e48faa5cbd0c.zip  | |
Merge branch '3.1.x'
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/phpbb/auth/auth.php | 19 | 
1 files changed, 19 insertions, 0 deletions
diff --git a/phpBB/phpbb/auth/auth.php b/phpBB/phpbb/auth/auth.php index 92c19fd5f7..fc7cc1a0b1 100644 --- a/phpBB/phpbb/auth/auth.php +++ b/phpBB/phpbb/auth/auth.php @@ -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)  			{  | 
