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

- Adds subsription tracking option to Settings->Advanced

Browse Source 
- Updates sending queue worker to not replace links if tracking is
  disabled
Closes #417
This commit is contained in:
Vlad
2016-04-13 22:00:13 -04:00
parent a3e6eb5bba
commit 84294b7ee6
5 changed files with 112 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
lib/Cron/Workers/SendingQueue.php
View File

@ -76,14 +76,19 @@ class SendingQueue {
if($queue->newsletter_rendered_body === null) {
// render newsletter
$rendered_newsletter = $this->renderNewsletter($newsletter);
// extract and replace links
$processed_newsletter = $this->processLinks(
$this->joinObject($rendered_newsletter),
$newsletter['id'],
$queue->id
);
list($newsletter['body']['html'], $newsletter['body']['text']) =
$this->splitObject($processed_newsletter);
if((int) Setting::getValue('tracking.enabled') === 1) {
// extract and replace links
$processed_newsletter = $this->processLinks(
$this->joinObject($rendered_newsletter),
$newsletter['id'],
$queue->id
);
list($newsletter['body']['html'], $newsletter['body']['text']) =
$this->splitObject($processed_newsletter);
}
else {
$newsletter['body'] = $rendered_newsletter;
}
$queue->newsletter_rendered_body = json_encode($newsletter['body']);
$queue->newsletter_rendered_body_hash = md5($newsletter['body']['text']);
$queue->save();
@ -200,12 +205,14 @@ class SendingQueue {
$subscriber,
$this->joinObject($data_for_shortcodes)
);
$processed_newsletter = $this->replaceLinks(
$newsletter['id'],
$subscriber['id'],
$queue->id,
$processed_newsletter
);
if((int) Setting::getValue('tracking.enabled') === 1) {
$processed_newsletter = $this->replaceLinks(
$newsletter['id'],
$subscriber['id'],
$queue->id,
$processed_newsletter
);
}
list($newsletter['subject'],
$newsletter['body']['html'],
$newsletter['body']['text']