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

(-)a/C4/Auth_with_cas.pm (-6 / +5 lines)
Lines 66-72 sub getMultipleAuth { Link Here
66
# Logout from CAS
66
# Logout from CAS
67
sub logout_cas {
67
sub logout_cas {
68
    my ($query) = @_;
68
    my ($query) = @_;
69
    my $uri = $ENV{'SCRIPT_URI'};
69
    my $uri = C4::Context->preference('OPACBaseURL') . $query->script_name();
70
    my $casparam = $query->param('cas');
70
    my $casparam = $query->param('cas');
71
    # FIXME: This should be more generic and handle whatever parameters there might be
71
    # FIXME: This should be more generic and handle whatever parameters there might be
72
    $uri .= "?cas=" . $casparam if (defined $casparam);
72
    $uri .= "?cas=" . $casparam if (defined $casparam);
Lines 78-84 sub logout_cas { Link Here
78
# Login to CAS
78
# Login to CAS
79
sub login_cas {
79
sub login_cas {
80
    my ($query) = @_;
80
    my ($query) = @_;
81
    my $uri = $ENV{'SCRIPT_URI'};
81
    my $uri = C4::Context->preference('OPACBaseURL') . $query->script_name();
82
    my $casparam = $query->param('cas');
82
    my $casparam = $query->param('cas');
83
    # FIXME: This should be more generic and handle whatever parameters there might be
83
    # FIXME: This should be more generic and handle whatever parameters there might be
84
    $uri .= "?cas=" . $casparam if (defined $casparam);
84
    $uri .= "?cas=" . $casparam if (defined $casparam);
Lines 91-97 sub login_cas { Link Here
91
sub login_cas_url {
91
sub login_cas_url {
92
92
93
    my ($query, $key) = @_;
93
    my ($query, $key) = @_;
94
    my $uri = $ENV{'SCRIPT_URI'};
94
    my $uri = C4::Context->preference('OPACBaseURL') . $query->script_name();
95
    my $casparam = $query->param('cas');
95
    my $casparam = $query->param('cas');
96
    # FIXME: This should be more generic and handle whatever parameters there might be
96
    # FIXME: This should be more generic and handle whatever parameters there might be
97
    $uri .= "?cas=" . $casparam if (defined $casparam);
97
    $uri .= "?cas=" . $casparam if (defined $casparam);
Lines 107-113 sub checkpw_cas { Link Here
107
    $debug and warn "checkpw_cas";
107
    $debug and warn "checkpw_cas";
108
    my ($dbh, $ticket, $query) = @_;
108
    my ($dbh, $ticket, $query) = @_;
109
    my $retnumber;
109
    my $retnumber;
110
    my $uri = $ENV{'SCRIPT_URI'};
110
    my $uri = C4::Context->preference('OPACBaseURL') . $query->script_name();
111
    my $casparam = $query->param('cas');
111
    my $casparam = $query->param('cas');
112
    # FIXME: This should be more generic and handle whatever parameters there might be
112
    # FIXME: This should be more generic and handle whatever parameters there might be
113
    $uri .= "?cas=" . $casparam if (defined $casparam);
113
    $uri .= "?cas=" . $casparam if (defined $casparam);
Lines 157-163 sub check_api_auth_cas { Link Here
157
    $debug and warn "check_api_auth_cas";
157
    $debug and warn "check_api_auth_cas";
158
    my ($dbh, $PT, $query) = @_;
158
    my ($dbh, $PT, $query) = @_;
159
    my $retnumber;
159
    my $retnumber;
160
    my $url = $query->url();
160
    my $url = C4::Context->preference('OPACBaseURL') . $query->script_name();
161
161
162
    my $casparam = $query->param('cas');
162
    my $casparam = $query->param('cas');
163
    $casparam = $defaultcasserver if (not defined $casparam);
163
    $casparam = $defaultcasserver if (not defined $casparam);
164
- 

Return to bug 7745