Code style

10 files changed, 67 insertions, 59 deletions

diff --git a/resources/views/emails/approve-user-html.php b/resources/views/emails/approve-user-html.php
index 5716aafefc..1831e12d04 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…', e($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', e(WT_BASE_URL), e(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/message-copy-html.php b/resources/views/emails/message-copy-html.php
index c56e61ac01..e944b0f64b 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…', e($sender->getRealName())) ?>
+    <?= I18N::translate('Hello %s…', e($sender->getRealName())) ?>
 </p>
 
 <p>
-	<?= I18N::translate('You sent the following message to a webtrees user:') ?><?= e($recipient->getRealName()) ?>
+    <?= I18N::translate('You sent the following message to a webtrees user:') ?><?= e($recipient->getRealName()) ?>
 </p>
 
 <hr>
 
 <p>
-	<?= nl2br(e($message), false) ?>
+    <?= nl2br(e($message), false) ?>
 </p>
 
 <hr>
 
 <p>
-	<?= I18N::translate('This message was sent while viewing the following URL: ') ?>
-	<?= e($url) ?>
+    <?= I18N::translate('This message was sent while viewing the following URL: ') ?>
+    <?= e($url) ?>
 </p>
diff --git a/resources/views/emails/message-user-html.php b/resources/views/emails/message-user-html.php
index d0f1b006bb..5bcee17509 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…', e($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.', e($sender->getRealName())) ?>
+    <?= /* I18N: %s is a person's name */ I18N::translate('%s sent you the following message.', e($sender->getRealName())) ?>
 </p>
 
 <hr>
 
 <p>
-	<?= nl2br(e($message), false) ?>
+    <?= nl2br(e($message), false) ?>
 </p>
 
 <hr>
 
 <p>
-	<?= I18N::translate('This message was sent while viewing the following URL: ') ?>
-	<?= e($url) ?>
+    <?= I18N::translate('This message was sent while viewing the following URL: ') ?>
+    <?= e($url) ?>
 </p>
diff --git a/resources/views/emails/password-reset-html.php b/resources/views/emails/password-reset-html.php
index 3f09803138..caad934667 100644
--- a/resources/views/emails/password-reset-html.php
+++ b/resources/views/emails/password-reset-html.php
@@ -1,25 +1,25 @@
 <?php namespace Fisharebest\Webtrees; ?>
 <p>
-	<?= e(I18N::translate('Hello %s…', $user->getRealName())) ?>
+    <?= e(I18N::translate('Hello %s…', $user->getRealName())) ?>
 </p>
 
 <p>
-	<?= I18N::translate('A new password has been requested for your username.') ?>
+    <?= I18N::translate('A new password has been requested for your username.') ?>
 </p>
 
 <dl>
-	<dt><?= I18N::translate('Username') ?></dt>
-	<dd><?= e($user->getUserName())?></dd>
-	<dt><?= I18N::translate('Password') ?></dt>
-	<dd><?= e($new_password) ?></dd>
+    <dt><?= I18N::translate('Username') ?></dt>
+    <dd><?= e($user->getUserName())?></dd>
+    <dt><?= I18N::translate('Password') ?></dt>
+    <dd><?= e($new_password) ?></dd>
 </dl>
 
 <p>
-	<a href="<?= e(route('login', ['username' => $user->getUserName(), 'url' => route('my-account', [])], true)) ?>">
-		<?= I18N::translate('Sign in') ?>
-	</a>
+    <a href="<?= e(route('login', ['username' => $user->getUserName(), '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.') ?>
+    <?= 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>
diff --git a/resources/views/emails/pending-changes-html.php b/resources/views/emails/pending-changes-html.php
index af60b02c8d..e7f4d8e03f 100644
--- a/resources/views/emails/pending-changes-html.php
+++ b/resources/views/emails/pending-changes-html.php
@@ -1,16 +1,16 @@
 <?php namespace Fisharebest\Webtrees; ?>
 <p>
-	<?= e(I18N::translate('Hello %s…', $user->getRealName())) ?>
+    <?= e(I18N::translate('Hello %s…', $user->getRealName())) ?>
 </p>
 
 <p>
-	<?= I18N::translate('There are pending changes for you to moderate.') ?>
+    <?= I18N::translate('There are pending changes for you to moderate.') ?>
 </p>
 
 <ul>
-	<li>
-		<a href="<?= e(route('show-pending', ['ged' => $tree->getName()], true)) ?>">
-			<?= e($tree->getTitle()) ?>
-		</a>
-	</li>
+    <li>
+        <a href="<?= e(route('show-pending', ['ged' => $tree->getName()], true)) ?>">
+            <?= 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 8df29dd05f..dfe05745e9 100644
--- a/resources/views/emails/register-notify-html.php
+++ b/resources/views/emails/register-notify-html.php
@@ -1,27 +1,27 @@
 <?php namespace Fisharebest\Webtrees; ?>
 <p>
