[WIP] 2fa, separate files, move twigs

system/templates/account.management.html.twig

@@ -148,7 +148,7 @@
 		</form>
 		<br/>
 
-		{{ include('account.2fa.main.html.twig') }}
+		{{ include('account/2fa/main.html.twig') }}
 
 		{{ hook('HOOK_ACCOUNT_MANAGE_BEFORE_ACCOUNT_LOGS') }}
 		<a name="Account+Logs" ></a>

system/templates/account/2fa/connect.html.twig

@@ -9,7 +9,7 @@
 					<tbody><tr>
 						<td class="LabelV"><b>Connect your {{ config.lua.serverName }} account to an authenticator app!</b>
 							<div style="float: right; font-size: 1px;">
-								<form action="{{ getLink('account/2fa') }}?action=email-code" method="post" style="margin: 0px; padding: 0px;">
+								<form action="{{ getLink('account/2fa/app/activate') }}" method="post" style="margin: 0; padding: 0;">
 									{{ csrf() }}
 									{% set button_name = 'Request' %}
 									{% include('buttons.base.html.twig') %}

system/templates/account/2fa/email/activate.html.twig

@@ -10,7 +10,7 @@
 					<tr>
 						<td class="LabelV"><b>Activate email code authentication for your account!</b>
 							<div style="float: right; font-size: 1px;">
-								<form action="{{ getLink('account/2fa') }}?action=email-code&step=activate" method="post" style="margin: 0; padding: 0;">
+								<form action="{{ getLink('account/2fa/email/activate') }}" method="post" style="margin: 0; padding: 0;">
 									{{ csrf() }}
 									{% set button_name = 'Request' %}
 									{% include('buttons.base.html.twig') %}

system/templates/account/2fa/email/activated.html.twig

@@ -6,9 +6,9 @@
 				<tr>
 					<td>
 						<div style="float: right; width: 135px;">
-							<form action="{{ getLink('account/2fa') }}?action=email-code" method="post" style="padding:0;margin:0;">
+							<form action="{{ getLink('account/2fa/email/deactivate') }}" method="post" style="padding:0;margin:0;">
 								{{ csrf() }}
-								<input type="hidden" name="step" value="deactivate">
+
 								{% set button_name = 'Deactivate' %}
 								{{ include('buttons.base.html.twig') }}
 							</form>

system/templates/account/2fa/email/deactivate.html.twig

@@ -10,7 +10,7 @@
 						<tr>
 							<td>To deactivate <b>two-factor email code authentication</b> for your account, enter the
 								received <b>email code</b> below. Note, however, that <b>email code authentication</b>
-								is an important security feature which helps to prevent any unauthorised access to your
+								is an important security feature which helps to prevent any unauthorized access to your
 								Tibia account.
 							</td>
 						</tr>
@@ -28,7 +28,7 @@
 							<td>
 								<div style="float: right;">
 									<form
-										action="{{ getLink('account/2fa') }}?action=email-code&step=resend"
+										action="{{ getLink('account/2fa/email/resend-code') }}"
 										method="post"
 										style="padding:0;margin:0;"
 									>
@@ -86,10 +86,9 @@
 	<tbody>
 	<tr align="center" valign="top">
 		<td>
-			<form id="form-code" method="post" action="{{ getLink('account/2fa') }}?action=email-code">
+			<form id="form-code" method="post" action="{{ getLink('account/2fa/email/deactivate') }}">
 				{{ csrf() }}
 
-				<input type="hidden" name="step" value="deactivate">
 				<input type="hidden" name="save" value="1">
 
 				{% set button_name = 'Continue' %}

system/templates/account/2fa/email/login.html.twig

@@ -11,7 +11,7 @@
 						<td>
 							<div style="float: right;">
 								<form
-										action="{{ getLink('account/2fa') }}?action=email-code&step=resend"
+										action="{{ getLink('account/2fa/email/resend-code') }}"
 										method="post"
 										style="padding:0;margin:0;"
 								>

system/templates/account/2fa/email/request.html.twig

@@ -31,14 +31,13 @@
 					<tr>
 						<td>
 							<div style="float: right;">
-								<form action="{{ getLink('account/2fa') }}?action=email-code"
+								<form action="{{ getLink('account/2fa/email/resend-code') }}"
 									method="post" style="padding:0;margin:0;">
 									{{ csrf() }}
 
 									{% if account_logged is defined %}
 										<input type="hidden" name="account_logged" value="{{ account_logged.getId() }}">
 									{% endif %}
-									<input type="hidden" name="step" value="resend">
 
 									{% set button_name = 'Resend Email Code' %}
 									{% include('buttons.base.html.twig') %}
@@ -88,10 +87,9 @@
 	<tbody>
 	<tr align="center" valign="top">
 		<td>
-			<form id="confirmActivateForm" action="{{ getLink('account/2fa') }}?action=email-code" method="post" style="padding:0;margin:0;">
+			<form id="confirmActivateForm" action="{{ getLink('account/2fa/email/activate') }}" method="post" style="padding:0;margin:0;">
 				{{ csrf() }}
 
-				<input type="hidden" name="step" value="activate">
 				<input type="hidden" name="save" value="1">
 
 				{% set button_color = 'green' %}

system/templates/mail.account.2fa.email-code.html.twig

@@ -2,7 +2,7 @@ Dear {{ config.lua.serverName}} player,
 <br/><br/>
 Your account is protected by email code authentication, and you requested a new email code:
 <br/><br/>
-<p>{{ code }}</p>
+<h1><strong>{{ code }}</strong></h1>
 <br/>
 Note that the code is only valid for 24 hours.
 <br/><br/>