Merge branch 'master' into phpdoc-events

This commit is contained in:
bscheshirwork
2018-10-19 12:26:04 +03:00

View File

@ -25,7 +25,7 @@ use yii\console\Application as ConsoleApplication;
use yii\i18n\PhpMessageSource; use yii\i18n\PhpMessageSource;
use yii\web\Application as WebApplication; use yii\web\Application as WebApplication;
use yii\base\Event; use yii\base\Event as YiiEvent;
use Da\User\Event\FormEvent; use Da\User\Event\FormEvent;
use Da\User\Controller\SecurityController; use Da\User\Controller\SecurityController;
@ -153,7 +153,7 @@ class Bootstrap implements BootstrapInterface
// Attach an event to check if the password has expired // Attach an event to check if the password has expired
if (!is_null(Yii::$app->getModule('user')->maxPasswordAge)) { if (!is_null(Yii::$app->getModule('user')->maxPasswordAge)) {
Event::on(SecurityController::class, FormEvent::EVENT_AFTER_LOGIN, function (FormEvent $event) { YiiEvent::on(SecurityController::class, FormEvent::EVENT_AFTER_LOGIN, function (FormEvent $event) {
$user = $event->form->user; $user = $event->form->user;
if ($user->password_age >= Yii::$app->getModule('user')->maxPasswordAge) { if ($user->password_age >= Yii::$app->getModule('user')->maxPasswordAge) {
// Force password change // Force password change