From a2631d18069f099eb5133c4484c9b80ff2a3f547 Mon Sep 17 00:00:00 2001
From: "lpsolit%gmail.com" <>
Date: Wed, 27 Aug 2008 05:51:31 +0000
Subject: Bug 385897: editwhines.cgi doesn't allow to whine at groups with a
 name containing blanks - Patch by Frédéric Buclin <LpSolit@gmail.com>
 r=wurblzap a=LpSolit
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 editwhines.cgi | 25 +++++--------------------
 1 file changed, 5 insertions(+), 20 deletions(-)

(limited to 'editwhines.cgi')

diff --git a/editwhines.cgi b/editwhines.cgi
index 7da598dd8..922fe721d 100755
--- a/editwhines.cgi
+++ b/editwhines.cgi
@@ -238,28 +238,13 @@ if ($cgi->param('update')) {
                     # get an id for the mailto address
                     if ($can_mail_others && $mailto) {
                         if ($mailto_type == MAILTO_USER) {
-                            # detaint
-                            my $emailregexp = Bugzilla->params->{'emailregexp'};
-                            if ($mailto =~ /($emailregexp)/) {
-                                $mailto_id = login_to_id($1);
-                            }
-                            else {
-                                ThrowUserError("illegal_email_address", 
-                                               { addr => $mailto });
-                            }
+                            $mailto_id = login_to_id($mailto);
                         }
                         elsif ($mailto_type == MAILTO_GROUP) {
-                            # detaint the group parameter
-                            if ($mailto =~ /^([0-9a-z_\-\.]+)$/i) {
-                                $mailto_id = Bugzilla::Group::ValidateGroupName(
-                                                 $1, ($user)) || 
-                                             ThrowUserError(
-                                                 'invalid_group_name', 
-                                                 { name => $1 });
-                            } else {
-                                ThrowUserError('invalid_group_name',
-                                               { name => $mailto });
-                            }
+                            # The group name is used in a placeholder.
+                            trick_taint($mailto);
+                            $mailto_id = Bugzilla::Group::ValidateGroupName($mailto, ($user))
+                                           || ThrowUserError('invalid_group_name', { name => $mailto });
                         }
                         else {
                             # bad value, so it will just mail to the whine
-- 
cgit v1.2.3-24-g4f1b