X-Git-Url: http://git.jankratochvil.net/?p=PerlMail.git;a=blobdiff_plain;f=My-Audit.pm;h=6375a0c1d0dd8f42a3b343cb63bba4ec648abad7;hp=781288d4d2552651fd449ab0f2240e15b3ce69be;hb=451abe80dd57eb5e8c4b551594ee0dfd7ffb8e18;hpb=07dc23479fff656e8e8c715d2e9177e3eab2ad2a

diff --git a/My-Audit.pm b/My-Audit.pm
index 781288d..6375a0c 100644
--- a/My-Audit.pm
+++ b/My-Audit.pm
@@ -156,15 +156,31 @@ sub audit
 	store "==","sms"             if !did;
 }
 
+sub audit_sms_address
+{
+my($obj)=@_;
+
+	my $address=$obj->address();
+	if (my $alternates=muttrc_get("alternates")) {
+		return "I" if $address=~/$alternates/si;
+		}
+	my %aliases=muttrc_aliases();
+	if (my $alias=$aliases{lc $address}) {
+		local $_=$alias;
+		s/\.cz$//i;
+		return $_;
+		}
+	local $_=$address;
+	s/\b(Bus)siness$/$1/i;
+	s/\.ident$//i;
+	return $_;
+}
+
 sub audit_sms
 {
 my(%args)=@_;
 
-	my $from=(@{$args{"from"}} ? join(",",map({
-			s/\.cz$//i;
-			s/\b(Bus)siness$/$1/i;
-			$_;
-			} @{$args{"from"}})) : "?");
+	my $from=(@{$args{"from"}} ? join(",",map({ audit_sms_address($_); } @{$args{"from"}})) : "?");
 	local $_;
 
 	$_=$args{"subject"};
@@ -182,7 +198,8 @@ 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 "> "