Remove more urcm-isms

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

diff --git a/stump/bin/processRejected b/stump/bin/processRejected
index 212a8f7caa7499613c8093319694c3b445b8e0e4..046e6921cd517d27e078d747046184efcf5ff839 100755 (executable)
--- a/stump/bin/processRejected
+++ b/stump/bin/processRejected
@@ -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