From 5ec7562b3ce2e33a06b57a60abe54fc04d2b2c6d Mon Sep 17 00:00:00 2001
From: Don Armstrong <don@volo>
Date: Sat, 21 Oct 2006 01:09:25 -0700
Subject: [PATCH] add support for setting the user corresponding to a user tag

---
 html/Reporting.html.in |  7 +++++--
 scripts/process.in     | 10 ++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/html/Reporting.html.in b/html/Reporting.html.in
index 1b42aae..29fa156 100644
--- a/html/Reporting.html.in
+++ b/html/Reporting.html.in
@@ -218,11 +218,14 @@ as described in the
 Separate multiple tags with commas, spaces, or both.
 
 <pre>
+User: &lt;<var>username</var>&gt;
 Usertags: &lt;<var>usertags</var>&gt;
 </pre>
 
-<p>Replace &lt;<var>tags</var>&gt; with one or more usertags. Separate
-multiple tags with commas, spaces, or both.</p>
+<p>Replace &lt;<var>usertags</var>&gt; with one or more usertags.
+Separate multiple tags with commas, spaces, or both. If you specify a
+username, that users tags will be set. Otherwise, the email address of
+the sender will be used as the username</p>
 
 
 <h2>Not forwarding to the mailing list - minor $gBug reports</h2>
diff --git a/scripts/process.in b/scripts/process.in
index eeb195d..6569260 100755
--- a/scripts/process.in
+++ b/scripts/process.in
@@ -651,12 +651,12 @@ END
     # Deal with usertags
     if (exists $pheader{usertags}) {
 	 my $user = $replyto;
+	 $user = $pheader{user} if exists $pheader{user};
 	 $user =~ s/,.*//;
 	 $user =~ s/^.*<(.*)>.*$/$1/;
 	 $user =~ s/[(].*[)]//;
 	 $user =~ s/^\s*(\S+)\s+.*$/$1/;
-	 $user = "" unless (Debbugs::User::is_valid_user($user));
-	 if ($user ne '') {
+	 if ($user ne '' and Debbugs::User::is_valid_user($user)) {
 	      $pheader{usertags} =~ s/(?:^\s+|\s+$)//g;
 	      my %user_tags;
 	      read_usertags(\%user_tags,$user);
@@ -670,6 +670,12 @@ END
 	      }
 	      write_usertags(\%usertags,$user);
 	 }
+	 else {
+	      $brokenness .=<<END;
+Your message tried to set a usertag, but didn't have a valid
+user set ('$user' isn't valid)
+END
+	 }
     }
     &overwrite("db-h/$hash/$ref.report",
                join("\n",@msg)."\n");
-- 
2.39.2