X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/cc054ed56838e1facf493acab38a5f4f65a26104..9ad2d49ba3ef23f08fa59de55fb2dd4a869567c2:/procmail/defines

diff --git a/procmail/defines b/procmail/defines
index 218ba89..64dfd53 100644
--- a/procmail/defines
+++ b/procmail/defines
@@ -72,6 +72,7 @@ RE_SPACE_NEWLINE="(^|$RE_SPACE)"
 RE_FIRSTNAME="martin($RE_SPACE_NEWLINE+f(\.?|elix))?"
 RE_LASTNAME="kraff?t"
 RE_EXTRACT_HEADER_VALUE="$RE_SPACE*\/$RE_NOT_SPACE.*"
+RE_EMAILADDRESS="${RE_NOT_SPACE}+@${RE_NOT_SPACE}+\.[^ 	>]+"
 
 DEJAVU_HEADER=X-Deja-Vu
 
@@ -86,7 +87,7 @@ DELAY_NEXT_WEEKEND='next sunday 28 hours ago' # fri night, 20:00
 DELAY_TONIGHT='tomorrow 00:00 4 hours ago' # tonight at 20:00
 DELAY_AFTERNOON='tomorrow 00:00 8 hours ago' # today at 16:00
 
-OURDATE="`$BIN_DATE +'%s %Y.%m.%d.%H.%M.%N %a, %d %b %Y %T %z'`"
+OURDATE="`$BIN_DATE +'%s %Y%m%d.%H%M.%N %a, %d %b %Y %T %z'`"
 :0
 *$ OURDATE ?? ^\/${RE_NOT_SPACE}+
 { OURDATE_TS="$MATCH" }
@@ -122,15 +123,20 @@ INCLUDERC=$PMDIR/get-msgid
 { FROM="$MATCH" }
 
 :0
-*$ FROM ?? ^\/${RE_NOT_SPACE}+@${RE_NOT_SPACE}+
+* FROM ?? ^.+<\/.+@[^>]+
 { FROMEMAIL="$MATCH" }
 
 :0 E
-* FROM ?? ^.+ <\/[^>]+
+* FROM ?? ^.+\(\/.+@[^\)]+
 { FROMEMAIL="$MATCH" }
 
 :0 E
-* FROM ?? ^.+ \(\/[^\)]+
+*$ FROM ?? ^\/$RE_EMAILADDRESS
+{ FROMEMAIL="$MATCH" }
+
+:0
+* FROMEMAIL ?? ^".+"$
+* FROMEMAIL ?? ^"\/[^"]+
 { FROMEMAIL="$MATCH" }
 
 # if $SENDER is undefined or not an email address, get it from the message