Fix: #2517 - missing html attributes on html emails

8 files changed, 155 insertions, 131 deletions

diff --git a/resources/views/emails/approve-user-html.phtml b/resources/views/emails/approve-user-html.phtml
index 2a206f08f3..b4fe7d0598 100644
--- a/resources/views/emails/approve-user-html.phtml
+++ b/resources/views/emails/approve-user-html.phtml
@@ -1,8 +1,11 @@
-<?php use Fisharebest\Webtrees\I18N; ?>
-<p>
-    <?= I18N::translate('Hello %s…', '<span dir="auto">' . e($user->realName()) . '</span>') ?>
-</p>
+<?php use Fisharebest\Webtrees\Html;
+use Fisharebest\Webtrees\I18N; ?>
+<div <?= I18N::htmlAttributes() ?>>
+    <p>
+        <?= I18N::translate('Hello %s…', '<span dir="auto">' . e($user->realName()) . '</span>') ?>
+    </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($base_url), e($base_url)) ?>
-</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($base_url), e($base_url)) ?>
+    </p>
+</div>
diff --git a/resources/views/emails/message-copy-html.phtml b/resources/views/emails/message-copy-html.phtml
index a794f90cc7..912464f429 100644
--- a/resources/views/emails/message-copy-html.phtml
+++ b/resources/views/emails/message-copy-html.phtml
@@ -1,21 +1,23 @@
 <?php use Fisharebest\Webtrees\I18N; ?>
-<p>
-    <?= I18N::translate('Hello %s…', '<span dir="auto">' . e($sender->realName()) . '</span>') ?>
-</p>
+<div <?= I18N::htmlAttributes() ?>>
+    <p>
+        <?= I18N::translate('Hello %s…', '<span dir="auto">' . e($sender->realName()) . '</span>') ?>
+    </p>
 
-<p>
-    <?= I18N::translate('You sent the following message to a webtrees user:') ?><?= e($recipient->realName()) ?>
-</p>
+    <p>
+        <?= I18N::translate('You sent the following message to a webtrees user:') ?><?= e($recipient->realName()) ?>
+    </p>
 
-<hr>
+    <hr>
 
-<p>
-    <?= nl2br(e($message), false) ?>
-</p>
+    <p>
+        <?= nl2br(e($message), false) ?>
+    </p>
 
-<hr>
+    <hr>
 
-<p>
-    <?= I18N::translate('This message was sent while viewing the following URL: ') ?>
-    <?= e($url) ?>
-</p>
+    <p>
+        <?= I18N::translate('This message was sent while viewing the following URL: ') ?>
+        <?= e($url) ?>
+    </p>
+</div>
diff --git a/resources/views/emails/message-user-html.phtml b/resources/views/emails/message-user-html.phtml
index c6638544fa..97929a4daf 100644
--- a/resources/views/emails/message-user-html.phtml
+++ b/resources/views/emails/message-user-html.phtml
@@ -1,21 +1,24 @@
 <?php use Fisharebest\Webtrees\I18N; ?>
-<p>
-    <?= I18N::translate('Hello %s…', '<span dir="auto">' . e($recipient->realName()) . '</span>') ?>
-</p>
+<div <?= I18N::htmlAttributes() ?>>
+    <p>
+        <?= I18N::translate('Hello %s…', '<span dir="auto">' . e($recipient->realName()) . '</span>') ?>
+    </p>
 
-<p>
-    <?= /* I18N: %s is a person's name */ I18N::translate('%s sent you the following message.', e($sender->realName())) ?>
-</p>
+    <p>
+        <?= /* I18N: %s is a person's name */
+        I18N::translate('%s sent you the following message.', e($sender->realName())) ?>
+    </p>
 
-<hr>
+    <hr>
 
-<p>
-    <?= nl2br(e($message), false) ?>
-</p>
+    <p>
+        <?= nl2br(e($message), false) ?>
+    </p>
 
-<hr>
+    <hr>
 
-<p>
-    <?= I18N::translate('This message was sent while viewing the following URL: ') ?>
-    <?= e($url) ?>
-</p>
+    <p>
+        <?= I18N::translate('This message was sent while viewing the following URL: ') ?>
+        <?= e($url) ?>
+    </p>
+</div>
diff --git a/resources/views/emails/password-reset-html.phtml b/resources/views/emails/password-reset-html.phtml
index f8990a31ec..76979f5eea 100644
--- a/resources/views/emails/password-reset-html.phtml
+++ b/resources/views/emails/password-reset-html.phtml
@@ -1,25 +1,27 @@
 <?php use Fisharebest\Webtrees\I18N; ?>
