X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~webstump/git?a=blobdiff_plain;f=stump%2Fbin%2FprocessRejected;h=c2dbc5ea071619e723e90d5d6d2c134634076316;hb=acff1ba7277dfa00ee47688742f2a3910ea6c106;hp=212a8f7caa7499613c8093319694c3b445b8e0e4;hpb=56d8a80761d68c123d55778d73b66268dabd3e34;p=modbot-ulm.git

diff --git a/stump/bin/processRejected b/stump/bin/processRejected
index 212a8f7..c2dbc5e 100755
--- a/stump/bin/processRejected
+++ b/stump/bin/processRejected
@@ -1,4 +1,4 @@
-#!/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.
@@ -26,8 +26,7 @@ reply() {
     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'
+	$MAILOUT_REJECT_FORMAIL_ARGS
     (
       echo "$EXPLANATION"
       echo
@@ -38,8 +37,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