New "blocklist" rejection reason

diff --git a/stump/bin/submission.pl b/stump/bin/submission.pl
index a6f05fd6c6f0cf8522cfc90e2f6996528b107c9b..8a7331a88a58044f5f8e7e74710a9f4a76fb759c 100755 (executable)
--- a/stump/bin/submission.pl
+++ b/stump/bin/submission.pl
@@ -215,7 +215,7 @@ sub Filter {
   }
 
   if( &nameIsInList( $From, $badGuys ) ) {
-    return "$Command_Reject abuse";
+    return "$Command_Reject blocklist";
   }
 
   # note that if even a preapproved person uses "BAD words" (that is

diff --git a/stump/etc/messages/blocklist.IN1 b/stump/etc/messages/blocklist.IN1
new file mode 100644 (file)
index 0000000..9bd3b5a
--- /dev/null
+++ b/stump/etc/messages/blocklist.IN1
@@ -0,0 +1,14 @@
+Thank you for your message.  However, we have not approved it because
+it appears to be from a poster who has been blocked from posting to
+%GROUP%.  If you don't know why please get in touch.
+
+You can find the group charter and moderation policy at:
+  %GROUPURL%
+Please direct your queries to:
+  %MODEMAIL%
+
+If you have difficulty reaching the moderators (eg due to
+spamfiltering) please tell %SPAMFILTERINGADMIN%.
+
+Thank you,
+       - Moderator.

diff --git a/webstump/skeleton/rejection-reasons.IN1 b/webstump/skeleton/rejection-reasons.IN1
index 1a3cf94894f17897786197e453dc35abed1ffe41..3d3d42f79eed706c3d31f17691d654f02386ccc0 100644 (file)
--- a/webstump/skeleton/rejection-reasons.IN1
+++ b/webstump/skeleton/rejection-reasons.IN1
@@ -7,3 +7,4 @@ test::message is a test
 meta::unconstructive or excessive metadiscussion
 inflammatory::needlessly inflammatory
 mistake::appears to have been posted in error
+blocklist::poster banned