• R/O
  • SSH
  • HTTPS

slashdotjp: Commit


Commit MetaInfo

Révision1112 (tree)
l'heure2009-04-06 21:21:43
Auteurtach

Message de Log

  • Add comment to messaging mail "From:" line using constant
    "mailfrom_comment" or "sitename"

Change Summary

Modification

--- slashjp/trunk/Slash/Utility/System/System.pm (revision 1111)
+++ slashjp/trunk/Slash/Utility/System/System.pm (revision 1112)
@@ -145,9 +145,11 @@
145145 $sender =~ s/###ADDR###/$bounce_addr/;
146146 }
147147
148+ my $mailfrom = ($constants->{mailfrom_comment} || $constants->{sitename}) . " <$constants->{mailfrom}>";
149+
148150 my %data = (
149151 Sender => $sender,
150- From => $constants->{mailfrom},
152+ From => $mailfrom,
151153 Smtp => $constants->{smtp_server},
152154 Subject => $subject,
153155 Message => $content,
@@ -223,8 +225,10 @@
223225 $content = encode( $b_code, $content, Encode::FB_PERLQQ );
224226 $subject = encode( $h_code, $subject, Encode::FB_PERLQQ );
225227
228+ my $mailfrom = ($constants->{mailfrom_comment} || $constants->{sitename}) . " <$constants->{mailfrom}>";
229+
226230 my $bulk = Slash::Custom::Bulkmail->new(
227- From => $constants->{mailfrom},
231+ From => $mailfrom,
228232 Smtp => $constants->{smtp_server},
229233 Subject => $subject,
230234 Message => $content,
Afficher sur ancien navigateur de dépôt.