Attachment #91012 for bug #18506

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




                }
            }

            # 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) {


Lines 71-76 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc (-1 / +4 lines)
71	[% IF Koha.Preference('casAuthentication') %]	71	[% IF Koha.Preference('casAuthentication') %]
72	[%# CAS authentication is too complicated for modal window %]	72	[%# CAS authentication is too complicated for modal window %]
73	<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>	73	<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>
		74	[% ELSIF shibbolethAuthentication && Koha.Preference('opacShibOnly') %]
		75	<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>
74	[% ELSE %]	76	[% ELSE %]
75	<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>	77	<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>
76	[% END %]	78	[% END %]
Lines 95-100 Link Here
95	<li><a class="login-link" href="/cgi-bin/koha/opac-user.pl">Log in to your account</a></li>	97	<li><a class="login-link" href="/cgi-bin/koha/opac-user.pl">Log in to your account</a></li>
96	[% ELSIF ( Koha.Preference('GoogleOpenIDConnect') == 1 ) %]	98	[% ELSIF ( Koha.Preference('GoogleOpenIDConnect') == 1 ) %]
97	<li><a class="login-link" href="/cgi-bin/koha/svc/auth/googleopenidconnect" role="button" data-toggle="modal">Log in to your account</a></li>	99	<li><a class="login-link" href="/cgi-bin/koha/svc/auth/googleopenidconnect" role="button" data-toggle="modal">Log in to your account</a></li>
		100	[% ELSIF shibbolethAuthentication && Koha.Preference('opacShibOnly') %]
		101	<li><a class="login-link" href="/cgi-bin/koha/opac-user.pl">Log in to your account</a></li>
98	[% ELSE %]	102	[% ELSE %]
99	<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>	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>
100	[% END %]	104	[% END %]
101	-

Return to bug 18506

Lines 1058-1063 sub checkauth { Link Here

(-)a/C4/Auth.pm (+17 lines)
1058	}	1058	}
1059	}	1059	}
1060		1060
		1061	# If shib configured and shibOnly enabled, we should ignore anything other than a shibboleth type login.
		1062	if (
		1063	$shib
		1064	&& !$shibSuccess
		1065	&& (
		1066	(
		1067	( $type eq 'opac' )
		1068	&& C4::Context->preference('opacShibOnly')
		1069	)
		1070	\|\| ( ( $type ne 'opac' )
		1071	&& C4::Context->preference('staffShibOnly') )
		1072	)
		1073	)
		1074	{
		1075	$return = 0;
		1076	}
		1077
1061	# $return: 1 = valid user	1078	# $return: 1 = valid user
1062	if ($return) {	1079	if ($return) {
1063		1080