Reword email settings + move two new settings

This commit is contained in:
slawkens
2023-07-22 09:48:44 +02:00
parent baf9c9ea61
commit b92b642078
4 changed files with 46 additions and 17 deletions

View File

@@ -69,7 +69,7 @@ else
$account_logged->logAction('Account password changed.');
$message = '';
if(setting('core.mail_enabled') && $config['send_mail_when_change_password']) {
if(setting('core.mail_enabled') && setting('core.mail_send_when_change_password')) {
$mailBody = $twig->render('mail.password_changed.html.twig', array(
'new_password' => $org_pass,
'ip' => get_browser_real_ip(),
@@ -89,4 +89,4 @@ else
));
setSession('password', $new_password);
}
}
}

View File

@@ -31,7 +31,7 @@ if(isset($_POST['registeraccountsave']) && $_POST['registeraccountsave'] == "1")
$account_logged->logAction('Generated recovery key.');
$message = '';
if(setting('core.mail_enabled') && $config['send_mail_when_generate_reckey'])
if(setting('core.mail_enabled') && setting('core.mail_send_when_generate_reckey'))
{
$mailBody = $twig->render('mail.account.register.html.twig', array(
'recovery_key' => $new_rec_key