Bug 18506: (QA follow-up) Indentation and more conditionals

Indentation fixes for readability

Cleaned up a few places where the ability to login otherwise was leakign through

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

JD amended patch: Remove trailing spaces

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt

@@ -61,6 +61,7 @@
 <p>If you have a shibboleth account, please <a href="[% shibbolethLoginUrl | $raw %]">click here</a> to login.</p>
 [% END %]
 
+[% UNLESS Koha.Preference('staffShibOnly') %]
     <!-- login prompt time-->
     <form action="[% script_name | html %]" method="post" name="loginform" id="loginform">
         <input type="hidden" name="koha_login_context" value="intranet" />
@@ -107,13 +108,13 @@
         </p>
         [% END %]
 
-</fieldset>
     [% END %]
 
     <!-- <p><label><input name="rememberme" type="checkbox" id="rememberme" value="forever" tabindex="3" />Remember me</label></p> -->
 
     <p class="submit"><input id="submit-button" type="submit" value="Login" tabindex="4" /></p>
     </form>
+
     [% IF ( casAuthentication ) %]
         <h4>Cas login</h4>
 
@@ -134,6 +135,7 @@
             [% END %]
         [% END %]
     [% END %]
+[% END %]
 
 [% IF ( nopermission ) %]
     <p><a href="javascript:window.history.back()">[Previous page]</a>

koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc

@@ -379,9 +379,12 @@
                             [% ELSE %]
                                 <h3>Shibboleth login</h3>
                                 <p><a href="[% shibbolethLoginUrl | $raw %]">Log in using a Shibboleth account</a>.</p>
+                                [% UNLESS Koha.Preference('opacShibOnly') %]
                                     <h3>Local Login</h3>
                                 [% END %]
                             [% END %]
+                        [% END %]
+                        [% UNLESS Koha.Preference('opacShibOnly') %]
                             <input type="hidden" name="koha_login_context" value="opac" />
                             <fieldset class="brief">
                                 <label for="muserid">Login:</label><input type="text" id="muserid" name="userid" />
@@ -402,10 +405,13 @@
                                     </div>
                                 [% END %]
                             </fieldset>
+                        [% END %]
                     </div>
+                    [% UNLESS Koha.Preference('opacShibOnly') %]
                         <div class="modal-footer">
                             <input type="submit" class="btn btn-primary" value="Log in" />
                         </div>
+                    [% END %]
                 </form> <!-- /#auth -->
             </div> <!-- /.modal-content -->
         </div> <!-- /.modal-dialog -->

koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt

@@ -181,7 +181,7 @@
             <div class="col-12 col-lg-3 order-md-2">
                 [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
                     [% UNLESS ( loggedinusername ) %]
-                        [% UNLESS ( casAuthentication || shibbolethAuthentication ) %]
+                        [% UNLESS ( casAuthentication || shibbolethAuthentication || Koha.Preference('opacShibOnly') ) %]
                             <div id="login">
                                 <form action="/cgi-bin/koha/opac-user.pl" method="post" name="auth" id="auth" autocomplete="off">
                                     <input type="hidden" name="koha_login_context" value="opac" />