@@ -, +, @@ --- C4/Auth.pm | 6 +++--- C4/Auth_with_shibboleth.pm | 2 +- opac/opac-main.pl | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) --- a/C4/Auth.pm +++ a/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 @@ -1624,7 +1624,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; } --- a/C4/Auth_with_shibboleth.pm +++ a/C4/Auth_with_shibboleth.pm @@ -1,4 +1,4 @@ -package C4::Auth_with_Shibboleth; +package C4::Auth_with_shibboleth; # Copyright 2011 BibLibre # --- a/opac/opac-main.pl +++ a/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) ); }; --