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

Merge branch 'master' into master

Browse Source
This commit is contained in:
Lorenzo Milesi
2022-08-11 09:53:06 +02:00
committed by GitHub
parent b41938c09b af88df2de3
commit 7147236e68
123 changed files with 2708 additions and 747 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/User/Service/UserCreateService.php
View File

@ -57,7 +57,7 @@ class UserCreateService implements ServiceInterface
$model->confirmed_at = time();
$model->password = !empty($model->password)
? $model->password
: $this->securityHelper->generatePassword(8, $this->getModule('user')->minPasswordRequirements);
: $this->securityHelper->generatePassword(8, $this->getModule()->minPasswordRequirements);
/** @var UserEvent $event */
$event = $this->make(UserEvent::class, [$model]);
@ -75,15 +75,15 @@ class UserCreateService implements ServiceInterface
'Error sending welcome message to "{email}". Please try again later.',
['email' => $model->email]
);
// from web generate a flash message
if (is_a(Yii::$app, yii\web\Application::class)) {
// from web display a flash message (if enabled)
if ($this->getModule()->enableFlashMessages === true && is_a(Yii::$app, yii\web\Application::class)) {
Yii::$app->session->setFlash(
'warning',
$error_msg
);
}
// if we're from console add an error to the model in order to return an error message
if (is_a(Yii::$app, yii\console\Application::class)) {
if (is_a(Yii::$app, "yii\console\Application")) {
$model->addError('username', $error_msg);
}
$transaction->rollBack();