diff options
| author | fukachan <fukachan> | 2006-11-26 12:01:44 +0000 |
|---|---|---|
| committer | fukachan <fukachan> | 2006-11-26 12:01:44 +0000 |
| commit | 3d1aa5be80a8a5dc2b8d5fb1216785004f05fcd2 (patch) | |
| tree | d669f636f7bd3d73d21584ab33820f6b4d8986a4 /fml/lib | |
| parent | f841fac1f97fe4e7f0c67db8436469abb2924ec3 (diff) | |
| download | fml8-3d1aa5be80a8a5dc2b8d5fb1216785004f05fcd2.tar.gz fml8-3d1aa5be80a8a5dc2b8d5fb1216785004f05fcd2.tar.bz2 fml8-3d1aa5be80a8a5dc2b8d5fb1216785004f05fcd2.zip | |
fix comments.
fix error logic.
Diffstat (limited to 'fml/lib')
| -rw-r--r-- | fml/lib/FML/Mailer.pm | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/fml/lib/FML/Mailer.pm b/fml/lib/FML/Mailer.pm index dced141e..0bc761a3 100644 --- a/fml/lib/FML/Mailer.pm +++ b/fml/lib/FML/Mailer.pm @@ -4,7 +4,7 @@ # All rights reserved. This program is free software; you can # redistribute it and/or modify it under the same terms as Perl itself. # -# $FML: Mailer.pm,v 1.38 2006/04/05 11:39:11 fukachan Exp $ +# $FML: Mailer.pm,v 1.39 2006/07/09 12:11:12 fukachan Exp $ # package FML::Mailer; @@ -74,7 +74,7 @@ sub new =head2 send($send_args) -send the given C<message>. +send the specified C<message>. $send_args (HASH_REF) can take the following arguments: ---------------------------------- @@ -87,7 +87,7 @@ $send_args (HASH_REF) can take the following arguments: =cut -# Descriptions: send messages in the queue (queue flush). +# Descriptions: send the specified message in the queue (queue flush). # Arguments: OBJ($self) OBJ($queue) HASH_REF($send_args) # Side Effects: queue changed # Return Value: NUM(1 or 0) @@ -151,10 +151,6 @@ sub send if (defined($send_args->{ message }) && ref($send_args->{ message })) { $message = $send_args->{ message }; } - else { - $curproc->logerror("FML::Mailer: no message"); - return 0; - } # 3.2 file if (defined($send_args->{ file })) { @@ -170,12 +166,13 @@ sub send } } + # 3.3 error handling (must be here after 3.1 and 3.2). unless (defined $message) { $curproc->logerror("FML::Mailer: no message"); return 0; } - # address validater + # address validater used in SMTP RCPT TO phase. my $validater = sub { my ($address) = @_; use FML::Restriction::Base; |
