From f2769205377f7b1772a7d16157aa7f7ce019c135 Mon Sep 17 00:00:00 2001
From: Mike Taylor <mike@indexdata.com>
Date: Thu, 3 May 2007 14:13:19 +0000
Subject: [PATCH] Use utf8param($r, $key) instead of $r->param($key)
 throughout.

---
 web/htdocs/chrome/layout.mc |   12 ++++++------
 web/htdocs/details/doc.mc   |    4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/web/htdocs/chrome/layout.mc b/web/htdocs/chrome/layout.mc
index bff813d..97412a1 100644
--- a/web/htdocs/chrome/layout.mc
+++ b/web/htdocs/chrome/layout.mc
@@ -1,4 +1,4 @@
-%# $Id: layout.mc,v 1.32 2007-05-03 12:42:32 mike Exp $
+%# $Id: layout.mc,v 1.33 2007-05-03 14:13:44 mike Exp $
 <%args>
 $debug => undef
 $title
@@ -81,13 +81,13 @@ use ZOOM::IRSpy::Utils qw(utf8param isodate xml_encode cql_target cql_quote
 # the identifier components are all present (e.g. because a record has
 # just been edited or copied) we make an ID from those; otherwise we
 # use the "id" parameter, if specified.
-my $id = $r->param("id");
+my $id = utf8param($r, "id");
 {
     # Make up ID for newly created records.
-    my $protocol = $r->param("protocol");
-    my $host = $r->param("host");
-    my $port = $r->param("port");
-    my $dbname = $r->param("dbname");
+    my $protocol = utf8param($r, "protocol");
+    my $host = utf8param($r, "host");
+    my $port = utf8param($r, "port");
+    my $dbname = utf8param($r, "dbname");
     #warn "id='$id', protocol='$protocol' host='$host', port='$port', dbname='$dbname'";
     #warn "%ARGS = {\n" . join("", map { "\t'$_' => '" . $ARGS{$_} . ",'\n" } sort keys %ARGS) . "}\n";
     if (defined $protocol && defined $host &&
diff --git a/web/htdocs/details/doc.mc b/web/htdocs/details/doc.mc
index 07d7ad6..58c255f 100644
--- a/web/htdocs/details/doc.mc
+++ b/web/htdocs/details/doc.mc
@@ -1,11 +1,11 @@
-%# $Id: doc.mc,v 1.3 2006-11-16 12:16:18 mike Exp $
+%# $Id: doc.mc,v 1.4 2007-05-03 14:13:19 mike Exp $
 <%once>
 use Pod::Html;
 use IO::Dir;
 </%once>
 <%perl>
 my $libdir = $r->dir_config("IRSpyLibDir");
-my $module = $r->param("module");
+my $module = utf8param($r, "module");
 if (!defined $module) {
     print "     <ul>\n";
     render_doc_links($libdir, "ZOOM", 6);
-- 
1.7.10.4