Bug 21526: Use the 'url' filter when needed
[koha.git] / koha-tmpl / opac-tmpl / bootstrap / en / modules / opac-auth.tt
index 404f49b..71edf3c 100644 (file)
@@ -1,6 +1,7 @@
+[% USE raw %]
 [% USE Koha %]
 [% INCLUDE 'doc-head-open.inc' %]
-<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;
+<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo;
 [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
     Log in to your account
 [% ELSE %]
@@ -25,7 +26,7 @@
                     <!--CONTENT-->
                     [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
                         [% IF ( nopermission ) %]
-                            <!-- This is what is displayed if user doesnt have permission -->
+                            <!-- This is what is displayed if user doesn't have permission -->
                             <div class="alert">
                                 <h3>Access denied</h3>
                                 <p>Sorry, the system doesn't think you have permission to access this page. </p>
                             [% END %]
 
                             [% IF ( different_ip ) %]
-                                <!-- This is what is displayed if user doesnt have permission -->
+                                <!-- This is what is displayed if user doesn't have permission -->
                                 <div class="alert alert-info">
                                     <p>You are logging from a different IP address. Please log in again.</p>
                                 </div>
                             [% END %]
 
 
-                            [% IF too_many_login_attempts %]
+                            [% IF invalid_username_or_password || too_many_login_attempts %]
+                                <!-- This is what is displayed if user doesn't have permission or account is locked. (Do not expose more information than needed.) -->
                                 <div class="alert alert-info">
-                                This account has been locked!
-                                [% IF Koha.Preference('OpacResetPassword') %]
-                                    <a href="/cgi-bin/koha/opac-password-recovery.pl">You must reset your password</a>.
-                                [% ELSE %]
-                                    Please contact a library staff member.
-                                [% END %]
-                                </div>
-                            [% ELSIF invalid_username_or_password %]
-                                <!-- This is what is displayed if user doesnt have permission -->
-                                <div class="alert alert-info">
-                                    <p>You entered an incorrect username or password. Please try again! And remember, passwords are case sensitive.</p>
+                                    <p>You entered an incorrect username or password. Please try again! But note that passwords are case sensitive[% IF Koha.Preference('FailedLoginAttempts') %] and that your account will be locked out after a fixed number of failed login attempts[% END %]. Please contact a library staff member if you continue to have problems.</p>
                                 </div>
                             [% END %]
 
@@ -90,7 +82,7 @@
                                     </div>
                             [% ELSE %]
                                 <h4>Shibboleth Login</h4>
-                                <p><a href="[% shibbolethLoginUrl %]">If you have a Shibboleth account, please click here to log in.</a></p>
+                                <p><a href="[% shibbolethLoginUrl | url %]">If you have a Shibboleth account, please click here to log in.</a></p>
                             [% END %]
                             [% IF ( casAuthentication ) %]
                                 <h4>CAS login</h4>
                         [% IF ( casAuthentication ) %]
                             [% IF ( shibbolethAuthentication ) %]
                                 [% IF ( casServerUrl ) %]
-                                    <p><a href="[% casServerUrl %]">Please click here to log in.</a><p>
+                                    <p><a href="[% casServerUrl | url %]">Please click here to log in.</a><p>
                                 [% END %]
 
                                 [% IF ( casServersLoop ) %]
                                     <p>Please choose against which one you would like to authenticate: </p>
                                     <ul>
                                         [% FOREACH casServer IN casServersLoop %]
-                                            <li><a href="[% casServer.value %]">[% casServer.name %]</a></li>
+                                            <li><a href="[% casServer.value | url %]">[% casServer.name | html %]</a></li>
                                         [% END %]
                                     </ul>
                                 [% END %]
                                 [% END %]
 
                                 [% IF ( casServerUrl ) %]
-                                   <p><a href="[% casServerUrl %]">If you have a CAS account, please click here to log in.</a><p>
+                                   <p><a href="[% casServerUrl | url %]">If you have a CAS account, please click here to log in.</a><p>
                                 [% END %]
 
                                 [% IF ( casServersLoop ) %]
                                     <p>If you have a CAS account, please choose against which one you would like to authenticate:</p>
                                     <ul>
                                         [% FOREACH casServer IN casServersLoop %]
-                                        <li><a href="[% casServer.value %]">[% casServer.name %]</a></li>
+                                        <li><a href="[% casServer.value | url %]">[% casServer.name | html %]</a></li>
                                         [% END %]
                                     </ul>
                                 [% END %]
                         [% IF ( Koha.Preference('GoogleOpenIDConnect') == 1 ) %]
                             [% IF ( invalidGoogleOpenIDConnectLogin ) %]
                                 <h4>Google login</h4>
-                                <p>Sorry, your Google login failed. <span class="error">[% invalidGoogleOpenIDConnectLogin %]</span></p>
+                                <p>Sorry, your Google login failed. <span class="error">[% invalidGoogleOpenIDConnectLogin | html %]</span></p>
                                 <p>Please note that the Google login will only work if you are using the e-mail address registered with this library.</p>
                                 <p>If you want to, you can try to <a href="/cgi-bin/koha/svc/auth/googleopenidconnect?reauthenticate=select_account">log in using a different account</a>
                             [% END %]
                         [% ELSIF SCI_login %]
                             <form action="/cgi-bin/koha/sci/sci-main.pl" name="auth" id="auth" method="post" autocomplete="off">
                         [% ELSE %]
-                            <form action="[% script_name %]" name="auth" id="auth" method="post" autocomplete="off">
+                            <form action="[% script_name | html %]" name="auth" id="auth" method="post" autocomplete="off">
                         [% END %]
                             <input type="hidden" name="koha_login_context" value="opac" />
                             <fieldset class="brief">
                             [% FOREACH INPUT IN INPUTS %]
-                                <input type="hidden" name="[% INPUT.name |html %]" value="[% INPUT.value |html %]" />
+                                <input type="hidden" name="[% INPUT.name | html %]" value="[% INPUT.value | html %]" />
                             [% END %]
                             <label for="userid">Login</label>
                             <input type="text"  size="25" id="userid"  name="userid" />
                             </fieldset>
 
                             <input type="submit" value="Log in" class="btn" />
+                            <p/>
                             [% IF Koha.Preference('OpacPasswordChange') && Koha.Preference('OpacResetPassword') %]
                                 <div id="forgotpassword">
                                     <a href="/cgi-bin/koha/opac-password-recovery.pl">Forgot your password?</a>
                                 </div>
                             [% END %]
                             <div id="nologininstructions">
-                            [% IF Koha.Preference('NoLoginInstructions') %]
-                                [% Koha.Preference('NoLoginInstructions') %]
+                            [% IF Koha.Preference('OpacLoginInstructions') %]
+                                [% Koha.Preference('OpacLoginInstructions') | $raw %]
                             [% ELSE %]
                                 <h5>Don't have a password yet?</h5>
                                 <p>If you don't have a password yet, stop by the circulation desk the next time you're in the library. We'll happily set one up for you.</p>
                                 <h5>Don't have a library card?</h5>
                                 <p>If you don't have a library card, stop by your local library to sign up.</p>
-                            [% END # / IF Koha.Preference('NoLoginInstructions') %]
+                            [% END # / IF Koha.Preference('OpacLoginInstructions') %]
 
                             [% IF PatronSelfRegistration && PatronSelfRegistrationDefaultCategory %]<span id="registrationinstructions"><a href="/cgi-bin/koha/opac-memberentry.pl">You may register here.</a></span>
                             [% END %]
                     [% ELSE %]
                         <h4>Logging on to the catalog has not been enabled by the library.</h4>
                         <ul>
-                            <li>To report this error, you can email the Koha Administrator.<a href="mailto:[% admin %]">Email</a></li>
+                            <li>To report this error, you can email the Koha Administrator.<a href="mailto:[% admin | uri %]">Email</a></li>
                             <li>Use top menu bar to navigate to another part of Koha.</li>
                         </ul>
                     [% END # / IF opacuserlogin %]
 
 [% INCLUDE 'opac-bottom.inc' %]
 [% BLOCK jsinclude %]
-<script type="text/javascript">
+<script>
 //<![CDATA[
     // Hide circular 'Log in to Your Account' link in opac-auth.pl
     $(document).ready(function() {