beenull/XBackBone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reworked user controller

Browse source
This commit is contained in:
Sergio Brighenti 2020-03-19 16:47:28 +01:00
parent 5bbbdd6160
commit 8e75668d2f
1 changed files with 41 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
app/Controllers/UserController.php
View file

@ -99,37 +99,7 @@ class UserController extends Controller
);
if (param($request, 'send_notification') !== null) {
if ($hasPassword) {
$message = lang('mail.new_account_text_with_pw', [
param($request, 'username'),
$this->config['app_name'],
$this->config['base_url'],
param($request, 'username'),
param($request, 'password'),
route('login.show'),
]);
} else {
$resetToken = bin2hex(random_bytes(16));
$this->database->query('UPDATE `users` SET `reset_token`=? WHERE `id` = ?', [
$resetToken,
$this->database->getPdo()->lastInsertId(),
]);
$message = lang('mail.new_account_text_with_reset', [
param($request, 'username'),
$this->config['app_name'],
$this->config['base_url'],
route('recover.password', ['resetToken' => $resetToken]),
]);
}
Mail::make()
->from(platform_mail(), $this->config['app_name'])
->to(param($request, 'email'))
->subject(lang('mail.new_account', [$this->config['app_name']]))
->message($message)
->send();
$this->sendCreateNotification($hasPassword, $request);
}
$this->session->alert(lang('user_created', [param($request, 'username')]), 'success');
@ -303,4 +273,44 @@ class UserController extends Controller
return $response;
}
/**
* @param $hasPassword
* @param $request
* @throws \Exception
*/
private function sendCreateNotification($hasPassword, $request)
{
if ($hasPassword) {
$message = lang('mail.new_account_text_with_pw', [
param($request, 'username'),
$this->config['app_name'],
$this->config['base_url'],
param($request, 'username'),
param($request, 'password'),
route('login.show'),
]);
} else {
$resetToken = bin2hex(random_bytes(16));
$this->database->query('UPDATE `users` SET `reset_token`=? WHERE `id` = ?', [
$resetToken,
$this->database->getPdo()->lastInsertId(),
]);
$message = lang('mail.new_account_text_with_reset', [
param($request, 'username'),
$this->config['app_name'],
$this->config['base_url'],
route('recover.password', ['resetToken' => $resetToken]),
]);
}
Mail::make()
->from(platform_mail(), $this->config['app_name'])
->to(param($request, 'email'))
->subject(lang('mail.new_account', [$this->config['app_name']]))
->message($message)
->send();
}
}