leonardo/yii2-usuario
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wip

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/User/Service/EmailChangeService.php
View File

@ -38,13 +38,13 @@ class EmailChangeService implements ServiceInterface
->one();
if ($token === null || $token->getIsExpired()) {
Yii::$app->session->setFlash('danger', Yii::t('user', 'Your confirmation token is invalid or expired'));
Yii::$app->session->setFlash('danger', Yii::t('usuario', 'Your confirmation token is invalid or expired'));
return false;
} else {
$token->delete();
if (empty($this->model->unconfirmed_email)) {
Yii::$app->session->setFlash('danger', Yii::t('user', 'An error occurred processing your request'));
Yii::$app->session->setFlash('danger', Yii::t('usuario', 'An error occurred processing your request'));
} elseif ($this->userQuery->whereEmail($this->model->unconfirmed_email)->exists() === false) {
if ($this->getModule()->emailChangeStrategy === MailChangeStrategyInterface::TYPE_SECURE) {
if ($token->type === Token::TYPE_CONFIRM_NEW_EMAIL) {
@ -52,7 +52,7 @@ class EmailChangeService implements ServiceInterface
Yii::$app->session->setFlash(
'success',
Yii::t(
'user',
'usuario',
'Awesome, almost there. '.
'Now you need to click the confirmation link sent to your old email address.'
)
@ -62,7 +62,7 @@ class EmailChangeService implements ServiceInterface
Yii::$app->session->setFlash(
'success',
Yii::t(
'user',
'usuario',
'Awesome, almost there. '.
'Now you need to click the confirmation link sent to your new email address.'
)
@ -74,7 +74,7 @@ class EmailChangeService implements ServiceInterface
) {
$this->model->email = $this->model->unconfirmed_email;
$this->model->unconfirmed_email = null;
Yii::$app->session->setFlash('success', Yii::t('user', 'Your email address has been changed'));
Yii::$app->session->setFlash('success', Yii::t('usuario', 'Your email address has been changed'));
}
return $this->model->save(false);

2
lib/User/Service/PasswordRecoveryService.php
View File

@ -48,7 +48,7 @@ class PasswordRecoveryService implements ServiceInterface
Yii::$app->session->setFlash(
'info',
Yii::t('user', 'An email has been sent with instructions for resetting your password')
Yii::t('usuario', 'An email has been sent with instructions for resetting your password')
);
return true;

4
lib/User/Service/SocialNetworkAccountConnectService.php
View File

@ -58,14 +58,14 @@ class SocialNetworkAccountConnectService implements ServiceInterface
/** @var User $user */
$user = Yii::$app->user->identity;
$account->link('user', $user);
Yii::$app->session->setFlash('success', Yii::t('user', 'Your account has been connected'));
Yii::$app->session->setFlash('success', Yii::t('usuario', 'Your account has been connected'));
$this->controller->trigger(SocialNetworkAuthEvent::EVENT_AFTER_CONNECT, $event);
return true;
} else {
Yii::$app->session->setFlash(
'danger',
Yii::t('user', 'This account has already been connected to another user')
Yii::t('usuario', 'This account has already been connected to another user')
);
}

6
lib/User/Service/SocialNetworkAuthenticateService.php
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);