Taku YASUI
tach****@users*****
2005年 12月 2日 (金) 00:06:07 JST
Index: slashjp/Slash/Utility/System/System.pm diff -u slashjp/Slash/Utility/System/System.pm:1.6 slashjp/Slash/Utility/System/System.pm:1.7 --- slashjp/Slash/Utility/System/System.pm:1.6 Sat Jan 8 17:33:54 2005 +++ slashjp/Slash/Utility/System/System.pm Fri Dec 2 00:06:06 2005 @@ -1,7 +1,7 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2004 by Open Source Development Network. See README # and COPYING for more information, or see http://slashcode.com/. -# $Id: System.pm,v 1.6 2005/01/08 08:33:54 oliver Exp $ +# $Id: System.pm,v 1.7 2005/12/01 15:06:06 tach Exp $ package Slash::Utility::System; @@ -43,7 +43,7 @@ use base 'Exporter'; use vars qw($VERSION @EXPORT @EXPORT_OK); -($VERSION) = ' $Revision: 1.6 $ ' =~ /\$Revision:\s+([^\s]+)/; +($VERSION) = ' $Revision: 1.7 $ ' =~ /\$Revision:\s+([^\s]+)/; @EXPORT = qw( bulkEmail doEmail @@ -132,7 +132,18 @@ $content = encode( $b_code, $content, Encode::FB_PERLQQ ); $subject = encode( $h_code, $subject, Encode::FB_PERLQQ ); + # set enverope from + if ($constants->{bounce_address}) { + $sender = $constants->{bounce_address}; + my $bounce_addr = $addr; + $bounce_addr =~ s/@/=/; + $sender =~ s/###ADDR###/$bounce_addr/; + } else { + $sender = $constants->{mailfrom}; + } + my %data = ( + Sender => $sender, From => $constants->{mailfrom}, Smtp => $constants->{smtp_server}, Subject => $subject, @@ -558,4 +569,4 @@ =head1 VERSION -$Id: System.pm,v 1.6 2005/01/08 08:33:54 oliver Exp $ +$Id: System.pm,v 1.7 2005/12/01 15:06:06 tach Exp $
SRAD