Attachment 175295 Details for Bug 38544 – Bug 38544: OPAC Modal login not generated when OPAC login is disabled

[patch] Bug 38544: OPAC Modal login not generated when OPAC login is disabled

Bug-38544-OPAC-Modal-login-not-generated-when-OPAC.patch (text/plain), 13.81 KB, created by Matt Blenkinsop on 2024-12-09 11:15:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matt Blenkinsop

Created: 2024-12-09 11:15:47 UTC

Size: 13.81 KB

patch

obsolete

>From 79e2a65017809be6e306d991deeed41d3798dbd8 Mon Sep 17 00:00:00 2001
>From: Fridolin Somers <fridolin.somers@biblibre.com>
>Date: Wed, 27 Nov 2024 10:55:01 +0100
>Subject: [PATCH] Bug 38544: OPAC Modal login not generated when OPAC login is
> disabled
>
>When OPAC login is disabled (system preference opacuserlogin),
>the modal login should not exist in HTML.
>
>Note the access to opac-user.pl shows a message and not auth form.
>
>You may look at commit with : git diff --ignore-space-change
>
>Test plan :
>1.1) Set system preference opacuserlogin to "Allow"
>1.2) Go to OPAC main page
>1.3) Check you see in source : div id="loginModal"
>1.4) Click on "Log in to your account"
>1.5) Check you see the modal login
>2.1) Set system preference opacuserlogin to "Don't allow"
>2.2) Go to OPAC main page
>2.3) Check you do not see in source : div id="loginModal"
>
>Signed-off-by: David Cook <dcook@prosentient.com.au>
>Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
>---
> .../bootstrap/en/includes/masthead.inc        | 157 +++++++++---------
> 1 file changed, 80 insertions(+), 77 deletions(-)
>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
>index 312955ba47b..70713da7f0d 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
>@@ -387,86 +387,89 @@
>         </div> 
>     [% END # / OpacPublic %]
> 
>-    
>-    <div id="loginModal" class="modal" tabindex="-1" role="dialog" aria-labelledby="modalLoginLabel" aria-hidden="true">
>-        <div class="modal-dialog">
>-            <div class="modal-content">
>-                <div class="modal-header">
>-                    <h1 class="modal-title" id="modalLoginLabel">Log in to your account</h1>
>-                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
>-                </div>
>-                <form action="/cgi-bin/koha/opac-user.pl" method="post" name="auth" id="modalAuth">
>-                    [% INCLUDE 'csrf-token.inc' %]
>-                    <input type="hidden" name="has-search-query" id="has-search-query" value="" />
>-                    <div class="modal-body">
>-                        [% IF ( Koha.Preference('GoogleOpenIDConnect') == 1 ) %]
>-                            <a href="/cgi-bin/koha/svc/auth/googleopenidconnect" class="btn btn-light" id="openid_connect"><i class="fa-brands fa-google" aria-hidden="true"></i> Log in with Google</a>
>-                            <p>If you do not have a Google account, but do have a local account, you can still log in: </p>
>-                        [% END # /IF GoogleOpenIDConnect %]
>-                        [% IF ( shibbolethAuthentication ) %]
>-                            [% IF ( invalidShibLogin ) %]
>-                                
>-                                <div class="alert alert-info">
>-                                    <p>Sorry, your Shibboleth identity does not match a valid library identity. If you have a local login, you may use that below.</p>
>-                                </div>
>-                            [% ELSE %]
>-                                <h3 class="shib_title">Shibboleth login</h3>
>-                                <p><a id="shib_url" class="shib_url" href="[% shibbolethLoginUrl | $raw %]">Log in using a Shibboleth account</a>.</p>
>-                                [% UNLESS Koha.Preference('opacShibOnly') %]
>-                                    <h3 class="shib_local_title">Local login</h3>
>-                                [% END %]
>-                            [% END %]
>-                        [% END %]
>-                        [% UNLESS Koha.Preference('opacShibOnly') %]
>-                            [% SET identity_providers = AuthClient.get_providers('opac') %]
>-                            [% IF ( ! identity_providers.empty ) %]
>-                                [% FOREACH provider IN identity_providers %]
>-                                    <p class="clearfix">
>-                                        <a href="[% provider.url | url %]" class="btn btn-light col-md-12" id="provider_[% provider.code | html %]">
>-                                            [% IF provider.icon_url %]
>-                                            <img src="[% provider.icon_url | url %]" />
>-                                            [% ELSE %]
>-                                            <i class="fa fa-user" aria-hidden="true"></i>
>-                                            [% END %]
>-                                            Log in with [% provider.description | html %]
>-                                        </a>
>-                                    </p>
>-                                [% END %]
>-                                <hr/>
>-                                <p>If you do not have an external account, but do have a local account, you can still log in: </p>
>-                            [% END # /IF  identity_providers.size %]
>-                            <input type="hidden" name="koha_login_context" value="opac" />
>-                            <fieldset class="brief">
>-                                <div class="local-login">
>-                                    [% PROCESS login_label for="muserid" %]<input type="text" id="muserid" name="login_userid" autocomplete="off" />
>-                                    <label for="mpassword">Password:</label><input type="password" id="mpassword" name="login_password" autocomplete="off" />
>-                                    <fieldset class="action">
>-                                        <input type="hidden" name="op" value="cud-login" />
>-                                        <input type="submit" class="btn btn-primary" value="Log in" />
>-                                    </fieldset>
>-                                </div>
>-                                [% IF OpacLoginInstructions %]
>-                                    <div id="nologininstructions-modal" class="nologininstructions">
>-                                        [% PROCESS koha_news_block news => OpacLoginInstructions %]
>-                                    </div>
>-                                [% END %]
>-                                [% IF Koha.Preference('OpacPasswordChange') && Categories.can_any_reset_password %]
>-                                    <div id="forgotpassword-modal" class="forgotpassword">
>-                                        <p><a href="/cgi-bin/koha/opac-password-recovery.pl">Forgot your password?</a></p>
>+    [% IF ( Koha.Preference( 'opacuserlogin' ) == 1 ) %]
>+        
>+        <div id="loginModal" class="modal" tabindex="-1" role="dialog" aria-labelledby="modalLoginLabel" aria-hidden="true">
>+            <div class="modal-dialog">
>+                <div class="modal-content">
>+                    <div class="modal-header">
>+                        <h1 class="modal-title" id="modalLoginLabel">Log in to your account</h1>
>+                        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
>+                    </div>
>+                    <form action="/cgi-bin/koha/opac-user.pl" method="post" name="auth" id="modalAuth">
>+                        [% INCLUDE 'csrf-token.inc' %]
>+                        <input type="hidden" name="has-search-query" id="has-search-query" value="" />
>+                        <div class="modal-body">
>+                            [% IF ( Koha.Preference('GoogleOpenIDConnect') == 1 ) %]
>+                                <a href="/cgi-bin/koha/svc/auth/googleopenidconnect" class="btn btn-light" id="openid_connect"><i class="fa-brands fa-google" aria-hidden="true"></i> Log in with Google</a>
>+                                <p>If you do not have a Google account, but do have a local account, you can still log in: </p>
>+                            [% END # /IF GoogleOpenIDConnect %]
>+                            [% IF ( shibbolethAuthentication ) %]
>+                                [% IF ( invalidShibLogin ) %]
>+                                    
>+                                    <div class="alert alert-info">
>+                                        <p>Sorry, your Shibboleth identity does not match a valid library identity. If you have a local login, you may use that below.</p>
>                                     </div>
>+                                [% ELSE %]
>+                                    <h3 class="shib_title">Shibboleth login</h3>
>+                                    <p><a id="shib_url" class="shib_url" href="[% shibbolethLoginUrl | $raw %]">Log in using a Shibboleth account</a>.</p>
>+                                    [% UNLESS Koha.Preference('opacShibOnly') %]
>+                                        <h3 class="shib_local_title">Local login</h3>
>+                                    [% END %]
>                                 [% END %]
>-                                [% IF Koha.Preference('PatronSelfRegistration') && Categories.all( categorycode => Koha.Preference('PatronSelfRegistrationDefaultCategory') ).count %]
>-                                    <div id="patronregistration-modal" class="patronregistration">
>-                                        <p><a href="/cgi-bin/koha/opac-memberentry.pl">Create an account</a></p>
>+                            [% END %]
>+                            [% UNLESS Koha.Preference('opacShibOnly') %]
>+                                [% SET identity_providers = AuthClient.get_providers('opac') %]
>+                                [% IF ( ! identity_providers.empty ) %]
>+                                    [% FOREACH provider IN identity_providers %]
>+                                        <p class="clearfix">
>+                                            <a href="[% provider.url | url %]" class="btn btn-light col-md-12" id="provider_[% provider.code | html %]">
>+                                                [% IF provider.icon_url %]
>+                                                <img src="[% provider.icon_url | url %]" />
>+                                                [% ELSE %]
>+                                                <i class="fa fa-user" aria-hidden="true"></i>
>+                                                [% END %]
>+                                                Log in with [% provider.description | html %]
>+                                            </a>
>+                                        </p>
>+                                    [% END %]
>+                                    <hr/>
>+                                    <p>If you do not have an external account, but do have a local account, you can still log in: </p>
>+                                [% END # /IF  identity_providers.size %]
>+                                <input type="hidden" name="koha_login_context" value="opac" />
>+                                <fieldset class="brief">
>+                                    <div class="local-login">
>+                                        [% PROCESS login_label for="muserid" %]<input type="text" id="muserid" name="login_userid" autocomplete="off" />
>+                                        <label for="mpassword">Password:</label><input type="password" id="mpassword" name="login_password" autocomplete="off" />
>+                                        <fieldset class="action">
>+                                            <input type="hidden" name="op" value="cud-login" />
>+                                            <input type="submit" class="btn btn-primary" value="Log in" />
>+                                        </fieldset>
>                                     </div>
>-                                [% END %]
>-                            </fieldset>
>-                        [% END %]
>-                    </div>
>-                </form> 
>-            </div> 
>-        </div> 
>-    </div>  
>+                                    [% IF OpacLoginInstructions %]
>+                                        <div id="nologininstructions-modal" class="nologininstructions">
>+                                            [% PROCESS koha_news_block news => OpacLoginInstructions %]
>+                                        </div>
>+                                    [% END %]
>+                                    [% IF Koha.Preference('OpacPasswordChange') && Categories.can_any_reset_password %]
>+                                        <div id="forgotpassword-modal" class="forgotpassword">
>+                                            <p><a href="/cgi-bin/koha/opac-password-recovery.pl">Forgot your password?</a></p>
>+                                        </div>
>+                                    [% END %]
>+                                    [% IF Koha.Preference('PatronSelfRegistration') && Categories.all( categorycode => Koha.Preference('PatronSelfRegistrationDefaultCategory') ).count %]
>+                                        <div id="patronregistration-modal" class="patronregistration">
>+                                            <p><a href="/cgi-bin/koha/opac-memberentry.pl">Create an account</a></p>
>+                                        </div>
>+                                    [% END %]
>+                                </fieldset>
>+                            [% END %]
>+                        </div>
>+                    </form> 
>+                </div> 
>+            </div> 
>+        </div>  
>+    [% END # / IF opacuserlogin %]
>+
>     [% IF Koha.Preference( 'CookieConsent' ) %]
>             
>             <div id="cookieConsentBar" aria-hidden="true">
>-- 
>2.39.5 (Apple Git-154)

Actions: View | Diff | Splinter Review

Attachments on bug 38544: 175002 | 175014 | 175295