Fix for bug 172518: makes the request tracker use the generic user matching code

r=not_erik,joel
a=justdave

2 files changed, 36 insertions, 59 deletions

diff --git a/Bugzilla/Flag.pm b/Bugzilla/Flag.pm
index 997b46bf7..7395be09d 100644
--- a/Bugzilla/Flag.pm
+++ b/Bugzilla/Flag.pm
@@ -368,10 +368,6 @@ sub clear {
 sub FormToNewFlags {
     my ($target, $data) = @_;
     
-    # Flag for whether or not we must get verification of the requestees
-    # (if the user did not uniquely identify them).
-    my $verify_requestees = 0;
-
     # Get information about the setter to add to each flag.
     # Uses a conditional to suppress Perl's "used only once" warnings.
     my $setter = new Bugzilla::User($::userid);
@@ -396,67 +392,20 @@ sub FormToNewFlags {
 
         my $requestee_str = $data->{"requestee-$type_id"} || $data->{'requestee'};
         if ($requestee_str) {
-            $flag->{'requestee_str'} = $requestee_str;
-            MatchRequestees($flag);
-            $verify_requestees = 1 if scalar(@{$flag->{'requestees'}}) != 1;
+            my $requestee_id = &::DBname_to_id($requestee_str);
+            $requestee_id 
+              || &::ThrowUserError("invalid_username", {name => $requestee_str});
+            $flag->{'requestee'} = new Bugzilla::User($requestee_id);
         }
         
         # Add the flag to the array of flags.
         push(@flags, $flag);
     }
 
-    if ($verify_requestees) {
-        $::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());
-        exit;
-    }
-    
     # Return the list of flags.
     return \@flags;
 }
 
-sub MatchRequestees {
-    my ($flag) = @_;
-    
-    my $requestee_str = $flag->{'requestee_str'};
-    
-    # To reduce the size of queries, require the user to enter at least 
-    # three characters of each requestee's name unless this installation
-    # 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) {
-        &::ThrowUserError("requestee_too_short");
-    }
-
-    # Get a list of potential requestees whose email address or real name 
-    # matches the substring entered by the user.  Try an exact match first,
-    # then fall back to a substring search.  Limit search to 100 matches, 
-    # since at that point there are too many to make the user wade through, 
-    # and we need to get the user to enter a more constrictive match string.
-    my $user_id = &::DBname_to_id($requestee_str);
-    if ($user_id) { $flag->{'requestees'} = [ new Bugzilla::User($user_id) ] }
-    else          { $flag->{'requestees'} = Bugzilla::User::match($requestee_str, 101, 1) }
-    
-    # If there is only one requestee match, make them the requestee.
-    if (scalar(@{$flag->{'requestees'}}) == 1) {
-        $flag->{'requestee'} = $flag->{'requestees'}[0];
-    } 
-
-    # If there are too many requestee matches, throw an error.
-    elsif (scalar(@{$flag->{'requestees'}}) == 101) {
-        &::ThrowUserError("requestee_too_many_matches", 
-                          { requestee => $requestee_str });
-    }
-}
-
-
 # Ideally, we'd use Bug.pm, but it's way too heavyweight, and it can't be
 # made lighter without totally rewriting it, so we'll use this function
 # until that one gets rewritten.
diff --git a/Bugzilla/User.pm b/Bugzilla/User.pm
index 1506e5dde..3bc02c723 100644
--- a/Bugzilla/User.pm
+++ b/Bugzilla/User.pm
@@ -217,6 +217,35 @@ sub match_field {
     # What does a "--do_not_change--" field look like (if any)?
     my $dontchange = $vars->{'form'}->{'dontchange'};
 
+    # Fields can be regular expressions matching multiple form fields
+    # (f.e. "requestee-(\d+)"), so expand each non-literal field
+    # into the list of form fields it matches.
+    my $expanded_fields = {};
+    foreach my $field_pattern (keys %{$fields}) {
+        # Check if the field has any non-word characters.  Only those fields
+        # can be regular expressions, so don't expand the field if it doesn't
+        # have any of those characters.
+        if ($field_pattern =~ /^\w+$/) {
+            $expanded_fields->{$field_pattern} = $fields->{$field_pattern};
+        }
+        else {
+            my @field_names = grep(/$field_pattern/, keys %{$vars->{'form'}});
+            foreach my $field_name (@field_names) {
+                $expanded_fields->{$field_name} = 
+                  { type => $fields->{$field_pattern}->{'type'} };
+                
+                # The field is a requestee field; in order for its name to show
+                # up correctly on the confirmation page, we need to find out
+                # the name of its flag type.
+                if ($field_name =~ /^requestee-(\d+)$/) {
+                    $expanded_fields->{$field_name}->{'flag_type'} = 
+                      Bugzilla::FlagType::get($1);
+                }
+            }
+        }
+    }
+    $fields = $expanded_fields;
+
     # Skip all of this if the option has been turned off
     return 1 if (&::Param('usermatchmode') eq 'off');
 
@@ -285,10 +314,8 @@ sub match_field {
                 next;
             }
 
-            $matches->{$field}->{$query}->{'users'}      = $users;
-            $matches->{$field}->{$query}->{'status'}     = 'success';
-            $matches->{$field}->{$query}->{'selecttype'} =
-                    $fields->{$field}->{'type'};
+            $matches->{$field}->{$query}->{'users'}  = $users;
+            $matches->{$field}->{$query}->{'status'} = 'success';
 
             # here is where it checks for multiple matches
 
@@ -323,6 +350,7 @@ sub match_field {
     return 1 unless $need_confirm; # skip confirmation if not needed.
 
     $vars->{'script'}        = $ENV{'SCRIPT_NAME'}; # for self-referencing URLs
+    $vars->{'fields'}        = $fields; # fields being matched
     $vars->{'matches'}       = $matches; # matches that were made
     $vars->{'matchsuccess'}  = $matchsuccess; # continue or fail