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

Reword email settings + move two new settings

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
system/config.php
View File

@ -29,8 +29,6 @@ $config = array(
// //
'generate_new_reckey' => true, // let player generate new recovery key, he will receive e-mail with new rec key (not display on page, hacker can't generate rec key) 'generate_new_reckey' => true, // let player generate new recovery key, he will receive e-mail with new rec key (not display on page, hacker can't generate rec key)
'generate_new_reckey_price' => 20, // price for new recovery key 'generate_new_reckey_price' => 20, // price for new recovery key
'send_mail_when_change_password' => true, // send e-mail with new password when change password to account
'send_mail_when_generate_reckey' => true, // send e-mail with rec key (key is displayed on page anyway when generate)
// new character config // new character config
'character_samples' => array( // vocations, format: ID_of_vocation => 'Name of Character to copy' 'character_samples' => array( // vocations, format: ID_of_vocation => 'Name of Character to copy'

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

@ -69,7 +69,7 @@ else
$account_logged->logAction('Account password changed.'); $account_logged->logAction('Account password changed.');
$message = ''; $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( $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(),

2
system/pages/account/register.php
View File

@ -31,7 +31,7 @@ if(isset($_POST['registeraccountsave']) && $_POST['registeraccountsave'] == "1")
$account_logged->logAction('Generated recovery key.'); $account_logged->logAction('Generated recovery key.');
$message = ''; $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( $mailBody = $twig->render('mail.account.register.html.twig', array(
'recovery_key' => $new_rec_key 'recovery_key' => $new_rec_key

55
system/settings.php
View File

@ -484,6 +484,49 @@ Sent by MyAAC,<br/>
'mail_enabled', '=', 'true' 'mail_enabled', '=', 'true'
] ]
], ],
'mail_other' => [
'type' => 'section',
'title' => 'Account E-Mails',
'show_if' => [
'mail_enabled', '=', 'true'
],
],
'account_welcome_mail' => [
'name' => 'Account Welcome E-Mail',
'type' => 'boolean',
'desc' => 'Send welcome e-mail when user registers',
'default' => true,
'show_if' => [
'mail_enabled', '=', 'true'
],
],
'account_mail_verify' => [
'name' => 'Account E-Mail Verify',
'type' => 'boolean',
'desc' => 'Force users to confirm their e-mail addresses when registering account',
'default' => false,
'show_if' => [
'mail_enabled', '=', 'true'
],
],
'mail_send_when_change_password' => [
'name' => 'Change Password E-Mail',
'type' => 'boolean',
'desc' => 'Send e-mail with new password when change password to account',
'default' => true,
'show_if' => [
'mail_enabled', '=', 'true',
],
],
'mail_send_when_generate_reckey' => [
'name' => 'Generate Recovery Key E-Mail',
'type' => 'boolean',
'desc' => 'Send e-mail with recovery key (key is displayed on page anyway when generate)',
'default' => true,
'show_if' => [
'mail_enabled', '=', 'true',
],
],
[ [
'type' => 'category', 'type' => 'category',
'title' => 'Accounts', 'title' => 'Accounts',
@ -522,12 +565,6 @@ Sent by MyAAC,<br/>
'desc' => 'Allow to create character directly on create account page?', 'desc' => 'Allow to create character directly on create account page?',
'default' => true, 'default' => true,
], ],
'account_mail_verify' => [
'name' => 'Account Mail Verify',
'type' => 'boolean',
'desc' => 'Force users to confirm their email addresses when registering account',
'default' => false,
],
'account_mail_unique' => [ 'account_mail_unique' => [
'name' => 'Account Mail Unique', 'name' => 'Account Mail Unique',
'type' => 'boolean', 'type' => 'boolean',
@ -546,12 +583,6 @@ Sent by MyAAC,<br/>
'desc' => 'Default premium points on new account', 'desc' => 'Default premium points on new account',
'default' => 0, 'default' => 0,
], ],
'account_welcome_mail' => [
'name' => 'Account Welcome Mail',
'type' => 'boolean',
'desc' => 'Send welcome email when user registers',
'default' => true,
],
'account_mail_change' => [ 'account_mail_change' => [
'name' => 'Account Mail Change Days', 'name' => 'Account Mail Change Days',
'type' => 'number', 'type' => 'number',