Attachment 116253 Details for Bug 18506 – Bug 18506: (QA follow-up) opacShibOnly -> OPACShibOnly

[patch] Bug 18506: (QA follow-up) opacShibOnly -> OPACShibOnly

Bug-18506-QA-follow-up-opacShibOnly---OPACShibOnly.patch (text/plain), 6.64 KB, created by Martin Renvoize (ashimema) on 2021-02-03 12:46:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2021-02-03 12:46:20 UTC

Size: 6.64 KB

patch

obsolete

>From e91d2d4eaa3b80fcf706cff8a69fce1007e6ac87 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Wed, 3 Feb 2021 12:45:45 +0000
>Subject: [PATCH] Bug 18506: (QA follow-up) opacShibOnly -> OPACShibOnly
>
>As requested
>---
> C4/Auth.pm                                           |  4 ++--
> installer/data/mysql/atomicupdate/shibOnly.perl      |  2 +-
> .../prog/en/modules/admin/preferences/opac.pref      |  2 +-
> .../opac-tmpl/bootstrap/en/modules/opac-auth.tt      | 12 ++++++------
> 4 files changed, 10 insertions(+), 10 deletions(-)
>
>diff --git a/C4/Auth.pm b/C4/Auth.pm
>index d76c2a2a76..8469a204ae 100644
>--- a/C4/Auth.pm
>+++ b/C4/Auth.pm
>@@ -1107,7 +1107,7 @@ sub checkauth {
>                 && (
>                     (
>                         ( $type eq 'opac' )
>-                        && C4::Context->preference('opacShibOnly')
>+                        && C4::Context->preference('OPACShibOnly')
>                     )
>                     || ( ( $type ne 'opac' )
>                         && C4::Context->preference('staffShibOnly') )
>@@ -1411,7 +1411,7 @@ sub checkauth {
> 
>     if ($shib) {
>         #If shibOnly is enabled just go ahead and redirect directly
>-        if ( (($type eq 'opac') && C4::Context->preference('opacShibOnly')) || (($type ne 'opac') && C4::Context->preference('staffShibOnly')) ) {
>+        if ( (($type eq 'opac') && C4::Context->preference('OPACShibOnly')) || (($type ne 'opac') && C4::Context->preference('staffShibOnly')) ) {
>             my $redirect_url = login_shib_url( $query );
>             print $query->redirect( -uri => "$redirect_url", -status => 303 );
>             safe_exit;
>diff --git a/installer/data/mysql/atomicupdate/shibOnly.perl b/installer/data/mysql/atomicupdate/shibOnly.perl
>index 9b67d0fb42..47130cf597 100644
>--- a/installer/data/mysql/atomicupdate/shibOnly.perl
>+++ b/installer/data/mysql/atomicupdate/shibOnly.perl
>@@ -1,6 +1,6 @@
> $DBversion = 'XXX';  # will be replaced by the RM
> if( CheckVersion( $DBversion ) ) {
>-    $dbh->do( "INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES ('opacShibOnly','0','If ON enables shibboleth only authentication for the opac','','YesNo'),('staffShibOnly','0','If ON enables shibboleth only authentication for the staff client','','YesNo')" );
>+    $dbh->do( "INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES ('OPACShibOnly','0','If ON enables shibboleth only authentication for the opac','','YesNo'),('staffShibOnly','0','If ON enables shibboleth only authentication for the staff client','','YesNo')" );
>     SetVersion( $DBversion );
>     print "Upgrade to $DBversion done (Bug XXXXX - shibOnly preferences)\n";
> }
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
>index 16d18c1d6c..25db7ab70d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
>@@ -934,7 +934,7 @@ OPAC:
>             - "."
>     Authentication:
>         -
>-            - pref: opacShibOnly
>+            - pref: OPACShibOnly
>               choices:
>                   yes: "Don't allow"
>                   no: Allow
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt
>index c0b2763937..a773d58e25 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt
>@@ -79,7 +79,7 @@
>                                     
>                                     <div class="alert alert-info">
>                                         <p>Sorry, your Shibboleth identity does not match a valid library identity.</p>
>-                                        [% UNLESS ( Koha.Preference('opacShibOnly') ) %]
>+                                        [% UNLESS ( Koha.Preference('OPACShibOnly') ) %]
>                                         [% IF ( casAuthentication ) %]
>                                             [% IF ( invalidCasLogin ) %]
>                                                 
>@@ -96,7 +96,7 @@
>                                     <h3>Shibboleth Login</h3>
>                                     <p><a href="[% shibbolethLoginUrl | $raw %]">If you have a Shibboleth account, please click here to log in.</a></p>
>                                 [% END # /IF invalidShibLogin %]
>-                                [% UNLESS ( Koha.Preference('opacShibOnly') ) %]
>+                                [% UNLESS ( Koha.Preference('OPACShibOnly') ) %]
>                                 [% IF ( casAuthentication ) %]
>                                     <h3>CAS login</h3>
>                                     <p>If you do not have a Shibboleth account, but you do have a CAS account, you can use CAS.</p>
>@@ -107,7 +107,7 @@
>                                 [% END %]
>                             [% END # /IF shibbolethAuthentication %]
> 
>-                        [% UNLESS ( Koha.Preference('opacShibOnly') ) %]
>+                        [% UNLESS ( Koha.Preference('OPACShibOnly') ) %]
>                         [% IF ( casAuthentication ) %]
>                             [% IF ( shibbolethAuthentication ) %]
>                                 [% IF ( casServerUrl ) %]
>@@ -163,9 +163,9 @@
>                             <a href="/cgi-bin/koha/svc/auth/googleopenidconnect" class="btn btn-primary" id="openid_connect">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 %]
>-                        [% END # /UNLESS opacShibOnly %]
>+                        [% END # /UNLESS OPACShibOnly %]
> 
>-                        [% IF !Koha.Preference('opacShibOnly') or SCO_login or SCI_login %]
>+                        [% IF !Koha.Preference('OPACShibOnly') or SCO_login or SCI_login %]
>                         [% IF SCO_login %]
>                             <form action="/cgi-bin/koha/sco/sco-main.pl" name="auth" id="auth" method="post" autocomplete="off">
>                         [% ELSIF SCI_login %]
>@@ -215,7 +215,7 @@
>                                 [% END %]
>                             </div>
>                         </form>
>-                        [% END # / IF !opacShibOnly or SCO_login or SCI_login %]
>+                        [% END # / IF !OPACShibOnly or SCO_login or SCI_login %]
>                     [% END # / IF loginprompt %]
> 
>                     [% ELSE %]
>-- 
>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