merge colin changes and suggestions by fjp

[debbugs.git] / scripts / process.in

diff --git a/scripts/process.in b/scripts/process.in
index 86efc053355414060c1e72c8d0c47940ef8797e1..209d9dbcc26fffd08b38afb8326856b1a2695ef5 100755 (executable)
--- a/scripts/process.in
+++ b/scripts/process.in
@@ -14,6 +14,8 @@ use Debbugs::User qw(read_usertags write_usertags);
 
 use Debbugs::CGI qw(html_escape);
 
+use Debbugs::Log qw(:misc);
+
 # TODO DLA; needs config reworking and errorlib reworking
 # use warnings;
 # use strict;
@@ -486,8 +488,9 @@ END
               "Content-Type"            => 'text/plain; charset="utf-8"',
              ],<<END ,[join("\n",@msg)]),'',undef,1);
 This is an automatic notification regarding your $gBug report
-#$ref: $data->{subject},
-which was filed against the $data->{package} package.
+which was filed against the $data->{package} package:
+
+#$ref: $data->{subject}
 
 It has been closed by $markedby.
 
@@ -1069,7 +1072,7 @@ sub appendlog {
         print DEBUG "failed open log err $!<\n";
         &quit("opening db-h/$hash/$ref.log (li): $!");
     }
-    print(AP "\7\n",@{escapelog(@log)},"\n\3\n") || &quit("writing db-h/$hash/$ref.log (li): $!");
+    print(AP "\7\n",escape_log(@log),"\n\3\n") || &quit("writing db-h/$hash/$ref.log (li): $!");
     close(AP) || &quit("closing db-h/$hash/$ref.log (li): $!");
 }
 
@@ -1153,7 +1156,7 @@ sub sendmessage {
     #save email to the log
     open(AP,">>db-h/$hash/$ref.log") || &quit("opening db-h/$hash/$ref.log (lo): $!");
     print(AP "\2\n",join("\4",@$recips),"\n\5\n",
-          @{escapelog(stripbccs($msg))},"\n\3\n") ||
+          escape_log(stripbccs($msg)),"\n\3\n") ||
         &quit("writing db-h/$hash/$ref.log (lo): $!");
     close(AP) || &quit("closing db-h/$hash/$ref.log (lo): $!");