From 733a4f3ba362e512979ee47355850c6eb2041ac1 Mon Sep 17 00:00:00 2001
From: "myk%mozilla.org" <>
Date: Sun, 29 Sep 2002 23:04:24 +0000
Subject: [PATCH] Fix for bug 171420: fixes usage of $template, $vars, and
&Param in Flag.pm. r=bbaetz
---
Bugzilla/Flag.pm | 35 +++++++++++++++++------------------
1 file changed, 17 insertions(+), 18 deletions(-)
diff --git a/Bugzilla/Flag.pm b/Bugzilla/Flag.pm
index 3feaae4cd..997b46bf7 100644
--- a/Bugzilla/Flag.pm
+++ b/Bugzilla/Flag.pm
@@ -31,8 +31,12 @@ package Bugzilla::Flag;
use Bugzilla::FlagType;
use Bugzilla::User;
+use Bugzilla::Config;
+
use Attachment;
+# Note that this line doesn't actually import these variables for some reason,
+# so I have to use them as $::template and $::vars in the package code.
use vars qw($template $vars);
# Note! This module requires that its caller have said "require CGI.pl"
@@ -402,14 +406,14 @@ sub FormToNewFlags {
}
if ($verify_requestees) {
- $vars->{'target'} = $target;
- $vars->{'flags'} = \@flags;
- $vars->{'form'} = $data;
- $vars->{'mform'} = \%::MFORM || \%::MFORM;
+ $::vars->{'target'} = $target;
+ $::vars->{'flags'} = \@flags;
+ $::vars->{'form'} = $data;
+ $::vars->{'mform'} = \%::MFORM || \%::MFORM;
- print "Content-Type: text/html\n\n" unless $vars->{'header_done'};
- $::template->process("request/verify.html.tmpl", $vars)
- || &::ThrowTemplateError($template->error());
+ print "Content-Type: text/html\n\n" unless $::vars->{'header_done'};
+ $::template->process("request/verify.html.tmpl", $::vars)
+ || &::ThrowTemplateError($::template->error());
exit;
}
@@ -427,7 +431,7 @@ sub MatchRequestees {
# automatically appends an email suffix to each user's login name,
# in which case we can't guarantee their names are at least three
# characters long.
- if (!&Param('emailsuffix') && length($requestee_str) < 3) {
+ if (!Param('emailsuffix') && length($requestee_str) < 3) {
&::ThrowUserError("requestee_too_short");
}
@@ -510,22 +514,17 @@ sub notify {
my ($flag, $template_file) = @_;
- # Work around the intricacies of globals.pl not being templatized
- # by defining local variables for the $::template and $::vars globals.
- my $template = $::template;
- my $vars = $::vars;
-
- $vars->{'flag'} = $flag;
+ $::vars->{'flag'} = $flag;
my $message;
my $rv =
- $template->process($template_file, $vars, \$message);
+ $::template->process($template_file, $::vars, \$message);
if (!$rv) {
- print "Content-Type: text/html\n\n" unless $vars->{'header_done'};
- &::ThrowTemplateError($template->error());
+ print "Content-Type: text/html\n\n" unless $::vars->{'header_done'};
+ &::ThrowTemplateError($::template->error());
}
- my $delivery_mode = &::Param("sendmailnow") ? "" : "-ODeliveryMode=deferred";
+ my $delivery_mode = Param("sendmailnow") ? "" : "-ODeliveryMode=deferred";
open(SENDMAIL, "|/usr/lib/sendmail $delivery_mode -t -i")
|| die "Can't open sendmail";
print SENDMAIL $message;
--
2.24.1