Digitalstack/myaac
2
0
Fork 0
mirror of https://github.com/slawkens/myaac.git synced 2025-04-27 17:59:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

formatting

Browse Source
This commit is contained in:
slawkens 2023-02-16 11:24:19 +01:00
parent 523f9dd95a
commit 3c4e50dbda
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
system/pages/account/change_password.php
View File

@ -26,11 +26,11 @@ if(empty($new_password) && empty($new_password2) && empty($old_password)) {
else else
{ {
if(empty($new_password) || empty($new_password2) || empty($old_password)){ if(empty($new_password) || empty($new_password2) || empty($old_password)){
$errors[] = "Please fill in form."; $errors[] = 'Please fill in form.';
} }
$password_strlen = strlen($new_password); $password_strlen = strlen($new_password);
if($new_password != $new_password2) { if($new_password != $new_password2) {
$errors[] = "The new passwords do not match!"; $errors[] = 'The new passwords do not match!';
} }
if(empty($errors)) { if(empty($errors)) {
@ -41,11 +41,12 @@ else
/** @var OTS_Account $account_logged */ /** @var OTS_Account $account_logged */
$old_password = encrypt((USE_ACCOUNT_SALT ? $account_logged->getCustomField('salt') : '') . $old_password); $old_password = encrypt((USE_ACCOUNT_SALT ? $account_logged->getCustomField('salt') : '') . $old_password);
if($old_password != $account_logged->getPassword()) { if($old_password != $account_logged->getPassword()) {
$errors[] = "Current password is incorrect!"; $errors[] = 'Current password is incorrect!';
} }
$hooks->trigger(HOOK_ACCOUNT_CHANGE_PASSWORD_POST); $hooks->trigger(HOOK_ACCOUNT_CHANGE_PASSWORD_POST);
} }
if(!empty($errors)){ if(!empty($errors)){
//show errors //show errors
$twig->display('error_box.html.twig', array('errors' => $errors)); $twig->display('error_box.html.twig', array('errors' => $errors));
@ -53,12 +54,10 @@ else
//show form //show form
$twig->display('account.change_password.html.twig'); $twig->display('account.change_password.html.twig');
} }
else else {
{
$org_pass = $new_password; $org_pass = $new_password;
if(USE_ACCOUNT_SALT) if(USE_ACCOUNT_SALT) {
{
$salt = generateRandomString(10, false, true, true); $salt = generateRandomString(10, false, true, true);
$new_password = $salt . $new_password; $new_password = $salt . $new_password;
$account_logged->setCustomField('salt', $salt); $account_logged->setCustomField('salt', $salt);
@ -70,18 +69,19 @@ else
$account_logged->logAction('Account password changed.'); $account_logged->logAction('Account password changed.');
$message = ''; $message = '';
if($config['mail_enabled'] && $config['send_mail_when_change_password']) if($config['mail_enabled'] && $config['send_mail_when_change_password']) {
{
$mailBody = $twig->render('mail.password_changed.html.twig', array( $mailBody = $twig->render('mail.password_changed.html.twig', array(
'new_password' => $org_pass, 'new_password' => $org_pass,
'ip' => get_browser_real_ip(), 'ip' => get_browser_real_ip(),
)); ));
if(_mail($account_logged->getEMail(), $config['lua']['serverName']." - Changed password", $mailBody)) if(_mail($account_logged->getEMail(), $config['lua']['serverName']." - Changed password", $mailBody)) {
$message = '<br/><small>Your new password were send on email address <b>' . $account_logged->getEMail() . '</b>.</small>'; $message = '<br/><small>Your new password were send on email address <b>' . $account_logged->getEMail() . '</b>.</small>';
else }
else {
$message = '<br/><p class="error">An error occurred while sending email. For Admin: More info can be found in system/logs/mailer-error.log</p>'; $message = '<br/><p class="error">An error occurred while sending email. For Admin: More info can be found in system/logs/mailer-error.log</p>';
} }
}
$twig->display('success.html.twig', array( $twig->display('success.html.twig', array(
'title' => 'Password Changed', 'title' => 'Password Changed',