Chris/webperl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Trying to fix problems with SMTP constructors.

Browse Source
This commit is contained in:
Chris 2012-08-16 14:23:39 +01:00
parent b098d3fb57
commit 1438b7cee8
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Message/Transport/Email.pm
View File

@ -65,12 +65,7 @@ sub new {
# set up persistent STMP if needed # set up persistent STMP if needed
if($self -> {"persist"}) { if($self -> {"persist"}) {
eval { $self -> {"smtp"} = Email::Sender::Transport::SMTP::Persistent -> new(host => $self -> {"host"}, eval { $self -> {"smtp"} = Email::Sender::Transport::SMTP::Persistent -> new($self -> _build_smtp_args()); };
port => $self -> {"port"},
ssl => $self -> {"ssl"},
sasl_username => $self -> {"username"},
sasl_password => $self -> {"password"});
};
return SystemModule::set_error("SMTP Initialisation failed: $@") if($@); return SystemModule::set_error("SMTP Initialisation failed: $@") if($@);
} }
@ -101,12 +96,8 @@ sub deliver {
my $message = shift; my $message = shift;
if(!$self -> {"persist"}) { if(!$self -> {"persist"}) {
eval { $self -> {"smtp"} = Email::Sender::Transport::SMTP -> new(host => $self -> {"host"},
port => $self -> {"port"}, eval { $self -> {"smtp"} = Email::Sender::Transport::SMTP -> new($self -> _build_smtp_args()); };
ssl => $self -> {"ssl"},
sasl_username => $self -> {"username"},
sasl_password => $self -> {"password"});
};
return $self -> self_error("SMTP Initialisation failed: $@") if($@); return $self -> self_error("SMTP Initialisation failed: $@") if($@);
} }
@ -150,6 +141,26 @@ sub deliver {
# ============================================================================ # ============================================================================
# Support code # Support code
## @method private % _build_smtp_args()
# Build the argument hash to pass to the SMTP constructor.
#
# @return A hash of arguments to pass to the Email::Sender::Transport::SMTP constructor
sub _build_smtp_args {
my $self = shift;
my %args = (host => $self -> {"host"},
port => $self -> {"port"},
ssl => $self -> {"ssl"} || 0);
if($self -> {"username"} && $self -> {"password"}) {
$args{"sasl_username"} = $self -> {"username"};
$args{"sasl_password"} = $self -> {"password"};
}
return %args;
}
## @method private $ _get_user_email($userid) ## @method private $ _get_user_email($userid)
# Obtain the email address set for the specified user. This class may be called outside # Obtain the email address set for the specified user. This class may be called outside
# the normal application environment, so it might not have access to the AppUser or Session # the normal application environment, so it might not have access to the AppUser or Session