diff --git a/system/pages/account/lost.php b/system/pages/account/lost.php
index 79c739cb..42e23d38 100644
--- a/system/pages/account/lost.php
+++ b/system/pages/account/lost.php
@@ -17,532 +17,31 @@ if(!setting('core.mail_enabled'))
return;
}
-$action_type = isset($_REQUEST['action_type']) ? $_REQUEST['action_type'] : '';
-if($action == '')
-{
+$action_type = $_REQUEST['action_type'] ?? '';
+if($action == '') {
$twig->display('account.lost.form.html.twig');
}
else if($action == 'step1' && $action_type == '') {
$twig->display('account.lost.noaction.html.twig');
}
-elseif($action == 'step1' && $action_type == 'email')
-{
- $nick = stripslashes($_REQUEST['nick']);
- if(Validator::characterName($nick))
- {
- $player = new OTS_Player();
- $account = new OTS_Account();
- $player->find($nick);
- if($player->isLoaded())
- $account = $player->getAccount();
-
- if($account->isLoaded())
- {
- if($account->getCustomField('email_next') < time())
- echo 'Please enter e-mail to account with this character.
-
+
+{% set _center = false %}
+
+{% if center is defined and center %}
+{% set _center = true %}
+{% endif %}
+
+{% if _center %}
+
+
+
+ |
+{% endif %}
+
+{% if _center %}
+ |
+
+
+
+{% endif %}
diff --git a/system/templates/account.lost.check-code.html.twig b/system/templates/account.lost.check-code.html.twig
new file mode 100644
index 00000000..1ee60406
--- /dev/null
+++ b/system/templates/account.lost.check-code.html.twig
@@ -0,0 +1,24 @@
+Please enter code from e-mail and name of one character from account. Then press Submit.
+
diff --git a/system/templates/account.lost.finish.new-email.html.twig b/system/templates/account.lost.finish.new-email.html.twig
new file mode 100644
index 00000000..4fd6d3d6
--- /dev/null
+++ b/system/templates/account.lost.finish.new-email.html.twig
@@ -0,0 +1,26 @@
+Your account name, new password and new e-mail.
+
+
+ |
+ Your account name, new password and new e-mail
+ |
+
+
+
+ Account name: {{ account.getName() }}
+ New password: {{ newPassword }}
+ New e-mail address: {{ newEmail }}
+ {{ statusMsg|raw }}
+ |
+
+
+
+
diff --git a/system/templates/account.lost.finish.new-password.html.twig b/system/templates/account.lost.finish.new-password.html.twig
new file mode 100644
index 00000000..72af2fe5
--- /dev/null
+++ b/system/templates/account.lost.finish.new-password.html.twig
@@ -0,0 +1,23 @@
+New password to your account is below. Now you can login.
+
+
+ | Changed password |
+
+
+
+ New password: {{ newPassword }}
+ Account name: (Already on your e-mail)
+ {{ statusMsg|raw }}
+ |
+
+
+
+
diff --git a/system/templates/account.lost.step1-email.html.twig b/system/templates/account.lost.step1-email.html.twig
new file mode 100644
index 00000000..c51510df
--- /dev/null
+++ b/system/templates/account.lost.step1-email.html.twig
@@ -0,0 +1,23 @@
+Please enter e-mail to account with this character.
+
diff --git a/system/templates/account.lost.step2.html.twig b/system/templates/account.lost.step2.html.twig
new file mode 100644
index 00000000..2849fae2
--- /dev/null
+++ b/system/templates/account.lost.step2.html.twig
@@ -0,0 +1,27 @@
+Set new password and e-mail to your account.
+
diff --git a/system/templates/mail.account.lost.code.html.twig b/system/templates/mail.account.lost.code.html.twig
new file mode 100644
index 00000000..cf0f1fd3
--- /dev/null
+++ b/system/templates/mail.account.lost.code.html.twig
@@ -0,0 +1,10 @@
+You asked to reset your {{ config('lua')['serverName'] }} password.
+Account name: {{ account.getName() }}
+
+To do so, please click this link:
+
+ {{ getLink('account/lost') }}?action=check-code&code={{ newCode }}&character={{ nick|urlencode }}
+
+or open page: {{ getLink('account/lost') }}?action=check-code and in field "code" write {{ newCode }}
+
+If you did not request a password change, you may ignore this message and your password will remain unchanged.
diff --git a/system/templates/mail.account.lost.new-email.html.twig b/system/templates/mail.account.lost.new-email.html.twig
new file mode 100644
index 00000000..af22cc79
--- /dev/null
+++ b/system/templates/mail.account.lost.new-email.html.twig
@@ -0,0 +1,7 @@
+
Your account name and new password!
+Changed password and e-mail to your account in Lost Account Interface on server {{ config('lua')['serverName'] }}
+Account name: {{ account.getName() }}
+New password: {{ newPassword }}
+E-mail: {{ $newEmail }} (this e-mail)
+
+It's automatic e-mail from OTS Lost Account System. Do not reply!
diff --git a/system/templates/mail.account.lost.new-password.html.twig b/system/templates/mail.account.lost.new-password.html.twig
new file mode 100644
index 00000000..17eca26d
--- /dev/null
+++ b/system/templates/mail.account.lost.new-password.html.twig
@@ -0,0 +1,6 @@
+Your account name and password!
+Changed password to your account in Lost Account Interface on server config('lua')['serverName'] }}
+Account name: {{ account.getName() }}
+New password: {{ newPassword }}
+
+It's automatic e-mail from OTS Lost Account System. Do not reply!