Add support for reverse-proxy configurations

6 files changed, 7 insertions, 7 deletions

diff --git a/resources/views/emails/approve-user-html.phtml b/resources/views/emails/approve-user-html.phtml
index 937f9b743a..c3f6bb2319 100644
--- a/resources/views/emails/approve-user-html.phtml
+++ b/resources/views/emails/approve-user-html.phtml
@@ -4,5 +4,5 @@
 </p>
 
 <p>
-    <?= I18N::translate('The administrator at the webtrees site %s has approved your application for an account. You may now sign in by accessing the following link: %s', e($site_url), e($site_url)) ?>
+    <?= I18N::translate('The administrator at the webtrees site %s has approved your application for an account. You may now sign in by accessing the following link: %s', e($base_url), e($base_url)) ?>
 </p>
diff --git a/resources/views/emails/approve-user-text.phtml b/resources/views/emails/approve-user-text.phtml
index 59df11dd0f..e1415a3a7a 100644
--- a/resources/views/emails/approve-user-text.phtml
+++ b/resources/views/emails/approve-user-text.phtml
@@ -1,4 +1,4 @@
 <?php use Fisharebest\Webtrees\I18N; ?>
 ?= I18N::translate('Hello %s…', e($user->realName())) ?>
 
-<?= I18N::translate('The administrator at the webtrees site %s has approved your application for an account. You may now sign in by accessing the following link: %s', $site_url, $site_url) ?>
+<?= I18N::translate('The administrator at the webtrees site %s has approved your application for an account. You may now sign in by accessing the following link: %s', $base_url, $base_url) ?>
diff --git a/resources/views/emails/register-notify-html.phtml b/resources/views/emails/register-notify-html.phtml
index 4eef71e5bf..84bf593ef7 100644
--- a/resources/views/emails/register-notify-html.phtml
+++ b/resources/views/emails/register-notify-html.phtml
@@ -4,7 +4,7 @@
 </p>
 
 <p>
-    <?= /* I18N: %s is a server name/URL */I18N::translate('A prospective user has registered with webtrees at %s.', WT_BASE_URL . ' ' . e($tree->title())) ?>
+    <?= /* I18N: %s is a server name/URL */I18N::translate('A prospective user has registered with webtrees at %s.', e($base_url) . ' ' . e($tree->title())) ?>
 </p>
 
 <dl>
diff --git a/resources/views/emails/register-notify-text.phtml b/resources/views/emails/register-notify-text.phtml
index 2a1655b1d1..8b04feb3ef 100644
--- a/resources/views/emails/register-notify-text.phtml
+++ b/resources/views/emails/register-notify-text.phtml
@@ -1,7 +1,7 @@
 <?php use Fisharebest\Webtrees\I18N; ?>
 <?= I18N::translate('Hello administrator…') ?>
 
-<?= /* I18N: %s is a server name/URL */I18N::translate('A prospective user has registered with webtrees at %s.', WT_BASE_URL . ' ' . e($tree->title())) ?>
+<?= /* I18N: %s is a server name/URL */I18N::translate('A prospective user has registered with webtrees at %s.', $base_url . ' ' . e($tree->title())) ?>
 
 <?= I18N::translate('Username') ?> - <?= e($user->userName()) ?>
 <?= I18N::translate('Real name') ?> - <?= e($user->realName()) ?>
diff --git a/resources/views/emails/register-user-html.phtml b/resources/views/emails/register-user-html.phtml
index af2ea25135..5e9424e9a8 100644
--- a/resources/views/emails/register-user-html.phtml
+++ b/resources/views/emails/register-user-html.phtml
@@ -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), e($user->email())) ?>
+    <?= /* 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($base_url), e($user->email())) ?>
 </p>
 
 <p>
diff --git a/resources/views/emails/register-user-text.phtml b/resources/views/emails/register-user-text.phtml
index 1fa5914546..99b3fadbc8 100644
--- a/resources/views/emails/register-user-text.phtml
+++ b/resources/views/emails/register-user-text.phtml
@@ -1,7 +1,7 @@
 <?php use Fisharebest\Webtrees\I18N; ?>
-<?= I18N::translate('Hello %s…', e($user->realName())) ?>
+<?= I18N::translate('Hello %s…', $user->realName()) ?>
 
-<?= /* 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->email())) ?>
+<?= /* 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.', $base_url, $user->email()) ?>
 
 <?= I18N::translate('Follow this link to verify your email address.') ?>