From fcf2c1a1a5900f51a6e20c6b2391677bf6fb729c Mon Sep 17 00:00:00 2001
From: "kiko%async.com.br" <>
Date: Mon, 12 Apr 2004 04:31:44 +0000
Subject: Fix for bug 238865-v1: remove %FORM from page.cgi. Does so, fixing
 the linked page template and adding a code error for the "bad id provided"
 case. r=vladd, a=myk.

---
 page.cgi | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'page.cgi')

diff --git a/page.cgi b/page.cgi
index b68a9313b..6e78317fc 100755
--- a/page.cgi
+++ b/page.cgi
@@ -42,14 +42,19 @@ Bugzilla->login();
 
 my $cgi = Bugzilla->cgi;
 
-if ($::FORM{'id'}) {
+my $id = $cgi->param('id');
+if ($id) {
     # Remove all dodgy chars, and split into name and ctype.
-    $::FORM{'id'} =~ s/[^\w\-\.]//g;
-    $::FORM{'id'} =~ /(.*)\.(.*)/;
+    $id =~ s/[^\w\-\.]//g;
+    $id =~ /(.*)\.(.*)/;
+    if (!$2) {
+        # if this regexp fails to match completely, something bad came in
+        ThrowCodeError("bad_page_cgi_id", { "page_id" => $id });
+    }
 
     my $format = GetFormat("pages/$1", undef, $2);
     
-    $vars->{'form'} = \%::FORM; 
+    $cgi->param('id', $id);
 
     print $cgi->header($format->{'ctype'});
 
-- 
cgit v1.2.3-65-gdbad