@@ -61,12 +61,12 @@ |
||
61 | 61 | $image = new Image($this->uploadFolder . $person->getImage()); |
62 | 62 | $html .= '<a id="user-dropdown" href="#" class="nav-link dropdown-toggle avatar" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"> |
63 | 63 | <img id="user-avatar" src="' . $image->outputBase64Src() . '" class="img-rounded img-circle" />'; |
64 | - $html .= $person->getAka() ?: $user->getEmail() . '</a>'; |
|
64 | + $html .= $person->getAka() ?: $user->getEmail() . '</a>'; |
|
65 | 65 | } else { |
66 | 66 | $html .= '<a id="user-dropdown" href="#" class="nav-link dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">' . $user->getEmail() . '</a>'; |
67 | 67 | } |
68 | 68 | |
69 | - $html .= '<div class="dropdown-menu login-widget" aria-labelledby="user-dropdown"> |
|
69 | + $html .= '<div class="dropdown-menu login-widget" aria-labelledby="user-dropdown"> |
|
70 | 70 | <a class="dropdown-item" href="/' . $locale . '/user/change-email">Change Email</a> |
71 | 71 | <a class="dropdown-item" href="/' . $locale . '/user/change-password">Change Password</a> |
72 | 72 | <a class="dropdown-item" href="/' . $locale . '/user/edit-profile">Edit Profile</a> |
@@ -16,7 +16,7 @@ |
||
16 | 16 | </div> |
17 | 17 | </div> |
18 | 18 | |
19 | - <?= null !== $message ? $this->alert($message) : '' ?> |
|
19 | + <?= null !== $message ? $this->alert($message) : '' ?> |
|
20 | 20 | <section id="login-section"> |
21 | 21 | <div class="container"> |
22 | 22 | <div class="row justify-content-md-center"> |
@@ -157,7 +157,7 @@ |
||
157 | 157 | |
158 | 158 | |
159 | 159 | // Choose Avatar or Upload Image |
160 | - var set_avatar = '<?= $p->getImage();?>'; |
|
160 | + var set_avatar = '<?= $p->getImage(); ?>'; |
|
161 | 161 | $('#upload-pic').click(function (e) { |
162 | 162 | $(this).addClass('disabled'); |
163 | 163 | $('#choose-pic').removeClass('disabled').removeClass('btn-default').addClass('btn-primary'); |
@@ -112,8 +112,8 @@ discard block |
||
112 | 112 | <table border="0" cellpadding="0" cellspacing="0" width="100%" style="max-width: 500px;" class="wrapper"> |
113 | 113 | <tr> |
114 | 114 | <td align="center" valign="top" style="padding: 15px 0;" class="logo"> |
115 | - <a href="<?= $this->e($siteUrl) ;?>" target="_blank"> |
|
116 | - <img alt="Logo" src="<?= $this->e($siteUrl . $logo) ;?>" width="60" height="60" style="display: block; font-family: Helvetica, Arial, sans-serif; color: #ffffff; font-size: 16px;" border="0"> |
|
115 | + <a href="<?= $this->e($siteUrl); ?>" target="_blank"> |
|
116 | + <img alt="Logo" src="<?= $this->e($siteUrl . $logo); ?>" width="60" height="60" style="display: block; font-family: Helvetica, Arial, sans-serif; color: #ffffff; font-size: 16px;" border="0"> |
|
117 | 117 | </a> |
118 | 118 | </td> |
119 | 119 | </tr> |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | <table width="100%" border="0" cellspacing="0" cellpadding="0" align="center" style="max-width: 500px;" class="responsive-table"> |
140 | 140 | <tr> |
141 | 141 | <td align="center" style="font-size: 12px; line-height: 18px; font-family: Helvetica, Arial, sans-serif; color:#666666;"> |
142 | - <?= $this->e($address) ;?> |
|
142 | + <?= $this->e($address); ?> |
|
143 | 143 | <?php if (null !== $unsubscribe) { ?> |
144 | 144 | <br> |
145 | 145 | <a href="<?= $this->e($siteUrl) . '/' . $this->e($unsubscribe) ?>" target="_blank" style="color: #666666; text-decoration: none;">Unsubscribe</a> |
@@ -13,8 +13,8 @@ discard block |
||
13 | 13 | <table width="100%" border="0" cellspacing="0" cellpadding="0"> |
14 | 14 | <tr> |
15 | 15 | <td class="padding" align="center"> |
16 | - <a href="<?= $this->e($siteUrl) ;?>" target="_blank"> |
|
17 | - <img src="<?= $this->e($siteUrl) ;?>/bone-user/img/pirateship.jpg" width="400" height="164" border="0" alt="<?= $this->e($siteUrl) ;?>" style="display: block; color: #666666; font-family: Helvetica, arial, sans-serif; font-size: 16px;" class="img-max"> |
|
16 | + <a href="<?= $this->e($siteUrl); ?>" target="_blank"> |
|
17 | + <img src="<?= $this->e($siteUrl); ?>/bone-user/img/pirateship.jpg" width="400" height="164" border="0" alt="<?= $this->e($siteUrl); ?>" style="display: block; color: #666666; font-family: Helvetica, arial, sans-serif; font-size: 16px;" class="img-max"> |
|
18 | 18 | </a> |
19 | 19 | </td> |
20 | 20 | </tr> |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | <table border="0" cellspacing="0" cellpadding="0" class="mobile-button-container"> |
41 | 41 | <tr> |
42 | 42 | <td align="center" style="border-radius: 3px;" bgcolor="#256F9C"> |
43 | - <a href="<?= $this->e($siteUrl . $this->l() . $resetLink) ;?>" target="_blank" style="font-size: 16px; font-family: Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; border-radius: 3px; padding: 15px 25px; border: 1px solid #256F9C; display: inline-block;" class="mobile-button">Confirm change of email.</a></td> |
|
43 | + <a href="<?= $this->e($siteUrl . $this->l() . $resetLink); ?>" target="_blank" style="font-size: 16px; font-family: Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; border-radius: 3px; padding: 15px 25px; border: 1px solid #256F9C; display: inline-block;" class="mobile-button">Confirm change of email.</a></td> |
|
44 | 44 | </tr> |
45 | 45 | </table> |
46 | 46 | </td> |
@@ -13,8 +13,8 @@ discard block |
||
13 | 13 | <table width="100%" border="0" cellspacing="0" cellpadding="0"> |
14 | 14 | <tr> |
15 | 15 | <td class="padding" align="center"> |
16 | - <a href="<?= $this->e($siteUrl) ;?>" target="_blank"> |
|
17 | - <img src="<?= $this->e($siteUrl) ;?>/bone-user/img/pirateship.jpg" width="400" height="164" border="0" alt="<?= $this->e($siteUrl) ;?>" style="display: block; color: #666666; font-family: Helvetica, arial, sans-serif; font-size: 16px;" class="img-max"> |
|
16 | + <a href="<?= $this->e($siteUrl); ?>" target="_blank"> |
|
17 | + <img src="<?= $this->e($siteUrl); ?>/bone-user/img/pirateship.jpg" width="400" height="164" border="0" alt="<?= $this->e($siteUrl); ?>" style="display: block; color: #666666; font-family: Helvetica, arial, sans-serif; font-size: 16px;" class="img-max"> |
|
18 | 18 | </a> |
19 | 19 | </td> |
20 | 20 | </tr> |
@@ -23,10 +23,10 @@ discard block |
||
23 | 23 | <!-- COPY --> |
24 | 24 | <table width="100%" border="0" cellspacing="0" cellpadding="0"> |
25 | 25 | <tr> |
26 | - <td align="center" style="font-size: 25px; font-family: Helvetica, Arial, sans-serif; color: #333333; padding-top: 30px;" class="padding"><?= $this->t('email.user.register.thanks', 'user') ;?></td> |
|
26 | + <td align="center" style="font-size: 25px; font-family: Helvetica, Arial, sans-serif; color: #333333; padding-top: 30px;" class="padding"><?= $this->t('email.user.register.thanks', 'user'); ?></td> |
|
27 | 27 | </tr> |
28 | 28 | <tr> |
29 | - <td align="center" style="padding: 20px 0 0 0; font-size: 16px; line-height: 25px; font-family: Helvetica, Arial, sans-serif; color: #666666;" class="padding"><?= $this->t('email.user.register.body', 'user') ;?></td> |
|
29 | + <td align="center" style="padding: 20px 0 0 0; font-size: 16px; line-height: 25px; font-family: Helvetica, Arial, sans-serif; color: #666666;" class="padding"><?= $this->t('email.user.register.body', 'user'); ?></td> |
|
30 | 30 | </tr> |
31 | 31 | </table> |
32 | 32 | </td> |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | <table border="0" cellspacing="0" cellpadding="0" class="mobile-button-container"> |
41 | 41 | <tr> |
42 | 42 | <td align="center" style="border-radius: 3px;" bgcolor="#256F9C"> |
43 | - <a href="<?= $this->e($siteUrl . $this->l() . $activationLink) ;?>" target="_blank" style="font-size: 16px; font-family: Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; border-radius: 3px; padding: 15px 25px; border: 1px solid #256F9C; display: inline-block;" class="mobile-button"><?= $this->t('email.user.register.button', 'user') ;?> →</a></td> |
|
43 | + <a href="<?= $this->e($siteUrl . $this->l() . $activationLink); ?>" target="_blank" style="font-size: 16px; font-family: Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; border-radius: 3px; padding: 15px 25px; border: 1px solid #256F9C; display: inline-block;" class="mobile-button"><?= $this->t('email.user.register.button', 'user'); ?> →</a></td> |
|
44 | 44 | </tr> |
45 | 45 | </table> |
46 | 46 | </td> |
@@ -13,8 +13,8 @@ discard block |
||
13 | 13 | <table width="100%" border="0" cellspacing="0" cellpadding="0"> |
14 | 14 | <tr> |
15 | 15 | <td class="padding" align="center"> |
16 | - <a href="<?= $this->e($siteUrl) ;?>" target="_blank"> |
|
17 | - <img src="<?= $this->e($siteUrl) ;?>/bone-user/img/pirateship.jpg" width="400" height="164" border="0" alt="<?= $this->e($siteUrl) ;?>" style="display: block; color: #666666; font-family: Helvetica, arial, sans-serif; font-size: 16px;" class="img-max"> |
|
16 | + <a href="<?= $this->e($siteUrl); ?>" target="_blank"> |
|
17 | + <img src="<?= $this->e($siteUrl); ?>/bone-user/img/pirateship.jpg" width="400" height="164" border="0" alt="<?= $this->e($siteUrl); ?>" style="display: block; color: #666666; font-family: Helvetica, arial, sans-serif; font-size: 16px;" class="img-max"> |
|
18 | 18 | </a> |
19 | 19 | </td> |
20 | 20 | </tr> |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | <table border="0" cellspacing="0" cellpadding="0" class="mobile-button-container"> |
41 | 41 | <tr> |
42 | 42 | <td align="center" style="border-radius: 3px;" bgcolor="#256F9C"> |
43 | - <a href="<?= $this->e($siteUrl . $this->l() . $resetLink) ;?>" target="_blank" style="font-size: 16px; font-family: Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; border-radius: 3px; padding: 15px 25px; border: 1px solid #256F9C; display: inline-block;" class="mobile-button">Reset Password</a></td> |
|
43 | + <a href="<?= $this->e($siteUrl . $this->l() . $resetLink); ?>" target="_blank" style="font-size: 16px; font-family: Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; border-radius: 3px; padding: 15px 25px; border: 1px solid #256F9C; display: inline-block;" class="mobile-button">Reset Password</a></td> |
|
44 | 44 | </tr> |
45 | 45 | </table> |
46 | 46 | </td> |
@@ -20,7 +20,7 @@ |
||
20 | 20 | |
21 | 21 | public function init() |
22 | 22 | { |
23 | - $translator= $this->getTranslator(); |
|
23 | + $translator = $this->getTranslator(); |
|
24 | 24 | |
25 | 25 | $email = new EmailAddress('email'); |
26 | 26 | $email->setRequired(true); |
@@ -546,14 +546,14 @@ |
||
546 | 546 | $data = $form->getValues(); |
547 | 547 | if ($data['password'] === $data['confirm']) { |
548 | 548 | $this->userService->changePassword($user, $data['password']); |
549 | - $message = [Icon::CHECK_CIRCLE . ' ' .$translator->translate('email.resetpass.success', 'user'), 'success']; |
|
549 | + $message = [Icon::CHECK_CIRCLE . ' ' . $translator->translate('email.resetpass.success', 'user'), 'success']; |
|
550 | 550 | $success = true; |
551 | 551 | } else { |
552 | - $message = [Icon::WARNING . ' ' . $translator->translate('email.resetpass.nomatch', 'user') , 'danger']; |
|
552 | + $message = [Icon::WARNING . ' ' . $translator->translate('email.resetpass.nomatch', 'user'), 'danger']; |
|
553 | 553 | $form = new ResetPasswordForm('resetpass'); |
554 | 554 | } |
555 | - } else { |
|
556 | - $message = [Icon::WARNING . ' There was a problem with your form.' , 'danger']; |
|
555 | + } else { |
|
556 | + $message = [Icon::WARNING . ' There was a problem with your form.', 'danger']; |
|
557 | 557 | } |
558 | 558 | } |
559 | 559 |
@@ -552,7 +552,7 @@ |
||
552 | 552 | $message = [Icon::WARNING . ' ' . $translator->translate('email.resetpass.nomatch', 'user') , 'danger']; |
553 | 553 | $form = new ResetPasswordForm('resetpass'); |
554 | 554 | } |
555 | - } else { |
|
555 | + } else { |
|
556 | 556 | $message = [Icon::WARNING . ' There was a problem with your form.' , 'danger']; |
557 | 557 | } |
558 | 558 | } |