Bugzilla – Attachment 28903 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: Correct paths after file rename
BUG8446-Follow-up-Correct-paths-after-file-rename.patch (text/plain), 2.64 KB, created by
Martin Renvoize (ashimema)
on 2014-06-17 13:32:45 UTC
(
hide
)
Description:
BUG8446, Follow up: Correct paths after file rename
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2014-06-17 13:32:45 UTC
Size:
2.64 KB
patch
obsolete
>From 3acef069fa1016050f67b0c5180786d516b170a2 Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Wed, 2 Apr 2014 08:12:54 +0000 >Subject: [PATCH] BUG8446, Follow up: Correct paths after file rename > >--- > C4/Auth.pm | 6 +++--- > C4/Auth_with_shibboleth.pm | 2 +- > opac/opac-main.pl | 4 ++-- > 3 files changed, 6 insertions(+), 6 deletions(-) > >diff --git a/C4/Auth.pm b/C4/Auth.pm >index caecd64..4209fa3 100644 >--- a/C4/Auth.pm >+++ b/C4/Auth.pm >@@ -58,13 +58,13 @@ BEGIN { > $shib = C4::Context->config('useshibboleth') || 0; > $caslogout = C4::Context->preference('casLogout'); > require C4::Auth_with_cas; # no import >- require C4::Auth_with_Shibboleth; >+ require C4::Auth_with_shibboleth; > if ($ldap) { > require C4::Auth_with_ldap; > import C4::Auth_with_ldap qw(checkpw_ldap); > } > if ($shib) { >- import C4::Auth_with_Shibboleth >+ import C4::Auth_with_shibboleth > qw(checkpw_shib logout_shib login_shib_url get_login_shib); > > # Get shibboleth login attribute >@@ -1621,7 +1621,7 @@ sub checkpw { > > # Then, we check if it matches a valid koha user > if ($shib_login) { >- my ( $retval, $retcard, $retuserid ) = C4::Auth_with_Shibboleth::checkpw_shib( $dbh, $shib_login ); # EXTERNAL AUTH >+ my ( $retval, $retcard, $retuserid ) = C4::Auth_with_shibboleth::checkpw_shib( $dbh, $shib_login ); # EXTERNAL AUTH > ($retval) and return ( $retval, $retcard, $retuserid ); > return 0; > } >diff --git a/C4/Auth_with_shibboleth.pm b/C4/Auth_with_shibboleth.pm >index 8dd3083..fddbc9d 100644 >--- a/C4/Auth_with_shibboleth.pm >+++ b/C4/Auth_with_shibboleth.pm >@@ -1,4 +1,4 @@ >-package C4::Auth_with_Shibboleth; >+package C4::Auth_with_shibboleth; > > # Copyright 2011 BibLibre > # >diff --git a/opac/opac-main.pl b/opac/opac-main.pl >index 3e884ce..e0a7425 100755 >--- a/opac/opac-main.pl >+++ b/opac/opac-main.pl >@@ -21,7 +21,7 @@ > use Modern::Perl; > use CGI; > use C4::Auth; # get_template_and_user >-use C4::Auth_with_Shibboleth qw( login_shib_url ); >+use C4::Auth_with_shibboleth qw( login_shib_url ); > use C4::Output; > use C4::NewsChannels; # GetNewsToDisplay > use C4::Languages qw(getTranslatedLanguages accept_language); >@@ -48,7 +48,7 @@ $template->param( > if ( C4::Context->config('useshibboleth') ) { > $template->param( > shibbolethAuthentication => C4::Context->config('useshibboleth'), >- shibbolethLoginUrl => C4::Auth_with_Shibboleth::login_shib_url($input) >+ shibbolethLoginUrl => C4::Auth_with_shibboleth::login_shib_url($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