diff --git a/system/pages/account/change-password.php b/system/pages/account/change-password.php index 157515b7..a48902e7 100644 --- a/system/pages/account/change-password.php +++ b/system/pages/account/change-password.php @@ -22,7 +22,7 @@ csrfProtect(); $new_password = $_POST['new_password'] ?? null; $new_password_confirm = $_POST['new_password_confirm'] ?? null; $old_password = $_POST['old_password'] ?? null; -if(empty($new_password) && empty($new_password_confirm) && empty($old_password)) { +if(is_null($new_password) && is_null($new_password_confirm) && is_null($old_password)) { $twig->display('account.change-password.html.twig'); } else { diff --git a/system/pages/account/register-new.php b/system/pages/account/register-new.php index bca3b798..d328a310 100644 --- a/system/pages/account/register-new.php +++ b/system/pages/account/register-new.php @@ -48,7 +48,7 @@ else $account_logged->setCustomField('key', $new_rec_key); $account_logged->setCustomField(setting('core.donate_column'), $account_logged->getCustomField(setting('core.donate_column')) - setting('core.account_generate_new_reckey_price')); $account_logged->logAction('Generated new recovery key for ' . setting('core.account_generate_new_reckey_price') . ' premium points.'); - $message = '
Your recovery key were send on email address '.$account_logged->getEMail().' for '.setting('core.account_generate_new_reckey_price').' premium points.'; + $message = '
Your recovery key was sent on email address '.$account_logged->getEMail().' for '.setting('core.account_generate_new_reckey_price').' premium points.'; } else $message = '

An error occurred while sending email ( '.$account_logged->getEMail().' ) with recovery key! Recovery key not changed. Try again later. For Admin: More info can be found in system/logs/mailer-error.log

'; diff --git a/system/templates/account.change-email.html.twig b/system/templates/account.change-email.html.twig index ab2a8c06..3fde55a9 100644 --- a/system/templates/account.change-email.html.twig +++ b/system/templates/account.change-email.html.twig @@ -5,18 +5,18 @@ Please enter your password and the new email address. Make sure that you enter a
- New Email Address: + - +
- Password: + - +
diff --git a/system/templates/account.change-info.html.twig b/system/templates/account.change-info.html.twig index e3481472..9461b986 100644 --- a/system/templates/account.change-info.html.twig +++ b/system/templates/account.change-info.html.twig @@ -4,20 +4,26 @@ Here you can tell other players about yourself. This information will be display {% set content %} - + - + {% if setting('core.account_country') %} - +
Real Name: + + - +
Location: + + - +
Country: + +
- Current Password: + @@ -17,7 +17,7 @@ Please enter your current password and a new password. For your security, please
- New Password: + @@ -28,7 +28,7 @@ Please enter your current password and a new password. For your security, please
- New Password Again: + diff --git a/system/templates/account.characters.change-name.html.twig b/system/templates/account.characters.change-name.html.twig index 7a0cfe22..f70eaf89 100644 --- a/system/templates/account.characters.change-name.html.twig +++ b/system/templates/account.characters.change-name.html.twig @@ -1,4 +1,4 @@ -To change a name of character select player and choose a new name.
+To change the name of a character, select a player and choose a new name.
Change name cost {{ setting('core.account_change_character_name_price') }} {{ setting('core.donate_column') == 'coins' ? 'coins' : 'premium points' }}. You have {{ points }} {{ setting('core.donate_column') == 'coins' ? 'coins' : 'premium points' }}.

{% set title = 'Change Name' %} @@ -6,9 +6,11 @@ To change a name of character select player and choose a new name.
{% set content %} - + - + {% if setting('core.mail_enabled') and setting('core.account_mail_verify') %} - + {% endif %} {{ hook('HOOK_ACCOUNT_CREATE_AFTER_EMAIL') }} diff --git a/system/templates/account.generate_new_recovery_key.html.twig b/system/templates/account.generate_new_recovery_key.html.twig index fc48d3a9..2c743378 100644 --- a/system/templates/account.generate_new_recovery_key.html.twig +++ b/system/templates/account.generate_new_recovery_key.html.twig @@ -1,13 +1,15 @@ -To generate new recovery key for your account please enter your password.
-New recovery key cost {{ setting('core.account_generate_new_reckey_price') }} Premium Points. You have {{ points }} premium points. You will receive e-mail with this recovery key. +To generate a new recovery key for your account, please enter your password.
+New recovery key cost {{ setting('core.account_change_character_name_price') }} {{ setting('core.donate_column') == 'coins' ? 'coins' : 'premium points' }}. You have {{ points }} {{ setting('core.donate_column') == 'coins' ? 'coins' : 'premium points' }}. You will receive an e-mail with this recovery key.
{% set title = 'Generate recovery key' %} {% set background = config('darkborder') %} {% set content %}
Character: + + - {% for player in account_logged.getPlayersList(false) %} {% endfor %} @@ -16,7 +18,9 @@ To change a name of character select player and choose a new name.
New Name: + + diff --git a/system/templates/account.characters.change-sex.html.twig b/system/templates/account.characters.change-sex.html.twig index 440fed9f..7dd35fa1 100644 --- a/system/templates/account.characters.change-sex.html.twig +++ b/system/templates/account.characters.change-sex.html.twig @@ -6,9 +6,11 @@ To change a sex of character select player and choose a new sex.
{% set content %} - + - + - + - +
Character: + + - {% for player in players %} {% endfor %} @@ -16,9 +18,11 @@ To change a sex of character select player and choose a new sex.
New Sex: + + - {% for id, gender in config.genders %} {% endfor %} diff --git a/system/templates/account.characters.delete.html.twig b/system/templates/account.characters.delete.html.twig index b946d221..172c36b1 100644 --- a/system/templates/account.characters.delete.html.twig +++ b/system/templates/account.characters.delete.html.twig @@ -4,15 +4,19 @@ To delete a character enter the name of the character and your password.

Character Name: + + - +
Password: + + - +
diff --git a/system/templates/account.create.html.twig b/system/templates/account.create.html.twig index 2e5267e2..6e71d045 100644 --- a/system/templates/account.create.html.twig +++ b/system/templates/account.create.html.twig @@ -48,7 +48,7 @@
Please use real address!
We will send a link to validate your Email.
Please use a real address!
We will send a link to validate your Email.
- - + +
Password: + +
{% endset %} @@ -18,7 +20,7 @@ To generate new recovery key for your account please enter your password.
 -
+
{{ csrf() }} @@ -31,7 +33,7 @@ To generate new recovery key for your account please enter your password.
 -
+ {{ csrf() }} {{ include('buttons.back.html.twig') }} diff --git a/system/templates/account.generate_recovery_key.html.twig b/system/templates/account.generate_recovery_key.html.twig index 526d4659..82901be8 100644 --- a/system/templates/account.generate_recovery_key.html.twig +++ b/system/templates/account.generate_recovery_key.html.twig @@ -5,10 +5,10 @@ To generate recovery key for your account please enter your password.

- Password: + - +
@@ -20,7 +20,7 @@ To generate recovery key for your account please enter your password.

 -
+ {{ csrf() }}