-<p>
-    <?= I18N::translate('Hello %s…', '<span dir="auto">' . e($user->realName()) . '</span>') ?>
-</p>
+<div <?= I18N::htmlAttributes() ?>>
+    <p>
+        <?= I18N::translate('Hello %s…', '<span dir="auto">' . e($user->realName()) . '</span>') ?>
+    </p>
 
-<p>
-    <?= I18N::translate('A new password has been requested for your username.') ?>
-</p>
+    <p>
+        <?= I18N::translate('A new password has been requested for your username.') ?>
+    </p>
 
-<dl>
-    <dt><?= I18N::translate('Username') ?></dt>
-    <dd><?= e($user->userName())?></dd>
-    <dt><?= I18N::translate('Password') ?></dt>
-    <dd><?= e($new_password) ?></dd>
-</dl>
+    <dl>
+        <dt><?= I18N::translate('Username') ?></dt>
+        <dd><?= e($user->userName()) ?></dd>
+        <dt><?= I18N::translate('Password') ?></dt>
+        <dd><?= e($new_password) ?></dd>
+    </dl>
 
-<p>
-    <a href="<?= e(route('login', ['username' => $user->userName(), 'url' => route('my-account', [])], true)) ?>">
-        <?= I18N::translate('Sign in') ?>
-    </a>
-</p>
+    <p>
+        <a href="<?= e(route('login', ['username' => $user->userName(), 'url' => route('my-account', [])], true)) ?>">
+            <?= I18N::translate('Sign in') ?>
+        </a>
+    </p>
 
-<p>
-    <?= 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.') ?>
-</p>
+    <p>
+        <?= 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.') ?>
+    </p>
+</div>
diff --git a/resources/views/emails/pending-changes-html.phtml b/resources/views/emails/pending-changes-html.phtml
index 2e59f22341..1418dd4af8 100644
--- a/resources/views/emails/pending-changes-html.phtml
+++ b/resources/views/emails/pending-changes-html.phtml
@@ -1,16 +1,18 @@
 <?php use Fisharebest\Webtrees\I18N; ?>
-<p>
-    <?= I18N::translate('Hello %s…', '<span dir="auto">' . e($user->realName()) . '</span>') ?>
-</p>
+<div <?= I18N::htmlAttributes() ?>>
+    <p>
+        <?= I18N::translate('Hello %s…', '<span dir="auto">' . e($user->realName()) . '</span>') ?>
+    </p>
 
-<p>
-    <?= I18N::translate('There are pending changes for you to moderate.') ?>
-</p>
+    <p>
+        <?= I18N::translate('There are pending changes for you to moderate.') ?>
+    </p>
 
-<ul>
-    <li>
-        <a href="<?= e(route('show-pending', ['ged' => $tree->name()], true)) ?>">
-            <?= e($tree->title()) ?>
-        </a>
-    </li>
-</ul>
+    <ul>
+        <li>
+            <a href="<?= e(route('show-pending', ['ged' => $tree->name()], true)) ?>">
+                <?= e($tree->title()) ?>
+            </a>
+        </li>
+    </ul>
+</div>
diff --git a/resources/views/emails/register-notify-html.phtml b/resources/views/emails/register-notify-html.phtml
index 84bf593ef7..29ad41c7db 100644
--- a/resources/views/emails/register-notify-html.phtml
+++ b/resources/views/emails/register-notify-html.phtml
@@ -1,27 +1,30 @@
 <?php use Fisharebest\Webtrees\I18N; ?>
-<p>
-    <?= I18N::translate('Hello administrator…') ?>
-</p>
+<div <?= I18N::htmlAttributes() ?>>
+    <p>
+        <?= I18N::translate('Hello administrator…') ?>
+    </p>
 
