|
|
@@ -91,22 +91,12 @@ class UserController extends BackendController { |
|
|
|
$user_etablissement->actif = 1; |
|
|
|
$user_etablissement->save(); |
|
|
|
|
|
|
|
// send mail |
|
|
|
if (strlen($model->email)) { |
|
|
|
$etablissement = Etablissement::findOne(Yii::$app->user->identity->id_etablissement); |
|
|
|
Yii::$app->mailer->compose(); |
|
|
|
$mail = Yii::$app->mailer->compose( |
|
|
|
['html' => 'createUserAdmin-html', 'text' => 'createUserAdmin-text'], ['user' => $model, 'etablissement' => $etablissement, 'password' => $password]) |
|
|
|
->setTo($model->email) |
|
|
|
->setFrom(['contact@laboiteapain.net' => 'La boîte à pain']) |
|
|
|
->setSubject('[La boîte à pain] Inscription') |
|
|
|
->send(); |
|
|
|
} |
|
|
|
$model->sendMailWelcome($password) ; |
|
|
|
|
|
|
|
return $this->redirect(['index']); |
|
|
|
} else { |
|
|
|
return $this->render('create', [ |
|
|
|
'model' => $model, |
|
|
|
'model' => $model, |
|
|
|
]); |
|
|
|
} |
|
|
|
} |
|
|
@@ -120,14 +110,25 @@ class UserController extends BackendController { |
|
|
|
public function actionUpdate($id) { |
|
|
|
$model = $this->findModel($id); |
|
|
|
|
|
|
|
$previous_mail = $model->email ; |
|
|
|
|
|
|
|
$user = User::find()->with('userEtablissement')->where(['id' => $model['id']])->one(); |
|
|
|
$user_appartient_etablissement = UserEtablissement::findOne(['id_user' => $id, 'id_etablissement' => Yii::$app->user->identity->id_etablissement]); |
|
|
|
if (($user_appartient_etablissement && count($user->userEtablissement) == 1) || Yii::$app->user->identity->status == USER::STATUS_ADMIN) { |
|
|
|
if ($model->load(Yii::$app->request->post()) && $model->save()) { |
|
|
|
|
|
|
|
// on envoie le mail de bienvenue si le mail vient d'être défini |
|
|
|
if(!strlen($previous_mail) && strlen($model->email)) { |
|
|
|
$password = Password::generate(); |
|
|
|
$model->setPassword($password); |
|
|
|
$model->username = $model->email; |
|
|
|
$model->sendMailWelcome($password) ; |
|
|
|
} |
|
|
|
|
|
|
|
return $this->redirect(['index']); |
|
|
|
} else { |
|
|
|
return $this->render('update', [ |
|
|
|
'model' => $model, |
|
|
|
'model' => $model, |
|
|
|
]); |
|
|
|
} |
|
|
|
} else { |