Oneliners, <br>, proper errors & print_unescaped()

diff --git a/core/lostpassword/templates/lostpassword.php b/core/lostpassword/templates/lostpassword.php
index bb06249b7222696add1148ee1aeb9b186e7e5faf..4f8841957997533a6afcdd21adf5cb7f4e300657 100644 (file)
--- a/core/lostpassword/templates/lostpassword.php
+++ b/core/lostpassword/templates/lostpassword.php
@@ -1,25 +1,23 @@
 <?php if ($_['requested']): ?>
        <div class="success"><p>
        <?php
-               echo $l->t('The link to reset your password has been sent to your email.</p>
-               <p>If you do not receive it within a reasonable amount of time, check your spam/junk folders.</p>
-               <p>If it is not there ask your local administrator .');
+               print_unescaped($l->t('The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator .'));
        ?>
        </p></div>
 <?php else: ?>
-       <form action="<?php echo OC_Helper::linkToRoute('core_lostpassword_send_email') ?>" method="post">
+       <form action="<?php print_unescaped(OC_Helper::linkToRoute('core_lostpassword_send_email')) ?>" method="post">
                <fieldset>
                        <?php if ($_['error']): ?>
                                <div class="errors"><p>
-                               <?php echo $l->t('Request failed!</p><p>Did you make sure the Email was right?'); ?>
+                               <?php print_unescaped($l->t('Request failed!<br>Did you make sure your email/username was right?')); ?>
                                </p></div>
                        <?php endif; ?>
-                       <?php echo $l->t('You will receive a link to reset your password via Email.'); ?>
+                       <?php print_unescaped($l->t('You will receive a link to reset your password via Email.')=; ?>
                        <p class="infield">
-                               <label for="user" class="infield"><?php echo $l->t( 'Username' ); ?></label>
+                               <label for="user" class="infield"><?php print_unescaped($l->t( 'Username' )); ?></label>
                                <input type="text" name="user" id="user" placeholder="" value="" autocomplete="off" required autofocus />
                        </p>
-                       <input type="submit" id="submit" value="<?php echo $l->t('Request reset'); ?>" />
+                       <input type="submit" id="submit" value="<?php print_unescaped($l->t('Request reset')); ?>" />
                </fieldset>
        </form>
 <?php endif; ?>