Use laravel-style e() function to escape HTML in views

12 files changed, 36 insertions, 36 deletions

diff --git a/resources/views/emails/approve-user-html.php b/resources/views/emails/approve-user-html.php
index e92abf3007..5716aafefc 100644
--- a/resources/views/emails/approve-user-html.php
+++ b/resources/views/emails/approve-user-html.php
@@ -1,8 +1,8 @@
 <?php namespace Fisharebest\Webtrees; ?>
 <p>
-	<?= I18N::translate('Hello %s…', Html::escape($user->getRealName())) ?>
+	<?= I18N::translate('Hello %s…', e($user->getRealName())) ?>
 </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', Html::escape(WT_BASE_URL), Html::escape(WT_BASE_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(WT_BASE_URL), e(WT_BASE_URL)) ?>
 </p>
diff --git a/resources/views/emails/approve-user-text.php b/resources/views/emails/approve-user-text.php
index 040724fd6f..43ad9c7a41 100644
--- a/resources/views/emails/approve-user-text.php
+++ b/resources/views/emails/approve-user-text.php
@@ -1,4 +1,4 @@
 <?php namespace Fisharebest\Webtrees; ?>
-?= I18N::translate('Hello %s…', Html::escape($user->getRealName())) ?>
+?= I18N::translate('Hello %s…', e($user->getRealName())) ?>
 
 <?= 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', WT_BASE_URL, WT_BASE_URL) ?>
diff --git a/resources/views/emails/message-copy-html.php b/resources/views/emails/message-copy-html.php
index 7e7a05eea9..c56e61ac01 100644
--- a/resources/views/emails/message-copy-html.php
+++ b/resources/views/emails/message-copy-html.php
@@ -1,21 +1,21 @@
 <?php namespace Fisharebest\Webtrees; ?>
 <p>
-	<?= I18N::translate('Hello %s…', Html::escape($sender->getRealName())) ?>
+	<?= I18N::translate('Hello %s…', e($sender->getRealName())) ?>
 </p>
 
 <p>
-	<?= I18N::translate('You sent the following message to a webtrees user:') ?><?= Html::escape($recipient->getRealName()) ?>
+	<?= I18N::translate('You sent the following message to a webtrees user:') ?><?= e($recipient->getRealName()) ?>
 </p>
 
 <hr>
 
 <p>
-	<?= nl2br(Html::escape($message), false) ?>
+	<?= nl2br(e($message), false) ?>
 </p>
 
 <hr>
 
 <p>
 	<?= I18N::translate('This message was sent while viewing the following URL: ') ?>
-	<?= Html::escape($url) ?>
+	<?= e($url) ?>
 </p>
diff --git a/resources/views/emails/message-user-html.php b/resources/views/emails/message-user-html.php
index 4d876cbf2c..d0f1b006bb 100644
--- a/resources/views/emails/message-user-html.php
+++ b/resources/views/emails/message-user-html.php
@@ -1,21 +1,21 @@
 <?php namespace Fisharebest\Webtrees; ?>
 <p>
-	<?= I18N::translate('Hello %s…', Html::escape($recipient->getRealName())) ?>
+	<?= I18N::translate('Hello %s…', e($recipient->getRealName())) ?>
 </p>
 
 <p>
-	<?= /* I18N: %s is a person's name */ I18N::translate('%s sent you the following message.', Html::escape($sender->getRealName())) ?>
+	<?= /* I18N: %s is a person's name */ I18N::translate('%s sent you the following message.', e($sender->getRealName())) ?>
 </p>
 
 <hr>
 
 <p>
-	<?= nl2br(Html::escape($message), false) ?>
+	<?= nl2br(e($message), false) ?>
 </p>
 
 <hr>
 
 <p>
 	<?= I18N::translate('This message was sent while viewing the following URL: ') ?>
-	<?= Html::escape($url) ?>
+	<?= e($url) ?>
 </p>
diff --git a/resources/views/emails/password-reset-html.php b/resources/views/emails/password-reset-html.php
index 625d1837e1..1ca563acbd 100644
--- a/resources/views/emails/password-reset-html.php
+++ b/resources/views/emails/password-reset-html.php
@@ -1,6 +1,6 @@
 <?php namespace Fisharebest\Webtrees; ?>
 <p>
-	<?= Html::escape(I18N::translate('Hello %s…', $user->getRealName())) ?>
+	<?= e(I18N::translate('Hello %s…', $user->getRealName())) ?>
 </p>
 
 <p>
@@ -9,13 +9,13 @@
 
 <dl>
 	<dt><?= I18N::translate('Username') ?></dt>
