mirror of
https://github.com/the-djmaze/snappymail.git
synced 2025-01-21 14:22:23 +08:00
Merge branch 'master' into plugin-2fa
This commit is contained in:
commit
906959b2c2
2 changed files with 1 additions and 2 deletions
|
@ -1513,8 +1513,6 @@ class Actions
|
|||
if (!$oAccount) {
|
||||
throw new Exceptions\ClientException(Notifications::AuthError);
|
||||
}
|
||||
|
||||
$this->Plugins()->RunHook('login.success', array($oAccount));
|
||||
} catch (\Throwable $oException) {
|
||||
$this->loginErrorDelay();
|
||||
$this->LoggerAuthHelper($oAccount, $this->getAdditionalLogParamsByUserLogin($sInputEmail));
|
||||
|
|
|
@ -34,6 +34,7 @@ trait User
|
|||
{
|
||||
$oAccount = $this->LoginProcess($sEmail, $sPassword,
|
||||
$bSignMe ? $this->generateSignMeToken($sEmail) : '');
|
||||
$this->Plugins()->RunHook('login.success', array($oAccount));
|
||||
}
|
||||
catch (ClientException $oException)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue