Bug 1088022 - Bump min version to CGI 4.09

r=dkl

7 files changed, 35 insertions, 43 deletions

diff --git a/template/en/default/bug/create/comment-guided.txt.tmpl b/template/en/default/bug/create/comment-guided.txt.tmpl
index e85a36469..0a7b5223a 100644
--- a/template/en/default/bug/create/comment-guided.txt.tmpl
+++ b/template/en/default/bug/create/comment-guided.txt.tmpl
@@ -8,27 +8,27 @@
 [% USE Bugzilla %]
 [% cgi = Bugzilla.cgi %]
 User-Agent:       [%+ cgi.user_agent() %]
-Build Identifier: [%+ cgi.param("buildid") %]
+Build Identifier: [%+ cgi_param("buildid") %]
 
-[%+ cgi.param("comment") IF cgi.param("comment") %]
+[%+ cgi_param("comment") IF cgi_param("comment") %]
 
-[%+ IF cgi.param("reproducible") != "Choose one..." -%]
-Reproducible: [%+ cgi.param("reproducible") %]
+[%+ IF cgi_param("reproducible") != "Choose one..." -%]
+Reproducible: [%+ cgi_param("reproducible") %]
 [% END %]
 
-[% IF !(cgi.param("reproduce_steps").match('^1\.\s*2\.\s*3\.\s*$') || cgi.param("reproduce_steps").match('^\s*$')) %]
+[% IF !(cgi_param("reproduce_steps").match('^1\.\s*2\.\s*3\.\s*$') || cgi_param("reproduce_steps").match('^\s*$')) %]
 Steps to Reproduce:
-[%+ cgi.param("reproduce_steps") %]
+[%+ cgi_param("reproduce_steps") %]
 [% END %]
 
-[% IF cgi.param("actual_results") -%]
+[% IF cgi_param("actual_results") -%]
 Actual Results:  
-[%+ cgi.param("actual_results") %]
+[%+ cgi_param("actual_results") %]
 [% END %]
 
-[% IF cgi.param("expected_results") %]
+[% IF cgi_param("expected_results") %]
 Expected Results:  
-[%+ cgi.param("expected_results") %]
+[%+ cgi_param("expected_results") %]
 [% END %]
 
-[%+ cgi.param("additional_info") %]
+[%+ cgi_param("additional_info") %]
diff --git a/template/en/default/bug/create/comment.txt.tmpl b/template/en/default/bug/create/comment.txt.tmpl
index 4cd78ddd1..8eb6bfaf0 100644
--- a/template/en/default/bug/create/comment.txt.tmpl
+++ b/template/en/default/bug/create/comment.txt.tmpl
@@ -5,8 +5,7 @@
   # This Source Code Form is "Incompatible With Secondary Licenses", as
   # defined by the Mozilla Public License, v. 2.0.
   #%]
-[% USE Bugzilla %]
-[% Hook.process("form") %]
 
+[% Hook.process("form") %]
 
-[% Bugzilla.cgi.param("comment") %]
+[% cgi_param("comment") %]
diff --git a/template/en/default/bug/create/create-guided.html.tmpl b/template/en/default/bug/create/create-guided.html.tmpl
index 1adae4588..0169d9e6b 100644
--- a/template/en/default/bug/create/create-guided.html.tmpl
+++ b/template/en/default/bug/create/create-guided.html.tmpl
@@ -10,9 +10,6 @@
   # This template has the same interface as create.html.tmpl
   #%]
 