-	<dd><?= Html::escape($user->getUserName())?></dd>
+	<dd><?= e($user->getUserName())?></dd>
 	<dt><?= I18N::translate('Password') ?></dt>
-	<dd><?= Html::escape($new_password) ?></dd>
+	<dd><?= e($new_password) ?></dd>
 </dl>
 
 <p>
-	<a href="<?= Html::escape(Html::url(WT_BASE_URL . 'login.php', ['username' => $user->getUserName(), 'url' => 'edituser.php'])) ?>">
+	<a href="<?= e(Html::url(WT_BASE_URL . 'login.php', ['username' => $user->getUserName(), 'url' => 'edituser.php'])) ?>">
 		<?= I18N::translate('Sign in') ?>
 	</a>
 </p>
diff --git a/resources/views/emails/pending-changes-html.php b/resources/views/emails/pending-changes-html.php
index a009c8663e..83279814fc 100644
--- a/resources/views/emails/pending-changes-html.php
+++ b/resources/views/emails/pending-changes-html.php
@@ -1,6 +1,6 @@
 <?php namespace Fisharebest\Webtrees; ?>
 <p>
-	<?= Html::escape(I18N::translate('Hello %s…', $user->getRealName())) ?>
+	<?= e(I18N::translate('Hello %s…', $user->getRealName())) ?>
 </p>
 
 <p>
@@ -9,8 +9,8 @@
 
 <ul>
 	<li>
-		<a href="<?= Html::escape(Html::url(WT_BASE_URL . 'edit_changes.php', ['ged' => $tree->getName()])) ?>">
-			<?= Html::escape($tree->getTitle()) ?>
+		<a href="<?= e(Html::url(WT_BASE_URL . 'edit_changes.php', ['ged' => $tree->getName()])) ?>">
+			<?= e($tree->getTitle()) ?>
 		</a>
 	</li>
 </ul>
diff --git a/resources/views/emails/register-notify-html.php b/resources/views/emails/register-notify-html.php
index 2b2fedfd8d..70ea6fad43 100644
--- a/resources/views/emails/register-notify-html.php
+++ b/resources/views/emails/register-notify-html.php
@@ -9,13 +9,13 @@
 
 <dl>
 	<dt><?= I18N::translate('Username') ?></dt>
-	<dd><?= Html::escape($user->getUserName()) ?></dd>
+	<dd><?= e($user->getUserName()) ?></dd>
 	<dt><?= I18N::translate('Real name') ?></dt>
-	<dd><?= Html::escape($user->getRealName()) ?></dd>
+	<dd><?= e($user->getRealName()) ?></dd>
 	<dt><?= I18N::translate('Email address') ?></dt>
-	<dd><?= Html::escape($user->getEmail()) ?></dd>
+	<dd><?= e($user->getEmail()) ?></dd>
 	<dt><?= I18N::translate('Comments') ?></dt>
-	<dd><?= Html::escape($comments) ?></dd>
+	<dd><?= e($comments) ?></dd>
 </dl>
 
 <p>
diff --git a/resources/views/emails/register-notify-text.php b/resources/views/emails/register-notify-text.php
index 079136f3be..951300fb23 100644
--- a/resources/views/emails/register-notify-text.php
+++ b/resources/views/emails/register-notify-text.php
@@ -3,10 +3,10 @@
 
 <?= /* I18N: %s is a server name/URL */I18N::translate('A prospective user has registered with webtrees at %s.', WT_BASE_URL . ' ' . $tree->getTitleHtml()) ?>
 
-<?= I18N::translate('Username') ?> - <?= Html::escape($user->getUserName()) ?>
-<?= I18N::translate('Real name') ?> - <?= Html::escape($user->getRealName()) ?>
-<?= I18N::translate('Email address') ?> - <?= Html::escape($user->getEmail()) ?>
-<?= I18N::translate('Comments') ?> - <?= Html::escape($comments) ?>
+<?= I18N::translate('Username') ?> - <?= e($user->getUserName()) ?>
+<?= I18N::translate('Real name') ?> - <?= e($user->getRealName()) ?>
+<?= I18N::translate('Email address') ?> - <?= e($user->getEmail()) ?>
+<?= I18N::translate('Comments') ?> - <?= e($comments) ?>
 
 <?= I18N::translate('The user has been sent an email with the information necessary to confirm the access request.') ?>
 
