From 4229b790e57e6963e37a6bf7ca3e850a7ac61370 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Thu, 24 Jul 2014 13:41:30 +0000 Subject: [PATCH] BUG8446, Follow up: Fixed bootstrap login via modal - The bootstrap theme enable login from any opac page via modal. To enable this with shibboleth we had to make some template parameters globally accessible when shibboleth is enabled. --- C4/Auth.pm | 18 +++++++++++++----- opac/opac-main.pl | 8 -------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/C4/Auth.pm b/C4/Auth.pm index 16a628a..788e3ea 100644 --- a/C4/Auth.pm +++ b/C4/Auth.pm @@ -298,11 +298,18 @@ sub get_template_and_user { } else { # if this is an anonymous session, setup to display public lists... - # If shibboleth is enabled, and we have a shibboleth login attribute, - # but we are in an anonymouse session, we clearly have an invalid - # Shibboleth account. - if ( $shib && $shib_login ) { - $template->param( invalidShibLogin => '1'); + # If shibboleth is enabled, and we're in an anonymous session, we should allow + # the user to attemp login via shibboleth. + if ( $shib ) { + $template->param( shibbolethAuthentication => $shib, + shibbolethLoginUrl => login_shib_url($in->{'query'}), + ); + # If shibboleth is enabled and we have a shibboleth login attribute, + # but we are in an anonymous session, then we clearly have an invalid + # shibboleth koha account. + if ( $shib_login ) { + $template->param( invalidShibLogin => '1'); + } } $template->param( sessionID => $sessionID ); @@ -1176,6 +1183,7 @@ sub checkauth { if ($shib) { $template->param( + shibbolethAuthentication => $shib, shibbolethLoginUrl => login_shib_url($query), ); } diff --git a/opac/opac-main.pl b/opac/opac-main.pl index 43da044..5374f36 100755 --- a/opac/opac-main.pl +++ b/opac/opac-main.pl @@ -21,7 +21,6 @@ use Modern::Perl; use CGI; use C4::Auth; # get_template_and_user -use C4::Auth_with_shibboleth qw( login_shib_url ); use C4::Output; use C4::NewsChannels; # GetNewsToDisplay use C4::Languages qw(getTranslatedLanguages accept_language); @@ -45,13 +44,6 @@ $template->param( casAuthentication => $casAuthentication, ); -if ( C4::Context->config('useshibboleth') ) { - $template->param( - shibbolethAuthentication => C4::Context->config('useshibboleth'), - shibbolethLoginUrl => C4::Auth_with_shibboleth::login_shib_url($input) - ); -}; - # display news # use cookie setting for language, bug default to syspref if it's not set my ($theme, $news_lang, $availablethemes) = C4::Templates::themelanguage(C4::Context->config('opachtdocs'),'opac-main.tt','opac',$input); -- 1.7.10.4