Attachment 91012 Details for Bug 18506 – Bug 18506: (follow-up) Make this play nicely with opacPublic

[patch] Bug 18506: (follow-up) Make this play nicely with opacPublic

Bug-18506-follow-up-Make-this-play-nicely-with-opa.patch (text/plain), 3.50 KB, created by Martin Renvoize (ashimema) on 2019-06-26 10:36:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2019-06-26 10:36:05 UTC

Size: 3.50 KB

patch

obsolete

>From f1102cc8883db413ab18b47ca76ebf1da293c52b Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Tue, 7 May 2019 10:15:56 +0100
>Subject: [PATCH] Bug 18506: (follow-up) Make this play nicely with opacPublic
>
>---
> C4/Auth.pm                                      | 17 +++++++++++++++++
> .../bootstrap/en/includes/masthead.inc          |  4 ++++
> 2 files changed, 21 insertions(+)
>
>diff --git a/C4/Auth.pm b/C4/Auth.pm
>index a5da356ada..121ec4b1eb 100644
>--- a/C4/Auth.pm
>+++ b/C4/Auth.pm
>@@ -1058,6 +1058,23 @@ sub checkauth {
>                 }
>             }
> 
>+            # If shib configured and shibOnly enabled, we should ignore anything other than a shibboleth type login.
>+            if (
>+                   $shib
>+                && !$shibSuccess
>+                && (
>+                    (
>+                        ( $type eq 'opac' )
>+                        && C4::Context->preference('opacShibOnly')
>+                    )
>+                    || ( ( $type ne 'opac' )
>+                        && C4::Context->preference('staffShibOnly') )
>+                )
>+              )
>+            {
>+                $return = 0;
>+            }
>+
>             # $return: 1 = valid user
>             if ($return) {
> 
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
>index 184a60527d..8acf076fed 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
>@@ -71,6 +71,8 @@
>                                         [% IF Koha.Preference('casAuthentication') %]
>                                             [%# CAS authentication is too complicated for modal window %]
>                                             <li role="presentation"><a href="/cgi-bin/koha/opac-user.pl" tabindex="-1" class="menu-inactive" role="menuitem">Log in to create your own lists</a></li>
>+                                        [% ELSIF shibbolethAuthentication && Koha.Preference('opacShibOnly') %]
>+                                            <li role="presentation"><a href="/cgi-bin/koha/opac-user.pl" tabindex="-1" class="menu-inactive" role="menuitem">Log in to create your own lists</a></li>
>                                         [% ELSE %]
>                                             <li role="presentation"><a href="/cgi-bin/koha/opac-user.pl" tabindex="-1" class="menu-inactive loginModal-trigger" role="menuitem">Log in to create your own lists</a></li>
>                                         [% END %]
>@@ -95,6 +97,8 @@
>                                             <li><a class="login-link" href="/cgi-bin/koha/opac-user.pl">Log in to your account</a></li>
>                                         [% ELSIF ( Koha.Preference('GoogleOpenIDConnect') == 1 ) %]
>                                             <li><a class="login-link" href="/cgi-bin/koha/svc/auth/googleopenidconnect" role="button" data-toggle="modal">Log in to your account</a></li>
>+                                        [% ELSIF shibbolethAuthentication && Koha.Preference('opacShibOnly') %]
>+                                            <li><a class="login-link" href="/cgi-bin/koha/opac-user.pl">Log in to your account</a></li>
>                                         [% ELSE %]
>                                             <li><a href="/cgi-bin/koha/opac-user.pl" class="login-link loginModal-trigger" role="button" data-toggle="modal">Log in to your account</a></li>
>                                         [% END %]
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 18506: 62810 | 79050 | 79522 | 79524 | 79540 | 89423 | 89424 | 91011 | 91012 | 91013 | 92665 | 92680 | 92681 | 92682 | 92683 | 116250 | 116251 | 116253 | 116280 | 116281 | 116282 | 116290 | 116536 | 116537 | 116538 | 116540