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

(-)a/C4/Auth_with_Shibboleth.pm (-5 / +6 lines)
Lines 22-28 use warnings; Link Here
22
22
23
use C4::Debug;
23
use C4::Debug;
24
use C4::Context;
24
use C4::Context;
25
use C4::Utils qw( :all );
26
use CGI;
25
use CGI;
27
26
28
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $debug);
27
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $debug);
Lines 40-46 my $protocol = "https://"; Link Here
40
# Logout from Shibboleth
39
# Logout from Shibboleth
41
sub logout_shib {
40
sub logout_shib {
42
    my ($query) = @_;
41
    my ($query) = @_;
43
    my $uri = $protocol . $ENV{'SERVER_NAME'};
42
    my $uri = $protocol . C4::Context->preference('OPACBaseURL');
44
    print $query->redirect( $uri . "/Shibboleth.sso/Logout?return=$uri" );
43
    print $query->redirect( $uri . "/Shibboleth.sso/Logout?return=$uri" );
45
}
44
}
46
45
Lines 48-55 sub logout_shib { Link Here
48
sub login_shib_url {
47
sub login_shib_url {
49
48
50
    my ($query) = @_;
49
    my ($query) = @_;
51
    my $param = $protocol . $ENV{'SERVER_NAME'} . $query->script_name();
50
    my $param = $protocol . C4::Context->preference('OPACBaseURL') . $query->script_name();
52
    my $uri = $protocol . $ENV{'SERVER_NAME'} . "/Shibboleth.sso/Login?target=$param";
51
    if ( $query->query_string() ) {
52
        $param = $param . '%3F' . $query->query_string();
53
    }
54
    my $uri = $protocol . C4::Context->preference('OPACBaseURL') . "/Shibboleth.sso/Login?target=$param";
53
    return $uri;
55
    return $uri;
54
}
56
}
55
57
56
- 

Return to bug 8446