X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/cec7fa6b3df885a566bb3a68c4311be126b61b6f..55201707fd710acd7a8623d6e7cd3aeb82391c2f:/procmail/logging

diff --git a/procmail/logging b/procmail/logging
index 7068e4d..9f1efd0 100644
--- a/procmail/logging
+++ b/procmail/logging
@@ -5,23 +5,12 @@ MSGIDDIR=$PMVAR/msgid
 :0
 * MSGID ?? ^<\/[^>]+
 {
-  MSGID_NAME=`echo $MATCH | tr -d "'\"?[:cntrl:]" | tr ' /*$' '__+S'`
+  MSGID_NAME=`echo $MATCH | sha224sum | cut -d' ' -f1`
 
-  #VERBOSE=yes
-  # check if filename > 228 characters and if so, then shorten it to prevent
-  # hitting filesystem limit after we append the timestamp
-  :0
-  * MSGID_NAME ?? ^.....................................................................................................................................................................................................................................
-  {
-    HASH=`echo $MSGID_NAME | md5sum | cut -d' ' -f1`
-    MSGID_NAME=`echo $MSGID_NAME | cut -c-196`$HASH
-  }
-
-  THISLOGFILE_REL=$MSGID_NAME%$OURDATE_SHORT
-  THISLOGFILE="$MSGIDDIR/$THISLOGFILE_REL"
+  THISLOGFILE_REL=${MSGID_NAME}_${OURDATE_SHORT}
+  THISLOGFILE="${MSGIDDIR}/${THISLOGFILE_REL}"
 
   MSGID_NAME
-  #VERBOSE=no
 }
 
 MASTERLOGFILE="$LOGFILE"
@@ -36,7 +25,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"