diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-01-28 00:18:29 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-01-28 00:18:29 +0100 |
| commit | 423274b9230ced36a3a659b8518c94d7b17ef107 (patch) | |
| tree | 3969897cb368c9ed3a27579d2db1cdc8dfd60525 | |
| parent | 6c4054c20bf2e9c843b065318dd252233513f201 (diff) | |
| parent | 69099a2732b749b4e370e16523152068e15cbd6f (diff) | |
| download | volse-hubzilla-423274b9230ced36a3a659b8518c94d7b17ef107.tar.gz volse-hubzilla-423274b9230ced36a3a659b8518c94d7b17ef107.tar.bz2 volse-hubzilla-423274b9230ced36a3a659b8518c94d7b17ef107.zip | |
Merge remote-tracking branch 'mike/master' into dev
| -rw-r--r-- | Zotlabs/Module/Email_resend.php | 4 | ||||
| -rw-r--r-- | view/en-au/register_verify_member.tpl | 12 | ||||
| -rw-r--r-- | view/en-gb/register_verify_member.tpl | 12 |
3 files changed, 23 insertions, 5 deletions
diff --git a/Zotlabs/Module/Email_resend.php b/Zotlabs/Module/Email_resend.php index 57a82ebda..f8a336be0 100644 --- a/Zotlabs/Module/Email_resend.php +++ b/Zotlabs/Module/Email_resend.php @@ -7,8 +7,6 @@ class Email_resend extends \Zotlabs\Web\Controller { function post() { - - if($_POST['token']) { if(! account_approve(trim($_POST['token']))) { notice(t('Token verification failed.')); @@ -35,7 +33,7 @@ class Email_resend extends \Zotlabs\Web\Controller { notice(t('Unable to resend email verification message.')); } - return; + goaway(z_root() . '/email_validation/' . bin2hex($email)); } diff --git a/view/en-au/register_verify_member.tpl b/view/en-au/register_verify_member.tpl index d1e34be67..9bdd7fa51 100644 --- a/view/en-au/register_verify_member.tpl +++ b/view/en-au/register_verify_member.tpl @@ -10,7 +10,12 @@ Login with the password you chose at registration. We need to verify your email address in order to give you full access. -If you registered this account, please visit the following link: +Your validation code is + +{{$hash}} + + +If you registered this account, please enter the validation code when requested or visit the following link: {{$siteurl}}/regver/allow/{{$hash}} @@ -23,3 +28,8 @@ To deny the request and remove the account, please visit: Thank you. + +-- +Terms Of Service: +{{$siteurl}}/help/TermsOfService + diff --git a/view/en-gb/register_verify_member.tpl b/view/en-gb/register_verify_member.tpl index d1e34be67..9bdd7fa51 100644 --- a/view/en-gb/register_verify_member.tpl +++ b/view/en-gb/register_verify_member.tpl @@ -10,7 +10,12 @@ Login with the password you chose at registration. We need to verify your email address in order to give you full access. -If you registered this account, please visit the following link: +Your validation code is + +{{$hash}} + + +If you registered this account, please enter the validation code when requested or visit the following link: {{$siteurl}}/regver/allow/{{$hash}} @@ -23,3 +28,8 @@ To deny the request and remove the account, please visit: Thank you. + +-- +Terms Of Service: +{{$siteurl}}/help/TermsOfService + |