Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 348542: Move keyword validation out of post_bug.cgi and into Bugzilla::Bug

Browse Source 
Patch By Max Kanat-Alexander <mkanat@bugzilla.org> r=bkor, a=myk


git-svn-id: svn://10.0.0.236/trunk@208026 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mkanat%bugzilla.org
2006-08-21 18:53:16 +00:00
parent 4008764954
commit 7d936de267
2 changed files with 20 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mozilla/webtools/bugzilla/Bugzilla/Bug.pm
View File

@@ -35,6 +35,7 @@ use Bugzilla::Constants;
use Bugzilla::Field;
use Bugzilla::Flag;
use Bugzilla::FlagType;
use Bugzilla::Keyword;
use Bugzilla::User;
use Bugzilla::Util;
use Bugzilla::Error;
@@ -333,6 +334,21 @@ sub _check_component {
return $obj;
}
sub _check_keywords {
my ($keyword_string) = @_;
$keyword_string = trim($keyword_string);
return [] if (!$keyword_string || !Bugzilla->user->in_group('editbugs'));
my %keyword_ids;
foreach my $keyword (split(/[\s,]+/, $keyword_string)) {
next unless $keyword;
my $obj = new Bugzilla::Keyword({ name => $keyword });
ThrowUserError("unknown_keyword", { keyword => $keyword }) if !$obj;
$keyword_ids{$obj->id} = 1;
}
return [keys %keyword_ids];
}
sub _check_product {
my ($name) = @_;
# Check that the product exists and that the user

29
mozilla/webtools/bugzilla/post_bug.cgi
View File

@@ -221,28 +221,7 @@ $cgi->param(-name => 'component_id', -value => $component->id);
push(@used_fields, "component_id");
my @cc_ids = @{Bugzilla::Bug::_check_cc([$cgi->param('cc')])};
# Check for valid keywords and create list of keywords to be added to db
# (validity routine copied from process_bug.cgi)
my @keywordlist;
my %keywordseen;
if ($cgi->param('keywords') && UserInGroup("editbugs")) {
foreach my $keyword (split(/[\s,]+/, $cgi->param('keywords'))) {
if ($keyword eq '') {
next;
}
my $keyword_obj = new Bugzilla::Keyword({name => $keyword});
if (!$keyword_obj) {
ThrowUserError("unknown_keyword",
{ keyword => $keyword });
}
if (!$keywordseen{$keyword_obj->id}) {
push(@keywordlist, $keyword_obj->id);
$keywordseen{$keyword_obj->id} = 1;
}
}
}
my @keyword_ids = @{Bugzilla::Bug::_check_keywords($cgi->param('keywords'))};
if (Bugzilla->params->{"strict_isolation"}) {
my @blocked_users = ();
@@ -439,12 +418,12 @@ my @all_deps;
my $sth_addkeyword = $dbh->prepare(q{
INSERT INTO keywords (bug_id, keywordid) VALUES (?, ?)});
if (UserInGroup("editbugs")) {
foreach my $keyword (@keywordlist) {
foreach my $keyword (@keyword_ids) {
$sth_addkeyword->execute($id, $keyword);
}
if (@keywordlist) {
if (@keyword_ids) {
# Make sure that we have the correct case for the kw
my $kw_ids = join(', ', @keywordlist);
my $kw_ids = join(', ', @keyword_ids);
my $list = $dbh->selectcol_arrayref(qq{
SELECT name
FROM keyworddefs