CVS: mhonarc/MHonArc/lib mhdysub.pl,2.9,2.10 mhopt.pl,2.49,2.50 mhrcvars

Update of /cvsroot/mhonarc/mhonarc/MHonArc/lib
In directory subversions:/tmp/cvs-serv9993

Modified Files:
	mhdysub.pl mhopt.pl mhrcvars.pl 
Log Message:
If SPAMMODE is enabled apply ADDRESSMODIFYCODE to $FROMNAME$ incase
the "name" actually contains an embedded email address.


Index: mhdysub.pl
===================================================================
RCS file: /cvsroot/mhonarc/mhonarc/MHonArc/lib/mhdysub.pl,v
retrieving revision 2.9
retrieving revision 2.10
diff -C2 -r2.9 -r2.10
*** mhdysub.pl	31 Dec 2002 20:01:37 -0000	2.9
--- mhdysub.pl	10 Jan 2003 03:35:40 -0000	2.10
***************
*** 151,160 ****
  
      ##-----------------------------------------------------------------------
!     ##	Routine to rewrite mail addresses in message bodies
      ##
!     if ($AddrModifyBodies) {
! 	$sub =<<EndOfRoutine;
! sub rewrite_body_address {
!     package mhonarc::Pkg_rewrite_body_address;
      local \$_ = shift;
      $AddressModify;
--- 151,159 ----
  
      ##-----------------------------------------------------------------------
!     ##	Routine to rewrite raw mail addresses
      ##
!     $sub =<<EndOfRoutine;
! sub rewrite_raw_address {
!     package mhonarc::Pkg_rewrite_raw_address;
      local \$_ = shift;
      $AddressModify;
***************
*** 162,170 ****
  }
  EndOfRoutine
! 	$sub .= "# $_sub_eval_cnt\n";  ++$_sub_eval_cnt;
! 	eval $sub;
! 	die("ERROR: Unable to create rewrite_body_address routine:\n$(_at_)\n")
! 	    if $@;
!     }
  
      ##-----------------------------------------------------------------------
--- 161,168 ----
  }
  EndOfRoutine
!     $sub .= "# $_sub_eval_cnt\n";  ++$_sub_eval_cnt;
!     eval $sub;
!     die("ERROR: Unable to create rewrite_raw_address routine:\n$(_at_)\n")
! 	if $@;
  
      ##-----------------------------------------------------------------------

Index: mhopt.pl
===================================================================
RCS file: /cvsroot/mhonarc/mhonarc/MHonArc/lib/mhopt.pl,v
retrieving revision 2.49
retrieving revision 2.50
diff -C2 -r2.49 -r2.50
*** mhopt.pl	9 Jan 2003 23:42:28 -0000	2.49
--- mhopt.pl	10 Jan 2003 03:35:40 -0000	2.50
***************
*** 687,691 ****
  	    my $fields = shift;
  	    my $data_r = shift;
! 	    $$data_r =~ s/($AddrExp)/rewrite_body_address($1)/geo;
  	}
      }
--- 687,691 ----
  	    my $fields = shift;
  	    my $data_r = shift;
! 	    $$data_r =~ s/($AddrExp)/rewrite_raw_address($1)/geo;
  	}
      }

Index: mhrcvars.pl
===================================================================
RCS file: /cvsroot/mhonarc/mhonarc/MHonArc/lib/mhrcvars.pl,v
retrieving revision 2.23
retrieving revision 2.24
diff -C2 -r2.23 -r2.24
*** mhrcvars.pl	9 Jan 2003 23:42:28 -0000	2.23
--- mhrcvars.pl	10 Jan 2003 03:35:40 -0000	2.24
***************
*** 143,146 ****
--- 143,149 ----
  	    ($lref, $key, $pos) = compute_msg_pos($index, $var, $arg);
  	    $tmp = defined($key) ? &$esub($From{$key}) : "(nil)";
+ 	    if ($cnd3 && $SpamMode) {
+ 		$tmp =~ s/($AddrExp)/rewrite_raw_address($1)/geo;
+ 	    }
  	    last REPLACESW;
  	}

---------------------------------------------------------------------
To sign-off this list, send email to majordomo(_at_)mhonarc(_dot_)org with the
message text UNSUBSCRIBE MHONARC-DEV