header unfolding

[modbot-mtm.git] / stump / bin / processRejected

diff --git a/stump/bin/processRejected b/stump/bin/processRejected
index 212a8f7caa7499613c8093319694c3b445b8e0e4..694d8e9195b1c5ca4314382e758ad6a70f786cdd 100755 (executable)
--- a/stump/bin/processRejected
+++ b/stump/bin/processRejected
@@ -1,9 +1,11 @@
-#!/bin/sh
+#!/bin/bash
 #
 # This script takes a raw article that is already rejected, creates a 
 # reply message, signs it with PGP and sends back to the author.
 #
 
+set -e
+
 # echo $0 invoked with arguments $@ 1>&2
 
 MESSAGE=$TMP/rejected.$$
@@ -23,11 +25,14 @@ reply() {
 
   if [ "x$REASON" = xdiscard ]; then return; fi
   (
+    eventheader="reject $REASON"
+    if [ "x$WEBSTUMP_MESSAGENUM" != x ]; then
+        eventheader="[$WEBSTUMP_MESSAGENUM] $eventheader"
+    fi
     cat $MESSAGE | formail -rt -I "Reply-To: $BOARD"   \
                               -I "Errors-To: $MUNGED_ADDRESS"   \
-        -I "X-Webstump-Event: reject $REASON" \
-       -I 'Bcc: webstump+urcm-internal-log+mailout' \
-       -I 'Bcc: webstump+urcm-internal-reject-copy'
+        -I "X-Webstump-Event: $eventheader" \
+       $MAILOUT_REJECT_FORMAIL_ARGS
     (
       echo "$EXPLANATION"
       echo
@@ -38,8 +43,8 @@ reply() {
 
       echo ""
       echo ============================================ Full text of your message follows
-      sed 's/^/> /; s/webstump+[-+/0-9a-z]*@chiark/webstump+?@chiark/' \
-         < $MESSAGE
+      sanitise_and_quote_email \
+         < $MESSAGE
     ) | gpg --clearsign --textmode --armor --batch --user "$PMUSER_APPROVAL" \
          --passphrase "$PMPASSWORD" 2>/dev/null \
   ) | sendmail -oi -t -f $MUNGED_ADDRESS