A few fixes for refactored list email plugin, and switched to using o…

…ur sendMail helper.
keianrad · Jun 1, 2016 · 288ef02 · 288ef02
1 parent 37c0e49
commit 288ef02
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/plugins/fabrik_list/email/models/email.php b/plugins/fabrik_list/email/models/email.php
@@ -665,9 +665,7 @@ private function _send($row, $mailTo)
 			list($replyEmail, $replyEmailName) = $this->_replyEmailName($row);
 			$thisSubject = $w->parseMessageForPlaceholder($subject, $row);
 
-			$mail = JFactory::getMailer();
-
-			return $mail->sendMail($emailFrom, $fromName, $mailTo, $thisSubject, $thisMsg, 1, $cc, $bcc, $this->filepath,
+			return FabrikWorker::sendMail($emailFrom, $fromName, $mailTo, $thisSubject, $thisMsg, 1, $cc, $bcc, $this->filepath,
 				$replyEmail, $replyEmailName);
 		}
 	}
@@ -744,6 +742,12 @@ public function addressBook()
 	{
 		$params = $this->getParams();
 		$table      = $params->get('emailtable_to_table_table');
+
+		if (empty($table))
+		{
+			return array();
+		}
+
 		$tableEmail = $params->get('emailtable_to_table_email');
 		$tableName  = $params->get('emailtable_to_table_name');
 
@@ -917,8 +921,7 @@ private function mailMerged($firstRow, $mergedMsg, $sent, $notSent)
 
 			if ($sent > 0)
 			{
-				$mail = JFactory::getMailer();
-				$res  = $mail->sendMail($emailFrom, $fromName, $thisTos, $thisSubject, $mergedMsg, true, $cc, $bcc, $this->filepath,
+				$res = FabrikWorker::sendMail($emailFrom, $fromName, $thisTos, $thisSubject, $mergedMsg, true, $cc, $bcc, $this->filepath,
 					$replyEmail, $replyEmailName);
 			}
 		}
@@ -928,8 +931,7 @@ private function mailMerged($firstRow, $mergedMsg, $sent, $notSent)
 			{
 				if (FabrikWorker::isEmail($thisTo))
 				{
-					$mail = JFactory::getMailer();
-					$res  = $mail->sendMail($emailFrom, $fromName, $thisTo, $thisSubject, $mergedMsg, true, $cc, $bcc, $this->filepath,
+					$res = FabrikWorker::sendMail($emailFrom, $fromName, $thisTo, $thisSubject, $mergedMsg, true, $cc, $bcc, $this->filepath,
 						$replyEmail, $replyEmailName);
 
 					if ($res)

diff --git a/plugins/fabrik_list/email/views/popupwin/tmpl/default/default.php b/plugins/fabrik_list/email/views/popupwin/tmpl/default/default.php
@@ -31,7 +31,7 @@
 			<?php
 			if ($this->toType == 'field')
 			{
-				$to = $this->_emailTo();
+				$to = $this->emailTo;
 				?>
 				<div class="span12">
 					<?php

diff --git a/plugins/fabrik_list/email/views/popupwin/view.html.php b/plugins/fabrik_list/email/views/popupwin/view.html.php
@@ -59,7 +59,7 @@ public function display($tmpl = 'default')
 		$this->allowAttachment = $model->getAllowAttachment();
 		$this->editor          = $model->getEditor();
 		$this->toType          = $model->_toType();
-		$this->emailtTo        = $model->_emailTo();
+		$this->emailTo        = $model->_emailTo();
 		$this->params          = $model->getParams();
 		$this->listEmailTo     = $model->formModel->getElementList('list_email_to');
 		$this->addressBook     = $model->addressBook();

diff --git a/plugins/fabrik_list/email/views/popupwin/view.partial.php b/plugins/fabrik_list/email/views/popupwin/view.partial.php
@@ -59,7 +59,7 @@ public function display($tmpl = 'default')
 		$this->allowAttachment = $model->getAllowAttachment();
 		$this->editor          = $model->getEditor();
 		$this->toType          = $model->_toType();
-		$this->emailtTo        = $model->_emailTo();
+		$this->emailTo        = $model->_emailTo();
 		$this->params          = $model->getParams();
 		$this->listEmailTo     = $model->formModel->getElementList('list_email_to');
 		$this->addressBook     = $model->addressBook();