From 47afbb01384a6b6fa5aaa7548893eeb634e91087 Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Tue, 21 Mar 2006 03:36:44 +0000
Subject: [PATCH] converting to new mail queue api

---
 lib/WebGUI/Asset/Wobject/DataForm.pm                 | 12 ++++++------
 lib/WebGUI/Asset/Wobject/Matrix.pm                   |  4 ++--
 lib/WebGUI/Auth/WebGUI.pm                            |  2 +-
 lib/WebGUI/Operation/Group.pm                        |  4 ++--
 lib/WebGUI/Workflow/Activity/NotifyAboutUser.pm      |  2 +-
 .../Workflow/Activity/ProcessRecurringPayments.pm    |  2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/lib/WebGUI/Asset/Wobject/DataForm.pm b/lib/WebGUI/Asset/Wobject/DataForm.pm
index 858df98a8..49e592d2a 100644
--- a/lib/WebGUI/Asset/Wobject/DataForm.pm
+++ b/lib/WebGUI/Asset/Wobject/DataForm.pm
@@ -648,9 +648,9 @@ sub sendEmail {
 		}
 	}
 	if ($to =~ /\@/) {
-		my $mail = WebGUI::Mail::Send->new($self->session,{to=>$to, subject=>$subject, cc=>$cc, from=>$from, bcc=>$bcc});
+		my $mail = WebGUI::Mail::Send->create($self->session,{to=>$to, subject=>$subject, cc=>$cc, from=>$from, bcc=>$bcc});
 		$mail->addText($message);
-		$mail->send;
+		$mail->queue;
 	} else {
                 my ($userId) = $self->session->db->quickArray("select userId from users where username=".$self->session->db->quote($to));
                 my $groupId;
@@ -662,16 +662,16 @@ sub sendEmail {
                         $self->session->errorHandler->warn($self->getId.": Unable to send message, no user or group found.");
                 } else {
                         WebGUI::MessageLog::addEntry($userId, $groupId, $subject, $message, "", "", $from);
-                        my $mail =  WebGUI::Mail::Send->new($self->session,{to=>$cc, subject=>$subject, from=>$from});
+                        my $mail =  WebGUI::Mail::Send->create($self->session,{to=>$cc, subject=>$subject, from=>$from});
 			if ($cc) {
                                
 				$mail->addText($message);
-				$mail->send;
+				$mail->queue;
                         }
                         if ($bcc) {
-                                WebGUI::Mail::Send->new($self->session, {to=>$bcc, subject=>$subject, from=>$from});
+                                WebGUI::Mail::Send->create($self->session, {to=>$bcc, subject=>$subject, from=>$from});
 				$mail->addText($message);
-				$mail->send;
+				$mail->queue;
                         }
                 }
         }
diff --git a/lib/WebGUI/Asset/Wobject/Matrix.pm b/lib/WebGUI/Asset/Wobject/Matrix.pm
index 2489acb40..0ce194255 100644
--- a/lib/WebGUI/Asset/Wobject/Matrix.pm
+++ b/lib/WebGUI/Asset/Wobject/Matrix.pm
@@ -993,9 +993,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});
-			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")});
+			my $mail = WebGUI::Mail::Send->create($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;
+			$mail->queue;
 		}
 		$var{'email.wasSent'} = 1;
 	} else {
diff --git a/lib/WebGUI/Auth/WebGUI.pm b/lib/WebGUI/Auth/WebGUI.pm
index d43ebe076..9946ebd7c 100644
--- a/lib/WebGUI/Auth/WebGUI.pm
+++ b/lib/WebGUI/Auth/WebGUI.pm
@@ -234,7 +234,7 @@ sub createAccountSave {
    	if ($self->session->setting->get("webguiValidateEmail")) {
 		my $key = $self->session->id->generate();
 		$self->saveParams($self->userId,"WebGUI",{emailValidationKey=>$key});
-   		my $mail = WebGUI::Mail::Send->new($self->session,{
+   		my $mail = WebGUI::Mail::Send->create($self->session,{
 			to=>$profile->{email},
 			subject=>$i18n->get('email address validation email subject','AuthWebGUI')
 			});
diff --git a/lib/WebGUI/Operation/Group.pm b/lib/WebGUI/Operation/Group.pm
index 939ca1402..bfa239bd4 100644
--- a/lib/WebGUI/Operation/Group.pm
+++ b/lib/WebGUI/Operation/Group.pm
@@ -534,9 +534,9 @@ sub www_emailGroupSend {
 		on a.userId=b.userId and b.fieldName='email' where a.groupId=".$session->db->quote($session->form->process("gid")));
 	while (($email) = $sth->array) {
 		if ($email ne "") {
-			my $mail = WebGUI::Mail::Send->new($session, {to=>$email,subject=>$session->form->process("subject"),from=>$session->form->process("from")});
+			my $mail = WebGUI::Mail::Send->create($session, {to=>$email,subject=>$session->form->process("subject"),from=>$session->form->process("from")});
 			$mail->addHtml($session->form->process("message","HTMLArea"));
-			$mail->send;
+			$mail->queue;
 		}
 	}
 	$sth->finish;
diff --git a/lib/WebGUI/Workflow/Activity/NotifyAboutUser.pm b/lib/WebGUI/Workflow/Activity/NotifyAboutUser.pm
index 78bf7c730..f75570b50 100644
--- a/lib/WebGUI/Workflow/Activity/NotifyAboutUser.pm
+++ b/lib/WebGUI/Workflow/Activity/NotifyAboutUser.pm
@@ -94,7 +94,7 @@ sub execute {
 	$self->session->user({user=>$user});
 	my $message = $self->get("message");
 	WebGUI::Macro::process(\$message);
-	my $mail = WebGUI::Mail::Send->new($self->session, {
+	my $mail = WebGUI::Mail::Send->create($self->session, {
 		to=>$self->get("to"),
 		subject=>$self->get("subject")
 		});
diff --git a/lib/WebGUI/Workflow/Activity/ProcessRecurringPayments.pm b/lib/WebGUI/Workflow/Activity/ProcessRecurringPayments.pm
index 95baa88ae..b86bf997d 100644
--- a/lib/WebGUI/Workflow/Activity/ProcessRecurringPayments.pm
+++ b/lib/WebGUI/Workflow/Activity/ProcessRecurringPayments.pm
@@ -125,7 +125,7 @@ sub execute {
 	$message .= "UNPROCESSED PAYMENTS:\n-----------------------------\n".join("\n", @unprocessed)."\n\n\n";
 	$message .= "FATAL ERRORS:\n-----------------------------\n".join("\n",@fatal)."\n\n\n";
 	$message .= "SUCCESFUL PAYMENTS:\n-----------------------------\n".join("\n", @ok)."\n\n\n";
-	my $mail = WebGUI::Mail::Send->new($self->session, {
+	my $mail = WebGUI::Mail::Send->create($self->session, {
 		to=>$self->session->setting->get("commerceSendDailyReportTo"), 
 		subject=>'Daily recurring payments report'
 		});