X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Fservice;h=9debab2694eb76c77a76f403bd70581e64292dc3;hb=9ba439f0dec2d3980de21b01d5f335a9d213158f;hp=d736121522c00fd0fb3552f9724b449189532f77;hpb=56704088ddc55422fb4036eff80c1f057dbaed64;p=debbugs.git

diff --git a/scripts/service b/scripts/service
index d736121..9debab2 100755
--- a/scripts/service
+++ b/scripts/service
@@ -7,6 +7,9 @@
 use warnings;
 use strict;
 
+use locale;
+use POSIX qw(strftime locale_h);
+setlocale(LC_TIME, "C");
 
 use Debbugs::Config qw(:globals :config);
 
@@ -170,11 +173,6 @@ my %clonebugs = ();
 my %bcc = ();
 
 
-my @bcc;
-sub addbcc {
-    push @bcc, $_[0] unless grep { $_ eq $_[0] } @bcc;
-}
-
 our $data;
 our $message;
 our $extramessage;
@@ -478,11 +476,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,19 +504,6 @@ my @maintccs = determine_recipients(recipients => \%recipients,
 				    address_only => 1,
 				    cc => 1,
 				   );
-my $maintccs = 'Cc: '.join(",\n    ",
-		    determine_recipients(recipients => \%recipients,
-					 cc => 1,
-					)
-		   )."\n";
-
-my $packagepr = '';
-$packagepr = "X-${gProject}-PR-Package: " . join(keys %affected_packages) . "\n" if keys %affected_packages;
-
-# Add Bcc's to subscribed bugs
-# now handled by Debbugs::Recipients
-#push @bcc, map {"bugs=$_\@$gListDomain"} keys %bug_affected;
-
 if (!defined $header{'subject'} || $header{'subject'} eq "") {
   $header{'subject'} = "your mail";
 }
@@ -527,7 +514,7 @@ my $error_text = $errors > 0 ? " (with $errors errors)":'';
 my @common_headers;
 push @common_headers, 'X-Loop',$gMaintainerEmail;
 
-my $temp_transcript = ${transcript_scalar};
+my $temp_transcript = $transcript_scalar;
 eval{
     $temp_transcript = decode("utf8",$temp_transcript,Encode::FB_CROAK);
 };
@@ -560,19 +547,6 @@ my $repliedshow= join(', ',$replyto,
 					  )
 		     );
 
-# -1 is the service.in log
-&filelock("lock/-1");
-open(AP,">>db-h/-1.log") || die "open db-h/-1.log: $!";
-print(AP
-      "\2\n$repliedshow\n\5\n$reply\n\3\n".
-      "\6\n".
-      "<strong>Request received</strong> from <code>".
-      html_escape($header{'from'})."</code>\n".
-      "to <code>".html_escape($controlrequestaddr)."</code>\n".
-      "\3\n".
-      "\7\n",escape_log(@log),"\n\3\n") || die "writing db-h/-1.log: $!";
-close(AP) || die "open db-h/-1.log: $!";
-&unfilelock;
 utime(time,time,"db-h");
 
 &sendmailmessage($reply,