summaryrefslogtreecommitdiffstats
path: root/Bugzilla
diff options
context:
space:
mode:
authorlpsolit%gmail.com <>2006-02-28 21:52:31 +0100
committerlpsolit%gmail.com <>2006-02-28 21:52:31 +0100
commitda1db1402be5d249990d1beb5f41390b92f7e0be (patch)
tree2ad0914796b973db2dbd0f6a9145e961d3f0568e /Bugzilla
parent5a7a41a7dbae47049cba9f56aa62803668a75d2f (diff)
downloadbugzilla-da1db1402be5d249990d1beb5f41390b92f7e0be.tar.gz
bugzilla-da1db1402be5d249990d1beb5f41390b92f7e0be.tar.xz
Bug 315605: Bugzilla::Field::check_form_field() should not take a CGI object as parameter - Patch by Frédéric Buclin <LpSolit@gmail.com> r=wicked a=justdave
Diffstat (limited to 'Bugzilla')
-rw-r--r--Bugzilla/Field.pm81
1 files changed, 29 insertions, 52 deletions
diff --git a/Bugzilla/Field.pm b/Bugzilla/Field.pm
index 8585ff760..b6424f3df 100644
--- a/Bugzilla/Field.pm
+++ b/Bugzilla/Field.pm
@@ -13,7 +13,7 @@
# The Original Code is the Bugzilla Bug Tracking System.
#
# Contributor(s): Dan Mosedale <dmose@mozilla.org>
-# Frédéric Buclin <LpSolit@gmail.com>
+# Frédéric Buclin <LpSolit@gmail.com>
# Myk Melez <myk@mozilla.org>
=head1 NAME
@@ -28,7 +28,7 @@ Bugzilla::Field - a particular piece of information about bugs
# Display information about all fields.
print Dumper(Bugzilla->get_fields());
-
+
# Display information about non-obsolete custom fields.
print Dumper(Bugzilla->get_fields({ obsolete => 1, custom => 1 }));
@@ -41,11 +41,11 @@ Bugzilla::Field - a particular piece of information about bugs
# Bugzilla->get_fields() is a wrapper around Bugzilla::Field::match(),
# so both methods take the same arguments.
print Dumper(Bugzilla::Field::match({ obsolete => 1, custom => 1 }));
-
+
# Create a custom field.
my $field = Bugzilla::Field::create("hilarity", "Hilarity");
print "$field->{description} is a custom field\n";
-
+
# Instantiate a Field object for an existing field.
my $field = new Bugzilla::Field('qacontact_accessible');
if ($field->{obsolete}) {
@@ -53,8 +53,7 @@ Bugzilla::Field - a particular piece of information about bugs
}
# Validation Routines
- check_form_field($cgi, $fieldname, \@legal_values);
- check_form_field_defined($cgi, $fieldname);
+ check_field($name, $value, \@legal_values, $no_warn);
$fieldid = get_field_id($fieldname);
=head1 DESCRIPTION
@@ -71,8 +70,7 @@ package Bugzilla::Field;
use strict;
use base qw(Exporter);
-@Bugzilla::Field::EXPORT = qw(check_form_field check_form_field_defined
- get_field_id);
+@Bugzilla::Field::EXPORT = qw(check_field get_field_id);
use Bugzilla::Util;
use Bugzilla::Constants;
@@ -286,66 +284,45 @@ sub match {
=over
-=item C<check_form_field($cgi, $fieldname, \@legal_values)>
+=item C<check_field($name, $value, \@legal_values, $no_warn)>
-Description: Makes sure the field $fieldname is defined and its value
+Description: Makes sure the field $name is defined and its $value
is non empty. If @legal_values is defined, this routine
also checks whether its value is one of the legal values
- associated with this field. If the test fails, an error
- is thrown.
+ associated with this field. If the test is successful,
+ the function returns 1. If the test fails, an error
+ is thrown (by default), unless $no_warn is true, in which
+ case the function returns 0.
-Params: $cgi - a CGI object
- $fieldname - the field name to check
+Params: $name - the field name
+ $value - the field value
@legal_values - (optional) ref to a list of legal values
+ $no_warn - (optional) do not throw an error if true
-Returns: nothing
+Returns: 1 on success; 0 on failure if $no_warn is true (else an
+ error is thrown).
=back
=cut
-sub check_form_field {
- my ($cgi, $fieldname, $legalsRef) = @_;
+sub check_field {
+ my ($name, $value, $legalsRef, $no_warn) = @_;
my $dbh = Bugzilla->dbh;
- if (!defined $cgi->param($fieldname)
- || trim($cgi->param($fieldname)) eq ""
- || (defined($legalsRef)
- && lsearch($legalsRef, $cgi->param($fieldname)) < 0))
+ if (!defined($value)
+ || trim($value) eq ""
+ || (defined($legalsRef) && lsearch($legalsRef, $value) < 0))
{
- trick_taint($fieldname);
- my ($result) = $dbh->selectrow_array("SELECT description FROM fielddefs
- WHERE name = ?", undef, $fieldname);
-
- my $field = $result || $fieldname;
- ThrowCodeError("illegal_field", { field => $field });
- }
-}
-
-=pod
-
-=over
-
-=item C<check_form_field_defined($cgi, $fieldname)>
-
-Description: Makes sure the field $fieldname is defined and its value
- is non empty. Else an error is thrown.
-
-Params: $cgi - a CGI object
- $fieldname - the field name to check
-
-Returns: nothing
-
-=back
-
-=cut
-
-sub check_form_field_defined {
- my ($cgi, $fieldname) = @_;
+ return 0 if $no_warn; # We don't want an error to be thrown; return.
+ trick_taint($name);
+ my ($result) = $dbh->selectrow_array('SELECT description FROM fielddefs
+ WHERE name = ?', undef, $name);
- if (!defined $cgi->param($fieldname)) {
- ThrowCodeError("undefined_field", { field => $fieldname });
+ my $field = $result || $name;
+ ThrowCodeError('illegal_field', { field => $field });
}
+ return 1;
}
=pod