From 85c1d6333400942419f8741ed0af6b720c95fb0c Mon Sep 17 00:00:00 2001
From: Pasi Kallinen <pasi.kallinen@pttk.fi>
Date: Fri, 28 Jun 2013 09:44:44 +0300
Subject: [PATCH] Use uri_escape_utf8 instead of uri_escape

Signed-off-by: Pasi Kallinen <pasi.kallinen@pttk.fi>
Signed-off-by: Ben Shum <bshum@biblio.org>
---
 Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm   |  2 +-
 .../perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm    | 10 +++++-----
 .../perlmods/lib/OpenILS/WWW/EGCatLoader/Container.pm  |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
index 244afa206b..210a3c095a 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
@@ -216,7 +216,7 @@ sub redirect_ssl {
 sub redirect_auth {
     my $self = shift;
     my $login_page = sprintf('%s://%s%s/login',($self->ctx->{is_staff} ? 'oils' : 'https'), $self->ctx->{hostname}, $self->ctx->{opac_root});
-    my $redirect_to = uri_escape($self->apache->unparsed_uri);
+    my $redirect_to = uri_escape_utf8($self->apache->unparsed_uri);
     return $self->generic_redirect("$login_page?redirect_to=$redirect_to");
 }
 
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
index ca917a9ac4..381028d3ea 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
@@ -603,7 +603,7 @@ sub handle_hold_update {
         $url = $self->ctx->{proto} . '://' . $self->ctx->{hostname} . $self->ctx->{opac_root} . '/myopac/holds';
         foreach my $param (('loc', 'qtype', 'query')) {
             if ($self->cgi->param($param)) {
-                $url .= ";$param=" . uri_escape($self->cgi->param($param));
+                $url .= ";$param=" . uri_escape_utf8($self->cgi->param($param));
             }
         }
     }
@@ -1749,7 +1749,7 @@ sub load_myopac_bookbags {
 
                     foreach my $param (('loc', 'qtype', 'query', 'sort', 'offset', 'limit')) {
                         if ($self->cgi->param($param)) {
-                            $url .= ";$param=" . uri_escape($self->cgi->param($param));
+                            $url .= ";$param=" . uri_escape_utf8($self->cgi->param($param));
                         }
                     }
 
@@ -1851,7 +1851,7 @@ sub load_myopac_bookbag_update {
 
     foreach my $param (('loc', 'qtype', 'query', 'sort')) {
         if ($cgi->param($param)) {
-            $url .= "$param=" . uri_escape($cgi->param($param)) . ";";
+            $url .= "$param=" . uri_escape_utf8($cgi->param($param)) . ";";
         }
     }
 
@@ -1893,7 +1893,7 @@ sub load_myopac_bookbag_update {
         $url .= ';hold_target=' . $_ for @hold_recs;
         foreach my $param (('loc', 'qtype', 'query')) {
             if ($cgi->param($param)) {
-                $url .= ";$param=" . uri_escape($cgi->param($param));
+                $url .= ";$param=" . uri_escape_utf8($cgi->param($param));
             }
         }
         return $self->generic_redirect($url);
@@ -1972,7 +1972,7 @@ sub load_myopac_bookbag_update {
         }
     } elsif ($action eq 'save_notes') {
         $success = $self->update_bookbag_item_notes;
-        $url .= "&bbid=" . uri_escape($cgi->param("bbid")) if $cgi->param("bbid");
+        $url .= "&bbid=" . uri_escape_utf8($cgi->param("bbid")) if $cgi->param("bbid");
     } elsif ($action eq 'make_default') {
         $success = $U->simplereq(
             'open-ils.actor',
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Container.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Container.pm
index b61ac06df0..df7b79fffc 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Container.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Container.pm
@@ -204,7 +204,7 @@ sub mylist_warning_redirect {
         $redirect =~ s/#.*|$/#$anchor/;
     }
 
-    $base_url .= '?redirect_to=' . uri_escape($redirect);
+    $base_url .= '?redirect_to=' . uri_escape_utf8($redirect);
 
     return $self->generic_redirect(
         $base_url,
-- 
2.43.2