diff options
| author | Greg Roach <fisharebest@gmail.com> | 2018-02-18 08:48:48 +0000 |
|---|---|---|
| committer | Greg Roach <fisharebest@gmail.com> | 2018-02-18 08:59:12 +0000 |
| commit | 571e6fcac743cc9b048486db27eb10ae509eb172 (patch) | |
| tree | f42d0bed061f1feed47af5c2bb8dd61079e9628f /resources/views/emails | |
| parent | cb99644a55661687ff747248e4d2c3d485ade4a1 (diff) | |
| download | webtrees-571e6fcac743cc9b048486db27eb10ae509eb172.tar.gz webtrees-571e6fcac743cc9b048486db27eb10ae509eb172.tar.bz2 webtrees-571e6fcac743cc9b048486db27eb10ae509eb172.zip | |
Convert login/registration to http/controller
Diffstat (limited to 'resources/views/emails')
| -rw-r--r-- | resources/views/emails/password-reset-html.php | 2 | ||||
| -rw-r--r-- | resources/views/emails/password-reset-text.php | 2 | ||||
| -rw-r--r-- | resources/views/emails/register-user-html.php | 6 | ||||
| -rw-r--r-- | resources/views/emails/register-user-text.php | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/resources/views/emails/password-reset-html.php b/resources/views/emails/password-reset-html.php index 1ca563acbd..2e42fe8b30 100644 --- a/resources/views/emails/password-reset-html.php +++ b/resources/views/emails/password-reset-html.php @@ -15,7 +15,7 @@ </dl> <p> - <a href="<?= e(Html::url(WT_BASE_URL . 'login.php', ['username' => $user->getUserName(), 'url' => 'edituser.php'])) ?>"> + <a href="<?= e(route('login', ['username' => $user->getUserName(), 'url' => 'edituser.php'], true)) ?>"> <?= I18N::translate('Sign in') ?> </a> </p> diff --git a/resources/views/emails/password-reset-text.php b/resources/views/emails/password-reset-text.php index fca15c2956..c0e093a6e2 100644 --- a/resources/views/emails/password-reset-text.php +++ b/resources/views/emails/password-reset-text.php @@ -6,6 +6,6 @@ <?= I18N::translate('Username') ?> - <?= $user->getUserName()?> <?= I18N::translate('Password') ?> - <?= $new_password ?> -<?= I18N::translate('Sign in') ?> - Html::url(WT_BASE_URL . 'login.php', ['username' => $user->getUserName(), 'url' => 'edituser.php']) ?> +<?= I18N::translate('Sign in') ?> - <?= route('login', ['username' => $user->getUserName(), 'url' => 'edituser.php'], true) ?> <?= I18N::translate('After you have signed in, select the “My account” link under the “My pages” menu and fill in the password fields to change your password.') ?> diff --git a/resources/views/emails/register-user-html.php b/resources/views/emails/register-user-html.php index 46f46f9f2b..dcc42bef39 100644 --- a/resources/views/emails/register-user-html.php +++ b/resources/views/emails/register-user-html.php @@ -4,7 +4,7 @@ </p> <p> - <?= /* I18N: %1$s is the site URL and %2$s is an email address */I18N::translate('You (or someone claiming to be you) has requested an account at %1$s using the email address %2$s.', e(WT_BASE_URL . ' ' . $tree->getTitle()), e($user->getEmail())) ?> + <?= /* I18N: %1$s is the site URL and %2$s is an email address */I18N::translate('You (or someone claiming to be you) has requested an account at %1$s using the email address %2$s.', e(WT_BASE_URL), e($user->getEmail())) ?> </p> <p> @@ -12,8 +12,8 @@ </p> <p> - <a href="<?= e(Html::url(WT_LOGIN_URL, ['username' => $user->getUserName(), 'user_hashcode' => $user->getPreference('reg_hashcode'), 'action' => 'userverify', 'ged' => $tree->getName()])) ?>"> - <?= e(Html::url(WT_LOGIN_URL, ['username' => $user->getUserName(), 'user_hashcode' => $user->getPreference('reg_hashcode'), 'action' => 'userverify', 'ged' => $tree->getName()])) ?> + <a href="<?= e(route('verify', ['username' => $user->getUserName(), 'token' => $user->getPreference('reg_hashcode'), 'ged' => $tree->getName()], true)) ?>"> + <?= e(route('verify', ['username' => $user->getUserName(), 'token' => $user->getPreference('reg_hashcode'), 'ged' => $tree->getName()], true)) ?> </a> </p> diff --git a/resources/views/emails/register-user-text.php b/resources/views/emails/register-user-text.php index 0f19267159..254d67d184 100644 --- a/resources/views/emails/register-user-text.php +++ b/resources/views/emails/register-user-text.php @@ -1,10 +1,10 @@ <?php namespace Fisharebest\Webtrees; ?> <?= I18N::translate('Hello %s…', e($user->getRealName())) ?> -<?= /* I18N: %1$s is the site URL and %2$s is an email address */I18N::translate('You (or someone claiming to be you) has requested an account at %1$s using the email address %2$s.', e(WT_BASE_URL . ' ' . $tree->getTitle()), e($user->getEmail())) ?> +<?= /* I18N: %1$s is the site URL and %2$s is an email address */I18N::translate('You (or someone claiming to be you) has requested an account at %1$s using the email address %2$s.', e(WT_BASE_URL), e($user->getEmail())) ?> <?= I18N::translate('Follow this link to verify your email address.') ?> -<?= Html::url(WT_LOGIN_URL, ['username' => $user->getUserName(), 'user_hashcode' => $user->getPreference('reg_hashcode'), 'action' => 'userverify', 'ged' => $tree->getName()]) ?> +<?= route('verify', ['username' => $user->getUserName(), 'token' => $user->getPreference('reg_hashcode'), 'ged' => $tree->getName()], true) ?> <?= I18N::translate('If you didn’t request an account, you can just delete this message.') ?> |