From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 1 Mar 2010 12:29:03 +0000 (+0000)
Subject: Fix quoting to strip Receiveds
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~webstump/git?p=modbot-mtm.git;a=commitdiff_plain;h=c36a06ac696bb5ecf002d2e69c8f7cc81adffbfa;hp=f4859db26d41bd15b425c011a9acee8305fea7cb

Fix quoting to strip Receiveds
---

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 $!;