diff --git a/resources/views/emails/register-user-html.php b/resources/views/emails/register-user-html.php
index 8bda3eef5a..46f46f9f2b 100644
--- a/resources/views/emails/register-user-html.php
+++ b/resources/views/emails/register-user-html.php
@@ -1,10 +1,10 @@
 <?php namespace Fisharebest\Webtrees; ?>
 <p>
-	<?= I18N::translate('Hello %s…', Html::escape($user->getRealName())) ?>
+	<?= I18N::translate('Hello %s…', e($user->getRealName())) ?>
 </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.', Html::escape(WT_BASE_URL . ' ' . $tree->getTitle()), HTML::escape($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 . ' ' . $tree->getTitle()), e($user->getEmail())) ?>
 </p>
 
 <p>
@@ -12,8 +12,8 @@
 </p>
 
 <p>
-	<a href="<?= Html::escape(Html::url(WT_LOGIN_URL, ['username' => $user->getUserName(), 'user_hashcode' => $user->getPreference('reg_hashcode'), 'action' => 'userverify', 'ged' => $tree->getName()])) ?>">
-		<?= Html::escape(Html::url(WT_LOGIN_URL, ['username' => $user->getUserName(), 'user_hashcode' => $user->getPreference('reg_hashcode'), 'action' => 'userverify', 'ged' => $tree->getName()])) ?>
+	<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>
 </p>
 
diff --git a/resources/views/emails/register-user-text.php b/resources/views/emails/register-user-text.php
index 3f58964b84..0f19267159 100644
--- a/resources/views/emails/register-user-text.php
+++ b/resources/views/emails/register-user-text.php
@@ -1,7 +1,7 @@
 <?php namespace Fisharebest\Webtrees; ?>
-<?= I18N::translate('Hello %s…', Html::escape($user->getRealName())) ?>
+<?= 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.', Html::escape(WT_BASE_URL . ' ' . $tree->getTitle()), HTML::escape($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 . ' ' . $tree->getTitle()), e($user->getEmail())) ?>
 
 <?= I18N::translate('Follow this link to verify your email address.') ?>
 
diff --git a/resources/views/emails/verify-notify-html.php b/resources/views/emails/verify-notify-html.php
index 5cfe690a2f..1181bc8ee0 100644
--- a/resources/views/emails/verify-notify-html.php
+++ b/resources/views/emails/verify-notify-html.php
@@ -5,15 +5,15 @@
 
 <p>
 	<?= /* I18N: %1$s is a real-name, %2$s is a username, %3$s is an email address */ I18N::translate(
-'A new user (%1$s) has requested an account (%2$s) and verified an email address (%3$s).', Html::escape($user->getRealName()), Html::escape($user->getUserName()), Html::escape($user->getEmail())) ?>
+'A new user (%1$s) has requested an account (%2$s) and verified an email address (%3$s).', e($user->getRealName()), e($user->getUserName()), e($user->getEmail())) ?>
 </p>
 
 <p>
 	<?= I18N::translate('You need to review the account details.') ?>
 </p>
 
-<a href="<?= Html::escape(Html::url(WT_BASE_URL . 'admin_users.php', ['action' => 'edit', 'user_id' => $user->getUserId()])) ?>">
-	<?= Html::escape(Html::url(WT_BASE_URL . 'admin_users.php', ['action' => 'edit', 'user_id' => $user->getUserId()])) ?>
+<a href="<?= e(Html::url(WT_BASE_URL . 'admin_users.php', ['action' => 'edit', 'user_id' => $user->getUserId()])) ?>">
+	<?= e(Html::url(WT_BASE_URL . 'admin_users.php', ['action' => 'edit', 'user_id' => $user->getUserId()])) ?>
 </a>
 
 <ul>
diff --git a/resources/views/emails/verify-notify-text.php b/resources/views/emails/verify-notify-text.php
index 4432297d5e..521b39c2c4 100644
--- a/resources/views/emails/verify-notify-text.php
+++ b/resources/views/emails/verify-notify-text.php
@@ -2,7 +2,7 @@
 <?= I18N::translate('Hello administrator…') ?>
 
 <?= /* I18N: %1$s is a real-name, %2$s is a username, %3$s is an email address */ I18N::translate(
-'A new user (%1$s) has requested an account (%2$s) and verified an email address (%3$s).', Html::escape($user->getRealName()), Html::escape($user->getUserName()), Html::escape($user->getEmail())) ?>
+'A new user (%1$s) has requested an account (%2$s) and verified an email address (%3$s).', e($user->getRealName()), e($user->getUserName()), e($user->getEmail())) ?>
 
 <?= I18N::translate('You need to review the account details.') ?>