Bugzilla – Attachment 30030 Details for
Bug 8446
Shibboleth authentication
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
BUG8446, Follow up: Fixed bootstrap login via modal
BUG8446-Follow-up-Fixed-bootstrap-login-via-modal.patch (text/plain), 2.86 KB, created by
Martin Renvoize
on 2014-07-24 14:33:30 UTC
(
hide
)
Description:
BUG8446, Follow up: Fixed bootstrap login via modal
Filename:
MIME Type:
Creator:
Martin Renvoize
Created:
2014-07-24 14:33:30 UTC
Size:
2.86 KB
patch
obsolete
>From 4229b790e57e6963e37a6bf7ca3e850a7ac61370 Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 8446
:
10841
|
22098
|
22107
|
22860
|
23224
|
23225
|
23226
|
25765
|
25766
|
26176
|
26177
|
26178
|
26187
|
26749
|
26750
|
26751
|
26752
|
26760
|
26761
|
26762
|
28892
|
28893
|
28894
|
28895
|
28896
|
28897
|
28898
|
28899
|
28900
|
28901
|
28902
|
28903
|
30017
|
30018
|
30019
|
30020
|
30021
|
30022
|
30023
|
30030
|
30031
|
30033
|
30283
|
30284
|
30285
|
30286
|
30335
|
30353
|
30354
|
30355
|
30356
|
30384
|
30594
|
30604
|
30605
|
30616
|
30617
|
30618
|
30619
|
30620
|
30621
|
30684
|
31407
|
31408
|
31836
|
31905
|
31906
|
31907
|
32125
|
32158
|
32162
|
32163
|
32164
|
32165
|
32166
|
32167
|
32168
|
32169
|
32170
|
32365
|
32366
|
32367
|
32368
|
32369
|
32370
|
32371
|
32372
|
32373
|
32374
|
32426
|
32427