-[% USE Bugzilla %]
-[% cgi = Bugzilla.cgi %]
-
 [% PROCESS global/header.html.tmpl
    title = "Enter $terms.ABug"
    onload = "PutDescription()"
@@ -165,8 +162,8 @@ function PutDescription() {
   </tr>
 
   [%# Accept URL parameter build ID for non-browser products %]
-  [% IF cgi.param("buildid") %]
-    [% buildid = cgi.param("buildid") %]
+  [% IF cgi_param("buildid") %]
+    [% buildid = cgi_param("buildid") %]
   [% END %]
 
   <tr class="guided_form_field">
diff --git a/template/en/default/bug/process/header.html.tmpl b/template/en/default/bug/process/header.html.tmpl
index 55de0c324..b95e1dcd3 100644
--- a/template/en/default/bug/process/header.html.tmpl
+++ b/template/en/default/bug/process/header.html.tmpl
@@ -10,13 +10,11 @@
   # As global/header.html.tmpl.
   #%]
 
-[% USE Bugzilla %]
-
 [% PROCESS "bug/show-header.html.tmpl" %]
 
-[% IF    title_tag == "bug_processed" %]
+[% IF title_tag == "bug_processed" %]
   [% title = BLOCK %]
-    [% IF Bugzilla.cgi.param('id') %]
+    [% IF cgi_param('id') %]
       [%+ id FILTER html %]
     [% ELSE %]
       [% terms.Bugs %]
diff --git a/template/en/default/bug/process/midair.html.tmpl b/template/en/default/bug/process/midair.html.tmpl
index f89590df2..ca7e095c1 100644
--- a/template/en/default/bug/process/midair.html.tmpl
+++ b/template/en/default/bug/process/midair.html.tmpl
@@ -15,10 +15,6 @@
   # bug: Bugzilla::Bug; the bug being changed.
   #%]
 
-[%# The global Bugzilla->cgi object is used to obtain form variable values. %]
-[% USE Bugzilla %]
-[% cgi = Bugzilla.cgi %]
-
 [% UNLESS header_done %]
   [% PROCESS bug/process/header.html.tmpl %]
 [% END %]
@@ -45,11 +41,11 @@
 </p>
 [% END %]
 
-[% IF cgi.param("comment") %]
+[% IF cgi_param("comment") %]
 <p>
   Your comment was:<br>
   <blockquote><pre class="bz_comment_text">
-    [% cgi.param("comment") FILTER html %]
+    [% cgi_param("comment") FILTER html %]
   </pre></blockquote>
 </p>
 [% END %]
@@ -70,16 +66,16 @@ You have the following choices:
         [% ", except for the added comment(s)" IF comments.size %].
     </form>
   </li>
-  [% IF cgi.param("comment") %]
+  [% IF cgi_param("comment") %]
     <li>
       <form method="post" action="process_bug.cgi">
-        <input type="hidden" name="id" value="[% cgi.param("id") FILTER html %]">
+        <input type="hidden" name="id" value="[% cgi_param("id") FILTER html %]">
         <input type="hidden" name="delta_ts" value="[% bug.delta_ts FILTER html %]">
-        <input type="hidden" name="comment" value="[% cgi.param("comment") FILTER html %]">
-        <input type="hidden" name="use_markdown" value="[% cgi.param("use_markdown") FILTER html %]">
+        <input type="hidden" name="comment" value="[% cgi_param("comment") FILTER html %]">
+        <input type="hidden" name="use_markdown" value="[% cgi_param("use_markdown") FILTER html %]">
         <input type="hidden" name="comment_is_private"
-               value="[% cgi.param("comment_is_private") FILTER html %]">
-        <input type="hidden" name="token" value="[% cgi.param("token") FILTER html %]">
+               value="[% cgi_param("comment_is_private") FILTER html %]">
+        <input type="hidden" name="token" value="[% cgi_param("token") FILTER html %]">
         <input type="submit" id="process_comment" value="Submit only my new comment">
       </form>
     </li>
diff --git a/template/en/default/bug/process/verify-new-product.html.tmpl b/template/en/default/bug/process/verify-new-product.html.tmpl
index c562bf54d..837a9836f 100644
--- a/template/en/default/bug/process/verify-new-product.html.tmpl
+++ b/template/en/default/bug/process/verify-new-product.html.tmpl
@@ -17,6 +17,9 @@
   # verify_bug_groups: If groups need to be confirmed in addition to fields.
   #%]
 
+[% USE Bugzilla %]
+[% cgi = Bugzilla.cgi %]
+
 [% PROCESS global/header.html.tmpl
   title = 'Verify New Product Details...'
   style_urls = ['skins/standard/buglist.css']
@@ -165,14 +168,14 @@
             <input type="checkbox" name="defined_groups"
                    id="defined_group_[% group.group.id FILTER html %]"
                    value="[% group.group.name FILTER html %]"
-                   [% IF cgi.param("defined_groups").contains(group.group.name) %] checked="checked"[% END %]
+                   [% IF cgi.multi_param("defined_groups").contains(group.group.name) %] checked="checked"[% END %]
                    onchange="turn_off(this, 'group_[% group.group.id FILTER html %]')">
           </td>
           <td class="center">
             <input type="checkbox" name="groups"
                    id="group_[% group.group.id FILTER html %]"
                    value="[% group.group.name FILTER html %]"
-                   [% IF cgi.param("groups").contains(group.group.name) %] checked="checked"[% END %]
+                   [% IF cgi.multi_param("groups").contains(group.group.name) %] checked="checked"[% END %]
                    onchange="turn_off(this, 'defined_group_[% group.group.id FILTER html %]')">
           </td>
           <td>
@@ -189,7 +192,7 @@
                name="groups"
                [% ' checked="checked"' IF ((group.membercontrol == constants.CONTROLMAPDEFAULT && user.in_group(group.group.name))
                    || (group.othercontrol == constants.CONTROLMAPDEFAULT && !user.in_group(group.group.name))
-                   || cgi.param("groups").contains(group.group.name)) %]
+                   || cgi.multi_param("groups").contains(group.group.name)) %]
                value="[% group.group.name FILTER html %]">
         <label for="group_[% group.group.id FILTER html %]">
           [% group.group.name FILTER html %]: [% group.group.description FILTER html %]
@@ -224,8 +227,8 @@
 [%# If 'id' is defined, then we are editing a single bug.
   # Else we are editing several bugs at once. %]
 
-[% IF cgi.param('id') AND cgi.param('id').match('^\d+$') %]
-  [% id = cgi.param('id') %]
+[% IF cgi_param('id') AND cgi_param('id').match('^\d+$') %]
+  [% id = cgi_param('id') %]
   Cancel and Return to [% "$terms.bug $id" FILTER bug_link(id) FILTER none %]
 [% ELSE %]
   Cancel and Return to <a href="buglist.cgi?regetlastlist=1">the last search results</a>
diff --git a/template/en/default/bug/show.xml.tmpl b/template/en/default/bug/show.xml.tmpl
index 10ec0a3c1..2b2d32d5a 100644
--- a/template/en/default/bug/show.xml.tmpl
+++ b/template/en/default/bug/show.xml.tmpl
@@ -6,10 +6,9 @@
   # defined by the Mozilla Public License, v. 2.0.
   #%]
 [% PROCESS bug/time.html.tmpl %]
-[% USE Bugzilla %]
-[% cgi = Bugzilla.cgi %]
+
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<!DOCTYPE bugzilla [% IF cgi.param('dtd') %][[% PROCESS pages/bugzilla.dtd.tmpl %]][% ELSE %]SYSTEM "[% urlbase FILTER xml %]page.cgi?id=bugzilla.dtd"[% END %]>
+<!DOCTYPE bugzilla [% IF cgi_param('dtd') %][[% PROCESS pages/bugzilla.dtd.tmpl %]][% ELSE %]SYSTEM "[% urlbase FILTER xml %]page.cgi?id=bugzilla.dtd"[% END %]>
 
 <bugzilla version="[% constants.BUGZILLA_VERSION %]"
           urlbase="[% urlbase FILTER xml %]"