Bug 12237: Remove the "horrible hack" in C4::Templates

[koha_fer] / C4 / Auth_with_cas.pm

diff --git a/C4/Auth_with_cas.pm b/C4/Auth_with_cas.pm
index e71898e..69e510f 100644 (file)
--- a/C4/Auth_with_cas.pm
+++ b/C4/Auth_with_cas.pm
@@ -67,6 +67,7 @@ sub logout_cas {
     my ($query) = @_;
     my ( $cas, $uri ) = _get_cas_and_service($query);
     print $query->redirect( $cas->logout_url($uri));
+    print $query->redirect( $cas->logout_url(url => $uri));
 }
 
 # Login to CAS
@@ -184,8 +185,7 @@ sub _get_cas_and_service {
     my $query = shift;
     my $key   = shift;    # optional
 
-    my $uri = C4::Context->preference('OPACBaseURL'); # server address
-    $uri .= $query->url( -absolute => 1, -query => 1 ); # page with params
+    my $uri = _url_with_get_params($query);
 
     my $casparam = $defaultcasserver;
     $casparam = $query->param('cas') if defined $query->param('cas');
@@ -195,6 +195,23 @@ sub _get_cas_and_service {
     return ( $cas, $uri );
 }
 
+# Get the current URL with parameters contained directly into URL (GET params)
+# This method replaces $query->url() which will give both GET and POST params
+sub _url_with_get_params {
+    my $query = shift;
+
+    my $uri_base_part = C4::Context->preference('OPACBaseURL') . $query->script_name();
+    my $uri_params_part = '';
+    foreach ( $query->url_param() ) {
+        $uri_params_part .= '&' if $uri_params_part;
+        $uri_params_part .= $_ . '=';
+        $uri_params_part .= URI::Escape::uri_escape( $query->url_param($_) );
+    }
+    $uri_base_part .= '?' if $uri_params_part;
+
+    return $uri_base_part . $uri_params_part;
+}
+
 1;
 __END__