This commit is contained in:
resurtm
2017-01-11 22:42:15 +06:00
parent a3434504e6
commit 1cb60f0740
78 changed files with 354 additions and 290 deletions

View File

@ -50,7 +50,7 @@ class SocialNetworkAuthenticateService implements ServiceInterface
{
$account = $this->socialNetworkAccountQuery->whereClient($this->client)->one();
if (!$this->controller->module->enableRegistration && ($account === null || $account->user === null)) {
Yii::$app->session->setFlash('danger', Yii::t('user', 'Registration on this website is disabled'));
Yii::$app->session->setFlash('danger', Yii::t('usuario', 'Registration on this website is disabled'));
$this->authAction->setSuccessUrl(Url::to(['/usr/security/login']));
return false;
@ -58,7 +58,7 @@ class SocialNetworkAuthenticateService implements ServiceInterface
if ($account === null) {
$account = $this->createAccount();
if (!$account) {
Yii::$app->session->setFlash('danger', Yii::t('user', 'Unable to create an account.'));
Yii::$app->session->setFlash('danger', Yii::t('usuario', 'Unable to create an account.'));
$this->authAction->setSuccessUrl(Url::to(['/usr/security/login']));
return false;
@ -69,7 +69,7 @@ class SocialNetworkAuthenticateService implements ServiceInterface
$this->controller->trigger(SocialNetworkAuthEvent::EVENT_BEFORE_AUTHENTICATE, $event);
if ($account->user instanceof User) {
if ($account->user->getIsBlocked()) {
Yii::$app->session->setFlash('danger', Yii::t('user', 'Your account has been blocked.'));
Yii::$app->session->setFlash('danger', Yii::t('usuario', 'Your account has been blocked.'));
$this->authAction->setSuccessUrl(Url::to(['/user/security/login']));
} else {
Yii::$app->user->login($account->user, $this->controller->module->rememberLoginLifeSpan);