diff --git a/emails/account-check.html b/emails/account-check.html index c04a5bcd..959e3663 100644 --- a/emails/account-check.html +++ b/emails/account-check.html @@ -7,9 +7,9 @@ -
Hi [[[USERNAME]]], [[[SERVERNAME]]] is requesting email verification, click on the following link to complete the process.
+Hi [[[USERNAME]]], [[[SERVERNAME]]] is requesting email verification, click on the following link to complete the process.
- Click here to verify your e-mail address. + Click here to verify your e-mail address.
If you did not initiate this request, please ignore this mail. \ No newline at end of file diff --git a/emails/account-check.txt b/emails/account-check.txt index b90c0d2f..5ad23547 100644 --- a/emails/account-check.txt +++ b/emails/account-check.txt @@ -1,6 +1,6 @@ [[[SERVERNAME]]] - Email Verification -Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) is performing an e-mail verification. Nagivate to the following link to complete the process: +Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is performing an e-mail verification. Nagivate to the following link to complete the process: ~ -~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]] +~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]] ~ If you did not initiate this request, please ignore this mail. \ No newline at end of file diff --git a/emails/account-invite.html b/emails/account-invite.html index be5ca419..f402e5a7 100644 --- a/emails/account-invite.html +++ b/emails/account-invite.html @@ -7,7 +7,7 @@ -An account was created for you on server [[[SERVERNAME]]], you can access it now with:
+An account was created for you on server [[[SERVERNAME]]], you can access it now with:
Username: [[[ACCOUNTNAME]]]
Password: [[[PASSWORD]]]
diff --git a/emails/account-invite.txt b/emails/account-invite.txt
index 3061a670..bfb0563d 100644
--- a/emails/account-invite.txt
+++ b/emails/account-invite.txt
@@ -1,5 +1,5 @@
[[[SERVERNAME]]] - Account Invitation
-An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]".
+An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]".
~
Best regards,
~[[[USERNAME]]]
\ No newline at end of file
diff --git a/emails/account-reset.html b/emails/account-reset.html
index df133a67..6b8d7a6a 100644
--- a/emails/account-reset.html
+++ b/emails/account-reset.html
@@ -7,9 +7,9 @@
-
Hi [[[USERNAME]]], [[[SERVERNAME]]] is requesting an account password reset, click on the following link to complete the process.
+Hi [[[USERNAME]]], [[[SERVERNAME]]] is requesting an account password reset, click on the following link to complete the process.
- Click here to reset your account password. + Click here to reset your account password.
If you did not initiate this request, please ignore this mail. \ No newline at end of file diff --git a/emails/account-reset.txt b/emails/account-reset.txt index 8960967d..44f02b30 100644 --- a/emails/account-reset.txt +++ b/emails/account-reset.txt @@ -1,6 +1,6 @@ [[[SERVERNAME]]] - Account Reset -Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) is requesting an account password reset. Nagivate to the following link to complete the process: +Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is requesting an account password reset. Nagivate to the following link to complete the process: ~ -~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]] +~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]] ~ If you did not initiate this request, please ignore this mail. \ No newline at end of file diff --git a/emails/mesh-invite.txt b/emails/mesh-invite.txt index d8c222c2..ade301dc 100644 --- a/emails/mesh-invite.txt +++ b/emails/mesh-invite.txt @@ -2,7 +2,7 @@ ~Ahoj [[[USERNAME]]], [[[SERVERNAME]]] požaduje ověření e-mailem a dokončete proces kliknutím na následující odkaz.
+Ahoj [[[USERNAME]]], [[[SERVERNAME]]] požaduje ověření e-mailem a dokončete proces kliknutím na následující odkaz.
- Kliknutím sem ověřte svou e-mailovou adresu. + Kliknutím sem ověřte svou e-mailovou adresu.
Pokud jste tento požadavek nezačali, ignorujte tento e-mail.