-	<?= I18N::translate('Hello administrator…') ?>
+    <?= I18N::translate('Hello administrator…') ?>
 </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->getTitle())) ?>
+    <?= /* I18N: %s is a server name/URL */I18N::translate('A prospective user has registered with webtrees at %s.', WT_BASE_URL . ' ' . e($tree->getTitle())) ?>
 </p>
 
 <dl>
-	<dt><?= I18N::translate('Username') ?></dt>
-	<dd><?= e($user->getUserName()) ?></dd>
-	<dt><?= I18N::translate('Real name') ?></dt>
-	<dd><?= e($user->getRealName()) ?></dd>
-	<dt><?= I18N::translate('Email address') ?></dt>
-	<dd><?= e($user->getEmail()) ?></dd>
-	<dt><?= I18N::translate('Comments') ?></dt>
-	<dd><?= e($comments) ?></dd>
+    <dt><?= I18N::translate('Username') ?></dt>
+    <dd><?= e($user->getUserName()) ?></dd>
+    <dt><?= I18N::translate('Real name') ?></dt>
+    <dd><?= e($user->getRealName()) ?></dd>
+    <dt><?= I18N::translate('Email address') ?></dt>
+    <dd><?= e($user->getEmail()) ?></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.') ?>
+    <?= 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.') ?>
+    <?= 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>
diff --git a/resources/views/emails/register-user-html.php b/resources/views/emails/register-user-html.php
index dcc42bef39..2a43ae83ba 100644
--- a/resources/views/emails/register-user-html.php
+++ b/resources/views/emails/register-user-html.php
@@ -1,22 +1,22 @@
 <?php namespace Fisharebest\Webtrees; ?>
 <p>
-	<?= I18N::translate('Hello %s…', e($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.', e(WT_BASE_URL), 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>
-	<?= I18N::translate('Follow this link to verify your email address.') ?>
+    <?= I18N::translate('Follow this link to verify your email address.') ?>
 </p>
 
 <p>
-	<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>
+    <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>
 
 <p>
-	<?= I18N::translate('If you didn’t request an account, you can just delete this message.') ?>
+    <?= I18N::translate('If you didn’t request an account, you can just delete this message.') ?>
 </p>
diff --git a/resources/views/emails/register-user-text.php b/resources/views/emails/register-user-text.php
index 254d67d184..f80df7002d 100644
--- a/resources/views/emails/register-user-text.php
+++ b/resources/views/emails/register-user-text.php
@@ -7,4 +7,4 @@
 
 <?= 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.') ?>
+<?= I18N::translate('If you didn’t request an account, you can just delete this message.');
diff --git a/resources/views/emails/verify-notify-html.php b/resources/views/emails/verify-notify-html.php
index 148d6fcf71..d28bbc38d3 100644
--- a/resources/views/emails/verify-notify-html.php
+++ b/resources/views/emails/verify-notify-html.php
@@ -1,23 +1,27 @@
 <?php namespace Fisharebest\Webtrees; ?>
 <p>
-	<?= I18N::translate('Hello administrator…') ?>
+    <?= 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->getRealName()), e($user->getUserName()), e($user->getEmail())) ?>
+    <?= /* 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->getRealName()),
+        e($user->getUserName()),
+        e($user->getEmail())
+    ) ?>
 </p>
 
 <p>
-	<?= I18N::translate('You need to review the account details.') ?>
+    <?= I18N::translate('You need to review the account details.') ?>
 </p>
 
 <a href="<?= e(route('admin-users-edit', ['user_id' => $user->getUserId()])) ?>">
-	<?= e(route('admin-users-edit', ['user_id' => $user->getUserId()])) ?>
+    <?= e(route('admin-users-edit', ['user_id' => $user->getUserId()])) ?>
 </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>
+    <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>
diff --git a/resources/views/emails/verify-notify-text.php b/resources/views/emails/verify-notify-text.php
index 749937b6e4..bd7e3ddc24 100644
--- a/resources/views/emails/verify-notify-text.php
+++ b/resources/views/emails/verify-notify-text.php
@@ -2,7 +2,11 @@
 <?= 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).', e($user->getRealName()), e($user->getUserName()), e($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.') ?>
 
@@ -10,4 +14,4 @@
 
 <?= /* I18N: You need to: */ I18N::translate('Set the status to “approved”.') ?>
 <?= /* I18N: You need to: */ I18N::translate('Set the access level for each tree.') ?>
-<?= /* I18N: You need to: */ I18N::translate('Link the user account to an individual.') ?>
+<?= /* I18N: You need to: */ I18N::translate('Link the user account to an individual.');