View | Details | Raw Unified | Return to bug 18506
Collapse All | Expand All

(-)a/C4/Auth.pm (+17 lines)
Lines 1064-1069 sub checkauth { Link Here
1064
                }
1064
                }
1065
            }
1065
            }
1066
1066
1067
            # If shib configured and shibOnly enabled, we should ignore anything other than a shibboleth type login.
1068
            if (
1069
                   $shib
1070
                && !$shibSuccess
1071
                && (
1072
                    (
1073
                        ( $type eq 'opac' )
1074
                        && C4::Context->preference('opacShibOnly')
1075
                    )
1076
                    || ( ( $type ne 'opac' )
1077
                        && C4::Context->preference('staffShibOnly') )
1078
                )
1079
              )
1080
            {
1081
                $return = 0;
1082
            }
1083
1067
            # $return: 1 = valid user
1084
            # $return: 1 = valid user
1068
            if ($return) {
1085
            if ($return) {
1069
1086
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc (-1 / +4 lines)
Lines 75-80 Link Here
75
                                        [% IF Koha.Preference('casAuthentication') %]
75
                                        [% IF Koha.Preference('casAuthentication') %]
76
                                            [%# CAS authentication is too complicated for modal window %]
76
                                            [%# CAS authentication is too complicated for modal window %]
77
                                            <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>
77
                                            <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>
78
                                        [% ELSIF shibbolethAuthentication && Koha.Preference('opacShibOnly') %]
79
                                            <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>
78
                                        [% ELSE %]
80
                                        [% ELSE %]
79
                                            <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>
81
                                            <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>
80
                                        [% END %]
82
                                        [% END %]
Lines 99-104 Link Here
99
                                            <li><a class="login-link" href="/cgi-bin/koha/opac-user.pl">Log in to your account</a></li>
101
                                            <li><a class="login-link" href="/cgi-bin/koha/opac-user.pl">Log in to your account</a></li>
100
                                        [% ELSIF ( Koha.Preference('GoogleOpenIDConnect') == 1 ) %]
102
                                        [% ELSIF ( Koha.Preference('GoogleOpenIDConnect') == 1 ) %]
101
                                            <li><a class="login-link" href="/cgi-bin/koha/svc/auth/googleopenidconnect" role="button" data-toggle="modal">Log in to your account</a></li>
103
                                            <li><a class="login-link" href="/cgi-bin/koha/svc/auth/googleopenidconnect" role="button" data-toggle="modal">Log in to your account</a></li>
104
                                        [% ELSIF shibbolethAuthentication && Koha.Preference('opacShibOnly') %]
105
                                            <li><a class="login-link" href="/cgi-bin/koha/opac-user.pl">Log in to your account</a></li>
102
                                        [% ELSE %]
106
                                        [% ELSE %]
103
                                            <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>
107
                                            <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>
104
                                        [% END %]
108
                                        [% END %]
105
- 

Return to bug 18506