Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

- Updates cron's sending queue worker to use model objects

Browse Source 
- Adds new method to render newsletter to the newsletter model
- Adds new transient object to newsletter model that will hold temporary
  values (i.e., rendered body) when working with the model
This commit is contained in:
Vlad
2016-09-18 23:14:17 -04:00
parent b834a6af4d
commit f88dabffe8
11 changed files with 133 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/Cron/Workers/SendingQueue/Tasks/Mailer.php
View File

@ -13,18 +13,18 @@ class Mailer {
$this->mailer = $this->configureMailer();
}
function configureMailer(array $newsletter = null) {
$sender['address'] = (!empty($newsletter['sender_address'])) ?
$newsletter['sender_address'] :
function configureMailer($newsletter = null) {
$sender['address'] = (!empty($newsletter->sender_address)) ?
$newsletter->sender_address :
false;
$sender['name'] = (!empty($newsletter['sender_name'])) ?
$newsletter['sender_name'] :
$sender['name'] = (!empty($newsletter->sender_name)) ?
$newsletter->sender_name :
false;
$reply_to['address'] = (!empty($newsletter['reply_to_address'])) ?
$newsletter['reply_to_address'] :
$reply_to['address'] = (!empty($newsletter->reply_to_address)) ?
$newsletter->reply_to_address :
false;
$reply_to['name'] = (!empty($newsletter['reply_to_name'])) ?
$newsletter['reply_to_name'] :
$reply_to['name'] = (!empty($newsletter->reply_to_name)) ?
$newsletter->reply_to_name :
false;
if(!$sender['address']) {
$sender = false;
@ -50,8 +50,8 @@ class Mailer {
'individual';
}
function prepareSubscriberForSending(array $subscriber) {
return $this->mailer->transformSubscriber($subscriber);
function prepareSubscriberForSending($subscriber) {
return $this->mailer->formatSubscriberNameAndEmailAddress($subscriber);
}
function send($prepared_newsletters, $prepared_subscribers) {