X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Fservice;h=df3bc2c04b070a26063728c00f3e7344f0bf75bb;hb=HEAD;hp=4d20051f332b55437eb6060b7f71b8dcf3166751;hpb=76710dc24f220a16011b2d5c6e5afb5b140fd85c;p=debbugs.git

diff --git a/scripts/service b/scripts/service
index 4d20051..df3bc2c 100755
--- a/scripts/service
+++ b/scripts/service
@@ -7,6 +7,8 @@
 use warnings;
 use strict;
 
+use POSIX qw(strftime locale_h);
+setlocale(LC_TIME, "C");
 
 use Debbugs::Config qw(:globals :config);
 
@@ -30,14 +32,14 @@ use Debbugs::Versions::Dpkg;
 use Debbugs::Status qw(splitpackages);
 
 use Debbugs::CGI qw(html_escape);
-use Debbugs::Control qw(:all);
+use Debbugs::Control qw(:all valid_usertag);
 use Debbugs::Control::Service qw(:all);
 use Debbugs::Log qw(:misc);
 use Debbugs::Text qw(:templates);
 
 use Scalar::Util qw(looks_like_number);
 
-use List::Util qw(first);
+use List::AllUtils qw(first uniqnum);
 
 use Mail::RFC822::Address;
 use Encode qw(decode encode);
@@ -282,7 +284,7 @@ for ($procline=0; $procline<=$#bodylines; $procline++) {
     } elsif (m/^subscribe/i) {
         print {$transcript} <<END;
 There is no $gProject $gBug mailing list.  If you wish to review bug reports
-please do so via http://$gWebDomain/ or ask this mail server
+please do so via $gWebDomain or ask this mail server
 to send them to you.
 soon: MAILINGLISTS_TEXT
 END
@@ -423,7 +425,7 @@ END
 	    my %chtags;
 	    if (defined $tags and length $tags) {
 		 for my $t (split /[,\s]+/, $tags) {
-		      if ($t =~ m/^[a-zA-Z0-9.+\@-]+$/) {
+		      if (valid_usertag($t)) {
 			   $chtags{$t} = 1;
 		      } else {
 			   push @badtags, $t;
@@ -453,7 +455,11 @@ END
 	    } else {
 		print {$transcript} "Usertags were: " . join(" ", @oldtags) . ".\n";
 	    }
-	    print {$transcript} "Usertags are now: " . join(" ", @newtags) . ".\n";
+	    if (@newtags == 0) {
+		print {$transcript} "There are now no usertags set.\n";
+	    } else {
+		print {$transcript} "Usertags are now: " . join(" ", @newtags) . ".\n";
+	    }
 	    Debbugs::User::write_usertags(\%ut, $user);
 	}
     } elsif (!$control) {
@@ -473,11 +479,13 @@ END
 			 transcript => $transcript,
 			 debug => $debug,
 			 ok => \$ok,
+			 replyto => $replyto,
 			);
 	if ($terminate_control) {
 	    last;
 	}
     } else {
+	print {$transcript} "Unknown command or malformed arguments to command.\n";
 	$errors++;
         if (++$unknowns >= 5) {
             print {$transcript} "Too many unknown commands, stopping here.\n\n";
@@ -504,7 +512,7 @@ if (!defined $header{'subject'} || $header{'subject'} eq "") {
 }
 
 # Error text here advertises how many errors there were
-my $error_text = $errors > 0 ? " (with $errors errors)":'';
+my $error_text = $errors > 0 ? " (with $errors error" . ($errors > 1 ? "s" : "") . ")" : "";
 
 my @common_headers;
 push @common_headers, 'X-Loop',$gMaintainerEmail;
@@ -514,7 +522,7 @@ eval{
     $temp_transcript = decode("utf8",$temp_transcript,Encode::FB_CROAK);
 };
 my $reply =
-    create_mime_message([From          => "$gMaintainerEmail ($gProject $gBug Tracking System)",
+    create_mime_message([From          => qq("$gProject $gBug Tracking System" <$gMaintainerEmail>),
 			 To            => $replyto,
 			 @maintccs ? (Cc => join(', ',@maintccs)):(),
 			 Subject       => "Processed${error_text}: $header{subject}",
@@ -569,20 +577,15 @@ sub fill_template{
      my $variables = {config => \%config,
 		      defined($ref)?(ref    => $ref):(),
 		      defined($data)?(data  => $data):(),
-		      refs => [map {exists $clonebugs{$_}?$clonebugs{$_}:$_} keys %bug_affected],
+		      refs => [sort
+			       uniqnum(defined($ref)?($ref):(),
+				       map {exists $clonebugs{$_}?$clonebugs{$_}:$_}
+				       keys %bug_affected)],
 		      %{$extra_var},
 		     };
-     my $hole_var = {'&bugurl' =>
-		     sub{"$_[0]: ".
-			      'http://'.$config{cgi_domain}.'/'.
-				   Debbugs::CGI::bug_links(bug=>$_[0],
-							   links_only => 1,
-							  );
-		    }
-		    };
      return fill_in_template(template => $template,
 			     variables => $variables,
-			     hole_var  => $hole_var,
+			     output_type => 'text',
 			    );
 }
 
@@ -880,7 +883,7 @@ sub sendtxthelpraw {
     close(D);
     print {$transcript} "Sending $description in separate message.\n";
     &sendmailmessage(<<END.$doc,$replyto);
-From: $gMaintainerEmail ($gProject $gBug Tracking System)
+From: "$gProject $gBug Tracking System" <$gMaintainerEmail>
 To: $replyto
 Subject: $gProject $gBug help: $description
 References: $header{'message-id'}
@@ -896,7 +899,7 @@ END
 sub sendlynxdocraw {
     my ($relpath,$description) = @_;
     $doc='';
-    open(L,"lynx -nolist -dump http://$gCGIDomain/\Q$relpath\E 2>&1 |") || die "fork for lynx: $!";
+    open(L,"lynx -nolist -dump $gCGIDomain/\Q$relpath\E 2>&1 |") || die "fork for lynx: $!";
     while(<L>) { $doc.=$_; }
     $!=0; close(L);
     if ($? == 255 && $doc =~ m/^\n*lynx: Can\'t access start file/) {
@@ -908,7 +911,7 @@ sub sendlynxdocraw {
     } else {
         print {$transcript} "Sending $description.\n";
         &sendmailmessage(<<END.$doc,$replyto);
-From: $gMaintainerEmail ($gProject $gBug Tracking System)
+From: "$gProject $gBug Tracking System" <$gMaintainerEmail>
 To: $replyto
 Subject: $gProject $gBugs information: $description
 References: $header{'message-id'}
@@ -945,7 +948,7 @@ sub sendinfo {
     }
     print {$transcript} "Sending $description.\n";
     &sendmailmessage(<<END.$doc,$replyto);
-From: $gMaintainerEmail ($gProject $gBug Tracking System)
+From: "$gProject $gBug Tracking System" <$gMaintainerEmail>
 To: $replyto
 Subject: $gProject $gBugs information: $description
 References: $header{'message-id'}