X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=maps%2Fbin%2Fmaps;h=594d2d94d5443b403aacd874a9eeed37a027638a;hb=7ddf095f187ca60d9a70fb83b2bc3c2b6d91f088;hp=4a9b64edd29ca8dffe08b628ba7dbe349f39eaf8;hpb=dd45f3430c6ce7ad0633e2a7989c120372ef0b6f;p=clearscm.git

diff --git a/maps/bin/maps b/maps/bin/maps
index 4a9b64e..594d2d9 100755
--- a/maps/bin/maps
+++ b/maps/bin/maps
@@ -125,7 +125,7 @@ sub ValidDomainUser($) {
 sub formatRule($) {
   my ($rec) = @_;
 
-  return "$rec->{pattern}\@$rec->{domain}:$rec->{sequence}/$rec->{hit_count}";
+  return "$rec->{pattern}\@$rec->{domain}:$rec->{sequence}/$rec->{hit_count} $rec->{comment}";
 } # formatRule
 
 sub ProcessMsgs ($$$) {
@@ -161,7 +161,7 @@ sub ProcessMsgs ($$$) {
     if ($msgInfo{sender} eq $user_email and
             (lc ($msgInfo{sender_long}) !~ lc ("\"$username\" <$user_email>") and
              lc ($msgInfo{sender_long}) !~ lc ("$username <$user_email>"))) {
-      $log->msg("Nulllisting message from sender ($msgInfo{sender_long}) pretending to be $user_email");
+      $log->msg("Nulllisting message from sender ($msgInfo{sender_long}) pretending to be $user_email - Subject: $msgInfo{subject}");
 
       next;
     } # if
@@ -169,7 +169,7 @@ sub ProcessMsgs ($$$) {
     # Discard messges coming from andrew@clearscm.com because I don't send from
     # that email address
     if (lc $msgInfo{to} eq 'andrew@clearscm.com') {
-      $log->msg("Nullisting message from Andrew\@ClearSCM.com since I don't send from that email address");
+      $log->msg("Nulllisting message from Andrew\@ClearSCM.com since I don't send from that email address - Subject: $msgInfo{subject}");
 
       next;
     } # if
@@ -179,11 +179,11 @@ sub ProcessMsgs ($$$) {
 
     if ($onlist) {
       if (ValidDomainUser $msgInfo{sender}) {
-        $log->msg("Whitelisting $msgInfo{sender} - Rule: " . formatRule($rec));
+        $log->msg("Whitelisting $msgInfo{sender} - Rule: " . formatRule($rec) . " - Subject: $msgInfo{subject}");
 
         Whitelist $msgInfo{sender}, $msgInfo{data}, $rec->{sequence}, $rec->{hit_count};
       } else {
-        $log->msg("Sender ($msgInfo{sender}) from this domain but user not found");
+        $log->msg("Sender ($msgInfo{sender}) from this domain but user not found - Subject: $msgInfo{subject}");
 
         Nulllist $msgInfo{sender};
       } # if
@@ -195,7 +195,7 @@ sub ProcessMsgs ($$$) {
     ($onlist, $rec) = OnBlacklist $msgInfo{sender};
 
     if ($onlist) {
-      $log->msg("Blacklisting $msgInfo{sender} - Rule: " . formatRule($rec));
+      $log->msg("Blacklisting $msgInfo{sender} - Rule: " . formatRule($rec) . " - Subject: $msgInfo{subject}");
 
       Blacklist(
         userid    => $userid,
@@ -212,7 +212,7 @@ sub ProcessMsgs ($$$) {
     ($onlist, $rec) = OnNulllist $msgInfo{sender};
 
     if ($onlist) {
-      $log->msg("Nulllisting $msgInfo{sender} - Rule: " . formatRule($rec));
+      $log->msg("Nulllisting $msgInfo{sender} - Rule: " . formatRule($rec) . " - Subject: $msgInfo{subject}");
 
       Nulllist $msgInfo{sender}, $rec->{sequence}, $rec->{hit_count};
 
@@ -220,7 +220,7 @@ sub ProcessMsgs ($$$) {
     } # if
 
     # Return processing:
-    $log->msg("Returning message from $msgInfo{sender}");
+    $log->msg("Returning message from $msgInfo{sender} - Subject: $msgInfo{subject}");
 
     ReturnMsg(
       userid   => $userid,