oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Switched MailForm wobject to use the built in mail system.

Browse source
This commit is contained in:
JT Smith 2002-07-31 03:54:13 +00:00
parent 5bab2990b6
commit 888a4b3536
2 changed files with 14 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/WebGUI/Mail.pm
View file

@ -17,7 +17,7 @@ use WebGUI::Session;
#-------------------------------------------------------------------
#eg: send("jt@jt.com","hi, how are you","this is my message","bob@bob.com","you@ther.com");
#eg: send(to,subject,message,cc,from);
#eg: send(to,subject,message,cc,from,bcc);
sub send {
my ($smtp, $message, $from);
$from = $_[4] || ($session{setting}{companyName}.' <'.$session{setting}{companyEmail}.'>');
@ -25,6 +25,7 @@ sub send {
$message = "To: $_[0]\n";
$message .= "From: $from\n";
$message .= "CC: $_[3]\n" if ($_[3]);
$message .= "BCC: $_[5]\n" if ($_[5]);
$message .= "Subject: ".$_[1]."\n";
$message .= "\n";
#body
@ -40,6 +41,8 @@ sub send {
if (defined $smtp) {
$smtp->mail($from); # use the sender's address here
$smtp->to($_[0]); # recipient's address
$smtp->cc($_[3]) if ($_[3]);
$smtp->bcc($_[5]) if ($_[5]);
$smtp->data(); # Start the mail
$smtp->datasend($message);
$smtp->dataend(); # Finish sending the mail

48
lib/WebGUI/Wobject/MailForm.pm
View file

@ -542,48 +542,20 @@ sub www_send {
$data{name} .= ":" unless ($data{name} =~ /:$/);
$message .= "$data{name} $value\n";
}
my $error;
my $to = $session{form}{toField};
if ($to =~ /\@/) {
# send a direct email if the To field is an email address
eval{
my ($smtp);
$smtp = Net::SMTP->new($session{setting}{smtpServer}); # connect to an SMTP server
my ($subject, $cc, $from, $bcc) =
($session{form}{subjectField},$session{form}{ccField},
$session{form}{fromField},$session{form}{bccField});
# From is either the logged on user, filled out, or the site
if ($from && $session{user}) {
# add their name from their profile if available
$from = ("$session{user}{firstName} $session{user}{lastName}" || $session{user}{username}) . " <$from>";
} elsif ($from) {
# leave the from as-is
} else {
# last resort, use the website info
$from = "$session{setting}{companyName} <$session{setting}{companyEmail}>";
}
if (defined $smtp) {
$smtp->mail($session{setting}{companyEmail}); # use the sender's address here
$smtp->to($to); # recipient's address
$smtp->data(); # Start the mail
# Send the header.
$smtp->datasend("To: $to\n");
$smtp->datasend("From: $from\n");
$smtp->datasend("CC: $cc\n") if ($cc);
$smtp->datasend("BCC: $bcc\n") if ($bcc);
$smtp->datasend("Subject: $subject\n\n");
# Send the body.
$smtp->datasend("$message\n\n");
if ($from =~ /$session{setting}{companyEmail}/) {
$smtp->datasend("$session{setting}{companyName}\n $session{setting}{companyEmail}\n $session{setting}{companyURL}\n");
}
$smtp->dataend(); # Finish sending the mail
$smtp->quit; # Close the SMTP connection
} else {
WebGUI::ErrorHandler::warn("Couldn't connect to mail server: ".$session{setting}{smtpServer});
}
};
my ($subject, $cc, $from, $bcc) = ($session{form}{subjectField},$session{form}{ccField},
$session{form}{fromField},$session{form}{bccField});
# From is either the logged on user, filled out, or the site
if ($from && $session{user}) {
# add their name from their profile if available
$from = ("$session{user}{firstName} $session{user}{lastName}" || $session{user}{username}) . " <$from>";
} elsif ($from) {
# leave the from as-is
}
WebGUI::Mail::send($to,$subject,$message,$cc,$from,$bcc);
} else {
my ($userId) = WebGUI::SQL->quickArray("select userId from users where username=".quote($to));
my $groupId;