&Received_for: host: Parse also: [10.14.83.0] as hostname

[PerlMail.git] / My-Audit.pm

diff --git a/My-Audit.pm b/My-Audit.pm
index 9f02c70..15416e6 100644 (file)
--- a/My-Audit.pm
+++ b/My-Audit.pm
@@ -22,7 +22,7 @@ sub audit_init
        @alternates_host=(
                        "jabberwock.ucw.cz",    # short@ucw.cz
                        "atrey.karlin.mff.cuni.cz",     # short@atrey.karlin.mff.cuni.cz
-                       "k332.feld.cvut.cz",    # k332.feld.cvut.cz
+                       "k332.feld.cvut.cz",    # short@k332.feld.cvut.cz
                        );
 }
 
@@ -198,14 +198,15 @@ my(%args)=@_;
        # max. 9 lines of .sig
        s/\n-- (?:\n[^\n]*){0,9}$//gs;
        # "Original Message"/"Puvodni zprava" etc. up to empty line
-       s/(^|\n)[\s^\n]*-----[\w\s]*-----[\s^\n]*(?:\n[^\n]+)*\n{2,}(?:\s*[^>\s].*$)?/\n/gs;
+       # "- - - Original message: - - -" is by "Lotus Notes Release 5.0.5  September 22, 2000"
+       s/(^|\n)[\s^\n]*(?:-----[\w\s]*-----|- - - Original message: - - -)[\s^\n]*(?:\n[^\n]+)*\n{2,}(?:\s*[^>\s].*$)?/\n/gs;
        # Remove "..." lines (is it used by anyone except me?)
        s/^\Q...\E$/*/gm;
        # quoting "> "
-       s/^\s*[>][>\s]*.*$/*/gm;
+       s/^(?:\s*[[:upper:]]{0,3}>)+.*$/*/gm;
        s/(?:^|\n)(?:\*\n+)+/\n*\n/gs;
        # attributions
-       s/^.*\b(?:wrote|writes):\s*$//gm;
+       s/^.*\b(?:wrote|writes|napsal jste):\s*$//gm;
        my $body=$_;
 
        return [$from,"($subject)$body"];