-<p>
-    <?= /* 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>
+    <p>
+        <?= /* 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>
-    <dt><?= I18N::translate('Username') ?></dt>
-    <dd><?= e($user->userName()) ?></dd>
-    <dt><?= I18N::translate('Real name') ?></dt>
-    <dd><?= e($user->realName()) ?></dd>
-    <dt><?= I18N::translate('Email address') ?></dt>
-    <dd><?= e($user->email()) ?></dd>
-    <dt><?= I18N::translate('Comments') ?></dt>
-    <dd><?= e($comments) ?></dd>
-</dl>
+    <dl>
+        <dt><?= I18N::translate('Username') ?></dt>
+        <dd><?= e($user->userName()) ?></dd>
+        <dt><?= I18N::translate('Real name') ?></dt>
+        <dd><?= e($user->realName()) ?></dd>
+        <dt><?= I18N::translate('Email address') ?></dt>
+        <dd><?= e($user->email()) ?></dd>
+        <dt><?= I18N::translate('Comments') ?></dt>
+        <dd><?= e($comments) ?></dd>
+    </dl>
 
-<p>
-    <?= I18N::translate('The user has been sent an email with the information necessary to confirm the access request.') ?>
-</p>
+    <p>
+        <?= I18N::translate('The user has been sent an email with the information necessary to confirm the access request.') ?>
+    </p>
 
-<p>
-    <?= I18N::translate('You will be informed by email when this prospective user has confirmed the request. You can then complete the process by activating the username. The new user will not be able to sign in until you activate the account.') ?>
-</p>
+    <p>
+        <?= I18N::translate('You will be informed by email when this prospective user has confirmed the request. You can then complete the process by activating the username. The new user will not be able to sign in until you activate the account.') ?>
+    </p>
+</div>
diff --git a/resources/views/emails/register-user-html.phtml b/resources/views/emails/register-user-html.phtml
index 5e9424e9a8..561fbe77fa 100644
--- a/resources/views/emails/register-user-html.phtml
+++ b/resources/views/emails/register-user-html.phtml
@@ -1,22 +1,25 @@
 <?php use Fisharebest\Webtrees\I18N; ?>
-<p>
-    <?= I18N::translate('Hello %s…', e($user->realName())) ?>
-</p>
+<div <?= I18N::htmlAttributes() ?>>
+    <p>
+        <?= I18N::translate('Hello %s…', e($user->realName())) ?>
+    </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($base_url), e($user->email())) ?>
-</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($base_url), e($user->email())) ?>
+    </p>
 
-<p>
-    <?= I18N::translate('Follow this link to verify your email address.') ?>
-</p>
+    <p>
+        <?= I18N::translate('Follow this link to verify your email address.') ?>
+    </p>
 
-<p>
-    <a href="<?= e(route('verify', ['username' => $user->userName(), 'token' => $user->getPreference('reg_hashcode'), 'ged' => $tree->name()], true)) ?>">
-        <?= e(route('verify', ['username' => $user->userName(), 'token' => $user->getPreference('reg_hashcode'), 'ged' => $tree->name()], true)) ?>
-    </a>
-</p>
+    <p>
+        <a href="<?= e(route('verify', ['username' => $user->userName(), 'token' => $user->getPreference('reg_hashcode'), 'ged' => $tree->name()], true)) ?>">
+            <?= e(route('verify', ['username' => $user->userName(), 'token' => $user->getPreference('reg_hashcode'), 'ged' => $tree->name()], true)) ?>
+        </a>
+    </p>
 
-<p>
-    <?= I18N::translate('If you didn’t request an account, you can just delete this message.') ?>
-</p>
+    <p>
+        <?= I18N::translate('If you didn’t request an account, you can just delete this message.') ?>
+    </p>
+</div>
diff --git a/resources/views/emails/verify-notify-html.phtml b/resources/views/emails/verify-notify-html.phtml
index d784e01e41..56a3386458 100644
--- a/resources/views/emails/verify-notify-html.phtml
+++ b/resources/views/emails/verify-notify-html.phtml
@@ -1,27 +1,33 @@
 <?php use Fisharebest\Webtrees\I18N; ?>
-<p>
-    <?= I18N::translate('Hello administrator…') ?>
-</p>
+<div <?= I18N::htmlAttributes() ?>>
+    <p>
+        <?= I18N::translate('Hello administrator…') ?>
+    </p>
 
-<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).',
-        e($user->realName()),
-        e($user->userName()),
-        e($user->email())
-    ) ?>
-</p>
+    <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).',
+            e($user->realName()),
+            e($user->userName()),
+            e($user->email())
+        ) ?>
+    </p>
 
-<p>
-    <?= I18N::translate('You need to review the account details.') ?>
-</p>
+    <p>
+        <?= I18N::translate('You need to review the account details.') ?>
+    </p>
 
-<a href="<?= e(route('admin-users-edit', ['user_id' => $user->id()])) ?>">
-    <?= e(route('admin-users-edit', ['user_id' => $user->id()])) ?>
-</a>
+    <a href="<?= e(route('admin-users-edit', ['user_id' => $user->id()])) ?>">
+        <?= e(route('admin-users-edit', ['user_id' => $user->id()])) ?>
+    </a>
 
-<ul>
-    <li><?= /* I18N: You need to: */ I18N::translate('Set the status to “approved”.') ?></li>
-    <li><?= /* I18N: You need to: */ I18N::translate('Set the access level for each tree.') ?></li>
-    <li><?= /* I18N: You need to: */ I18N::translate('Link the user account to an individual.') ?></li>
-</ul>
+    <ul>
+        <li><?= /* I18N: You need to: */
+            I18N::translate('Set the status to “approved”.') ?></li>
+        <li><?= /* I18N: You need to: */
+            I18N::translate('Set the access level for each tree.') ?></li>
+        <li><?= /* I18N: You need to: */
+            I18N::translate('Link the user account to an individual.') ?></li>
+    </ul>
+</div>