Apply fix for ! in owner et al; fixes #681853 Thanks to jwilk for reporting

[debbugs.git] / scripts / service

diff --git a/scripts/service b/scripts/service
index 20a0219d2a9c76f35b6199ceaecf05ceaac97be6..4346e36e96206586f82e3e3d9518975610f45a90 100755 (executable)
--- a/scripts/service
+++ b/scripts/service
@@ -473,6 +473,7 @@ END
                         transcript => $transcript,
                         debug => $debug,
                         ok => \$ok,
+                        replyto => $replyto,
                        );
        if ($terminate_control) {
            last;
@@ -499,19 +500,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";
 }
@@ -522,7 +510,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);
 };
@@ -555,19 +543,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,