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

(-)a/C4/Auth_with_Shibboleth.pm (-4 / +6 lines)
Lines 40-46 my $protocol = "https://"; Link Here
40
# Logout from Shibboleth
40
# Logout from Shibboleth
41
sub logout_shib {
41
sub logout_shib {
42
    my ($query) = @_;
42
    my ($query) = @_;
43
    my $uri = $protocol . $ENV{'SERVER_NAME'};
43
    my $uri = $protocol . C4::Context->preference('OPACBaseURL');
44
    print $query->redirect( $uri . "/Shibboleth.sso/Logout?return=$uri" );
44
    print $query->redirect( $uri . "/Shibboleth.sso/Logout?return=$uri" );
45
}
45
}
46
46
Lines 48-55 sub logout_shib { Link Here
48
sub login_shib_url {
48
sub login_shib_url {
49
49
50
    my ($query) = @_;
50
    my ($query) = @_;
51
    my $param = $protocol . $ENV{'SERVER_NAME'} . $query->script_name();
51
    my $param = $protocol . C4::Context->preference('OPACBaseURL') . $query->script_name();
52
    my $uri = $protocol . $ENV{'SERVER_NAME'} . "/Shibboleth.sso/Login?target=$param";
52
    if ( $query->query_string() ) {
53
        $param = $param . '%3F' . $query->query_string();
54
    }
55
    my $uri = $protocol . C4::Context->preference('OPACBaseURL') . "/Shibboleth.sso/Login?target=$param";
53
    return $uri;
56
    return $uri;
54
}
57
}
55
58
56
- 

Return to bug 8446