X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~webstump/git?a=blobdiff_plain;f=stump%2Fetc%2Fsanitise_and_quote_email.INO;h=1526209aef45f4d53e7208b087a85363270b5976;hb=ba1a60e8c390874d2fbb484c29d23524e945f934;hp=9446cd4a081bf104b0d322b9f96d7f915e1a9ad8;hpb=840d4017e5a033515f31f3caf6880fd9a64cbfd3;p=modbot-mtm.git

diff --git a/stump/etc/sanitise_and_quote_email.INO b/stump/etc/sanitise_and_quote_email.INO
index 9446cd4..1526209 100755
--- a/stump/etc/sanitise_and_quote_email.INO
+++ b/stump/etc/sanitise_and_quote_email.INO
@@ -1,7 +1,12 @@
-#!/usr/bin/perl -p
+#!/usr/bin/perl -n
 
-s, %OURUSER% \+ [-+/0-9a-z]* \@ (\Q%DOMAIN%\E | \Q%SLIMYDOMAIN%\E) \b
-		 ,%OURUSER%+?\@$1,igx
-	unless m/^$/..0;
+unless (m/^$/..0) {
+    $skip= 0 unless m/^[ \t]/;
+    $skip= 1 if m/^received\s*\:/i;
+    next if $skip;
+    s, %OURUSER% \+ [-+/0-9a-z]* \@ (\Q%DOMAIN%\E | \Q%SLIMYDOMAIN%\E) \b
+		 ,%OURUSER%+?\@$1,igx;
+}
 
 s/^/> /;
+print or die $!;