unicode bug #3390: uri_escape -> uri_escape_utf8

diff --git a/web/htdocs/chrome/layout.mc b/web/htdocs/chrome/layout.mc
index b1f054b..d7dc956 100644 (file)
--- a/web/htdocs/chrome/layout.mc
+++ b/web/htdocs/chrome/layout.mc
@@ -103,20 +103,20 @@ my $id = utf8param($r, "id");
      <div class="panel2">
       <b>This Target</b>
       <br/>
-      <a href="<% xml_encode("/full.html?id=" . uri_escape($id)) %>">Show details</a>
+      <a href="<% xml_encode("/full.html?id=" . uri_escape_utf8($id)) %>">Show details</a>
       <br/>
-      <a href="<% xml_encode("/admin/edit.html?op=edit&id=" . uri_escape($id)) %>">Edit details</a>
+      <a href="<% xml_encode("/admin/edit.html?op=edit&id=" . uri_escape_utf8($id)) %>">Edit details</a>
       <br/>
-      <a href="<% xml_encode("/admin/edit.html?op=copy&id=" . uri_escape($id)) %>">Copy target</a>
+      <a href="<% xml_encode("/admin/edit.html?op=copy&id=" . uri_escape_utf8($id)) %>">Copy target</a>
       <br/>
-      <a href="<% xml_encode("/admin/delete.html?id=" . uri_escape($id)) %>">Delete target</a>
+      <a href="<% xml_encode("/admin/delete.html?id=" . uri_escape_utf8($id)) %>">Delete target</a>
       <p>
-       <a href="<% xml_encode("/admin/check.html?id=" . uri_escape($id)) . "&amp;test=Quick" %>">Quick Test</a>
+       <a href="<% xml_encode("/admin/check.html?id=" . uri_escape_utf8($id)) . "&amp;test=Quick" %>">Quick Test</a>
        <br/>
-       <a href="<% xml_encode("/admin/check.html?id=" . uri_escape($id)) . "&amp;test=Main" %>">Full Test</a>
+       <a href="<% xml_encode("/admin/check.html?id=" . uri_escape_utf8($id)) . "&amp;test=Main" %>">Full Test</a>
       </p>
       <p>
-       <a href="<% xml_encode("/raw.html?id=" . uri_escape($id)) %>">XML</a>
+       <a href="<% xml_encode("/raw.html?id=" . uri_escape_utf8($id)) %>">XML</a>
       </p>
 <%doc><!-- Maybe this would be too heavyweight -->
       <br/>

diff --git a/web/htdocs/details/delete.mc b/web/htdocs/details/delete.mc
index 981f8b2..a1ae5f2 100644 (file)
--- a/web/htdocs/details/delete.mc
+++ b/web/htdocs/details/delete.mc
@@ -10,8 +10,8 @@ $really => 0
       <% xml_encode($id) %>?
      </p>
      <p>
-      <a href="?really=1&amp;id=<% xml_encode(uri_escape($id)) %>">Yes</a><br/>
-      <a href="/full.html?id=<% xml_encode(uri_escape($id)) %>">No</a><br/>
+      <a href="?really=1&amp;id=<% xml_encode(uri_escape_utf8($id)) %>">Yes</a><br/>
+      <a href="/full.html?id=<% xml_encode(uri_escape_utf8($id)) %>">No</a><br/>
      </p>
 % } else {
 <%perl>

diff --git a/web/htdocs/details/edit.mc b/web/htdocs/details/edit.mc
index 3ee62b4..de18268 100644 (file)
--- a/web/htdocs/details/edit.mc
+++ b/web/htdocs/details/edit.mc
@@ -84,7 +84,7 @@ if (!defined $id) {
        # that the new record is not a duplicate of an existing one.
        my $rs = $conn->search(new ZOOM::Query::CQL(cql_target($newid)));
        if ($rs->size() > 0) {
-           my $qnewid = xml_encode(uri_escape($newid));
+           my $qnewid = xml_encode(uri_escape_utf8($newid));
            print qq[<p class="error">
                There is already
                <a href='?op=edit&amp;id=$newid'>a record</a>

diff --git a/web/htdocs/details/found.mc b/web/htdocs/details/found.mc
index 443181e..307239d 100644 (file)
--- a/web/htdocs/details/found.mc
+++ b/web/htdocs/details/found.mc
@@ -125,19 +125,19 @@ push @ids, $id;
 </%perl>
       <tr style="background: <% ($i % 2) ? '#ffffc0' : 'white' %>">
        <td><% $i %></td>
-       <td><a href="<% xml_encode("/full.html?id=" . uri_escape($id))
+       <td><a href="<% xml_encode("/full.html?id=" . uri_escape_utf8($id))
                %>"><% xml_encode($title) %></a></td>
        <td><% xml_encode($reliability, "", { nbsp => 1 }) %></td>
        <td><% xml_encode($host, "") %></td>
        <td><% xml_encode($port, "") %></td>
        <td><% xml_encode($db, "") %></td>
        <td>
-       <a href="<% xml_encode("/admin/check.html?id=" . uri_escape($id))
+       <a href="<% xml_encode("/admin/check.html?id=" . uri_escape_utf8($id))
                %>" title="Test this target">Test</a
        >&nbsp;<a href="<% xml_encode("/admin/edit.html?op=edit&id=" .
-               uri_escape($id))
+               uri_escape_utf8($id))
                %>" title="Edit this target's record">Edit</a
-       >&nbsp;<a href="<% xml_encode("/raw.html?id=" . uri_escape($id))
+       >&nbsp;<a href="<% xml_encode("/raw.html?id=" . uri_escape_utf8($id))
                %>" title="Raw XML record">XML</a>
        </td>
       </tr>
@@ -149,11 +149,11 @@ print_navlink(\%params, $last < $n, "Next", $skip+$count);
 </%perl>
      <p>
       <a href="<% "/admin/check.html?" .
-       xml_encode(join("&", map { "id=" . uri_escape($_) } @ids))
+       xml_encode(join("&", map { "id=" . uri_escape_utf8($_) } @ids))
        %>">[Test all targets on this list]</a>
      </p>
      <p>
-      <a href="<% "/stats.html?query=" . xml_encode(uri_escape($query))
+      <a href="<% "/stats.html?query=" . xml_encode(uri_escape_utf8($query))
        %>">[Statistics for targets on this list]</a>
      </p>
 % }

diff --git a/web/htdocs/details/upload.mc b/web/htdocs/details/upload.mc
index c32df58..4a639ad 100644 (file)
--- a/web/htdocs/details/upload.mc
+++ b/web/htdocs/details/upload.mc
@@ -59,6 +59,6 @@ ZOOM::IRSpy::_rewrite_zeerex_record($conn, $xc->getContextNode());
      </p>
      <p>
       Proceed to
-      <a href="<% xml_encode("/full.html?id=" . uri_escape($id))
+      <a href="<% xml_encode("/full.html?id=" . uri_escape_utf8($id))
        %>">the new record</a>.
      </p>