slashjp/trunk/debian/changelog (diff)
slashjp/trunk/Slash/Utility/System/System.pm (diff)| @@ -145,9 +145,11 @@ | ||
| 145 | 145 | $sender =~ s/###ADDR###/$bounce_addr/; |
| 146 | 146 | } |
| 147 | 147 | |
| 148 | + my $mailfrom = ($constants->{mailfrom_comment} || $constants->{sitename}) . " <$constants->{mailfrom}>"; | |
| 149 | + | |
| 148 | 150 | my %data = ( |
| 149 | 151 | Sender => $sender, |
| 150 | - From => $constants->{mailfrom}, | |
| 152 | + From => $mailfrom, | |
| 151 | 153 | Smtp => $constants->{smtp_server}, |
| 152 | 154 | Subject => $subject, |
| 153 | 155 | Message => $content, |
| @@ -223,8 +225,10 @@ | ||
| 223 | 225 | $content = encode( $b_code, $content, Encode::FB_PERLQQ ); |
| 224 | 226 | $subject = encode( $h_code, $subject, Encode::FB_PERLQQ ); |
| 225 | 227 | |
| 228 | + my $mailfrom = ($constants->{mailfrom_comment} || $constants->{sitename}) . " <$constants->{mailfrom}>"; | |
| 229 | + | |
| 226 | 230 | my $bulk = Slash::Custom::Bulkmail->new( |
| 227 | - From => $constants->{mailfrom}, | |
| 231 | + From => $mailfrom, | |
| 228 | 232 | Smtp => $constants->{smtp_server}, |
| 229 | 233 | Subject => $subject, |
| 230 | 234 | Message => $content, |
SRAD
tach