replaced webgui mail system

This commit is contained in:
JT Smith 2006-01-31 20:20:09 +00:00
parent 53c5de1903
commit 3816ad750f
12 changed files with 288 additions and 152 deletions

View file

@ -17,6 +17,7 @@ use WebGUI::Form;
use WebGUI::HTML;
use WebGUI::HTMLForm;
use WebGUI::International;
use WebGUI::Mail::Send;
use WebGUI::Macro;
use WebGUI::MessageLog;
use WebGUI::SQL;
@ -647,7 +648,9 @@ sub sendEmail {
}
}
if ($to =~ /\@/) {
WebGUI::Mail::send($to, $subject, $message, $cc, $from, $bcc);
my $mail = WebGUI::Mail::Send->new($self->session,{to=>$to, subject=>$subject, cc=>$cc, from=>$from, bcc=>$bcc});
$mail->addText($message);
$mail->send;
} else {
my ($userId) = $self->session->db->quickArray("select userId from users where username=".$self->session->db->quote($to));
my $groupId;
@ -660,10 +663,14 @@ sub sendEmail {
} else {
WebGUI::MessageLog::addEntry($userId, $groupId, $subject, $message, "", "", $from);
if ($cc) {
WebGUI::Mail::send($cc, $subject, $message, "", $from);
my $mail = WebGUI::Mail::Send->new($self->session,{to=>$cc, subject=>$subject, from=>$from});
$mail->addText($message);
$mail->send;
}
if ($bcc) {
WebGUI::Mail::send($bcc, $subject, $message, "", $from);
WebGUI::Mail::Send->new($self->session, {to=>$bcc, subject=>$subject, from=>$from});
$mail->addText($message);
$mail->send;
}
}
}

View file

@ -4,7 +4,7 @@ use strict;
use Tie::IxHash;
use WebGUI::Form;
use WebGUI::HTMLForm;
use WebGUI::Mail;
use WebGUI::Mail::Send;
use WebGUI::SQL;
use WebGUI::User;
use WebGUI::Utility;
@ -992,7 +992,9 @@ sub www_viewDetail {
if ($self->session->form->process("do") eq "sendEmail") {
if ($self->session->form->process("body") ne "") {
my $u = WebGUI::User->new($self->session, $listing->{maintainerId});
WebGUI::Mail::send($u->profileField("email"),$listing->{productName}." - ".$self->session->form->process("subject"),$self->session->form->process("body"),"",$self->session->form->process("from"));
my $mail = WebGUI::Mail::Send->new($self->session, {to=>$u->profileField("email"),subject=>$listing->{productName}." - ".$self->session->form->process("subject"),from=>$self->session->form->process("from")});
$mail->addText($self->session->form->process("body"));
$mail->send;
}
$var{'email.wasSent'} = 1;
} else {