X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/122f13badd406cf378fb4f57197d27ddebb4d15b..e3adb4786be577e6de20f62205bf1dbab8004f3a:/procmail/logging

diff --git a/procmail/logging b/procmail/logging
index d6fc083..19cbc4d 100644
--- a/procmail/logging
+++ b/procmail/logging
@@ -5,8 +5,25 @@ MSGIDDIR=$PMVAR/msgid
 :0
 * MSGID ?? ^<\/[^>]+
 {
-  THISLOGFILE_REL=`echo $MATCH | tr -d "'\"?[:cntrl:]" | tr ' /*$' '__+S'`%$OURDATE_SHORT
-  THISLOGFILE="$MSGIDDIR/$THISLOGFILE_REL"
+  MSGID_NAME=`echo -n $MATCH | sha224sum | cut -d' ' -f1`
+
+  :0
+  * MSGID_NAME ?? ^\/.
+  { HASH1="$MATCH" }
+
+  :0
+  * MSGID_NAME ?? ^.\/.
+  { HASH2="$MATCH" }
+
+  THISLOGFILE_REL="${HASH1}/${HASH2}/${MSGID_NAME}_${OURDATE_SHORT}"
+  LOGDIR="${MSGIDDIR}/${HASH1}/${HASH2}"
+  MKDIR=`test -d $LOGDIR || mkdir -p $LOGDIR`
+  MKDIR
+  LOGDIR
+  THISLOGFILE="${MSGIDDIR}/${THISLOGFILE_REL}"
+  HASH2
+  HASH1
+  MSGID_NAME
 }
 
 MASTERLOGFILE="$LOGFILE"
@@ -21,7 +38,8 @@ LOG="===========================================================================
 LOG="msgid:       $MSGID
 logfile:     $THISLOGFILE_REL
 date:        $DATE (@$OURDATE)
-from:        $FROM
+sender:      $SENDER
+from:        $FROMEMAIL ($FROM)
 original-to: $ORIGINAL_TO
 subject:     $SUBJECT$NL"
 
@@ -31,4 +49,4 @@ TRAP="DESTFILE=\"\${LASTFOLDER#$BASE/}\";
              /bin/cat '$THISLOGFILE' >> $MASTERLOGFILE;
              /bin/rm -f $PMVAR/lock\" 0"
 
-#VERBOSE=yes
+THISLOGFILE_REL