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

Refactor MailPoet\Cron to use new settings

Browse Source 
[MAILPOET-1757]
This commit is contained in:
Rostislav Wolny
2019-01-30 13:57:18 +01:00
parent 6e79705128
commit ff238bf69a
21 changed files with 174 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Cron/Workers/SendingQueue/Tasks/Links.php
View File

@ -1,6 +1,7 @@
<?php
namespace MailPoet\Cron\Workers\SendingQueue\Tasks;
use MailPoet\Settings\SettingsController;
use MailPoet\Util\Helpers;
use MailPoet\Router\Router;
use MailPoet\Models\Setting;
@ -39,8 +40,8 @@ class Links {
static function getUnsubscribeUrl($queue, $subscriber_id) {
$subscriber = Subscriber::where('id', $subscriber_id)->findOne();
if((boolean)Setting::getValue('tracking.enabled')) {
$settings = new SettingsController();
if((boolean)$settings->get('tracking.enabled')) {
$link_hash = NewsletterLinkModel::where('queue_id', $queue->id)
->where('url', '[link:subscription_unsubscribe_url]')
->findOne()

6
lib/Cron/Workers/SendingQueue/Tasks/Newsletter.php
View File

@ -9,9 +9,9 @@ use MailPoet\Mailer\MailerLog;
use MailPoet\Models\Newsletter as NewsletterModel;
use MailPoet\Models\NewsletterSegment as NewsletterSegmentModel;
use MailPoet\Models\SendingQueue as SendingQueueModel;
use MailPoet\Models\Setting;
use MailPoet\Newsletter\Links\Links as NewsletterLinks;
use MailPoet\Newsletter\Renderer\PostProcess\OpenTracking;
use MailPoet\Settings\SettingsController;
use MailPoet\Util\Helpers;
use MailPoet\WP\Functions as WPFunctions;
@ -21,10 +21,12 @@ class Newsletter {
public $tracking_enabled;
public $tracking_image_inserted;
/** @var WPFunctions */
private $wp;
function __construct(WPFunctions $wp = null) {
$this->tracking_enabled = (boolean)Setting::getValue('tracking.enabled');
$settings = new SettingsController();
$this->tracking_enabled = (boolean)$settings->get('tracking.enabled');
if($wp == null) {
$wp = new WPFunctions;
}