Add space between if and ‘(‘

[MAILPOET-1791]
This commit is contained in:
Ján Mikláš
2019-02-13 13:08:49 +01:00
committed by M. Shull
parent a935b091d3
commit 3ee58aea10
333 changed files with 4001 additions and 4001 deletions

View File

@@ -11,7 +11,7 @@ use MailPoet\Router\Endpoints\Track;
use MailPoet\Newsletter\Links\Links as NewsletterLinks;
use MailPoet\Models\NewsletterLink as NewsletterLinkModel;
if(!defined('ABSPATH')) exit;
if (!defined('ABSPATH')) exit;
class Links {
static function process($rendered_newsletter, $newsletter, $queue) {
@@ -41,16 +41,16 @@ class Links {
static function getUnsubscribeUrl($queue, $subscriber_id) {
$subscriber = Subscriber::where('id', $subscriber_id)->findOne();
$settings = new SettingsController();
if((boolean)$settings->get('tracking.enabled')) {
if ((boolean)$settings->get('tracking.enabled')) {
$link_hash = NewsletterLinkModel::where('queue_id', $queue->id)
->where('url', '[link:subscription_unsubscribe_url]')
->findOne()
->hash;
$data = NewsletterLinks::createUrlDataObject(
$subscriber->id,
$subscriber->id,
$subscriber->email,
$queue->id,
$link_hash,
$queue->id,
$link_hash,
false
);
$url = Router::buildRequest(

View File

@@ -4,7 +4,7 @@ namespace MailPoet\Cron\Workers\SendingQueue\Tasks;
use MailPoet\Mailer\Mailer as MailerFactory;
use MailPoet\Mailer\MailerLog;
if(!defined('ABSPATH')) exit;
if (!defined('ABSPATH')) exit;
class Mailer {
public $mailer;
@@ -26,10 +26,10 @@ class Mailer {
$reply_to['name'] = (!empty($newsletter->reply_to_name)) ?
$newsletter->reply_to_name :
false;
if(!$sender['address']) {
if (!$sender['address']) {
$sender = false;
}
if(!$reply_to['address']) {
if (!$reply_to['address']) {
$reply_to = false;
}
$this->mailer = new MailerFactory($method = false, $sender, $reply_to);
@@ -55,7 +55,7 @@ class Mailer {
}
function sendBulk($prepared_newsletters, $prepared_subscribers, $extra_params = array()) {
if($this->getProcessingMethod() === 'individual') {
if ($this->getProcessingMethod() === 'individual') {
throw new \LogicException('Trying to send a batch with individual processing method');
}
return $this->mailer->mailer_instance->send(
@@ -66,7 +66,7 @@ class Mailer {
}
function send($prepared_newsletter, $prepared_subscriber, $extra_params = array()) {
if($this->getProcessingMethod() === 'bulk') {
if ($this->getProcessingMethod() === 'bulk') {
throw new \LogicException('Trying to send an individual email with a bulk processing method');
}
return $this->mailer->mailer_instance->send(

View File

@@ -15,7 +15,7 @@ use MailPoet\Settings\SettingsController;
use MailPoet\Util\Helpers;
use MailPoet\WP\Functions as WPFunctions;
if(!defined('ABSPATH')) exit;
if (!defined('ABSPATH')) exit;
class Newsletter {
public $tracking_enabled;
@@ -27,7 +27,7 @@ class Newsletter {
function __construct(WPFunctions $wp = null) {
$settings = new SettingsController();
$this->tracking_enabled = (boolean)$settings->get('tracking.enabled');
if($wp == null) {
if ($wp == null) {
$wp = new WPFunctions;
}
$this->wp = $wp;
@@ -44,9 +44,9 @@ class Newsletter {
)
)
->findOne();
if(!$newsletter) return false;
if (!$newsletter) return false;
// if this is a notification history, get existing active or sending parent newsletter
if($newsletter->type == NewsletterModel::TYPE_NOTIFICATION_HISTORY) {
if ($newsletter->type == NewsletterModel::TYPE_NOTIFICATION_HISTORY) {
$parent_newsletter = $newsletter->parent()
->whereNull('deleted_at')
->whereAnyIs(
@@ -56,20 +56,20 @@ class Newsletter {
)
)
->findOne();
if(!$parent_newsletter) return false;
if (!$parent_newsletter) return false;
}
return $newsletter;
}
function preProcessNewsletter(\MailPoet\Models\Newsletter $newsletter, $queue) {
// return the newsletter if it was previously rendered
if(!is_null($queue->getNewsletterRenderedBody())) {
if (!is_null($queue->getNewsletterRenderedBody())) {
return (!$queue->validate()) ?
$this->stopNewsletterPreProcessing(sprintf('QUEUE-%d-RENDER', $queue->id)) :
$newsletter;
}
// if tracking is enabled, do additional processing
if($this->tracking_enabled) {
if ($this->tracking_enabled) {
// hook to the newsletter post-processing filter and add tracking image
$this->tracking_image_inserted = OpenTracking::addTrackingImage();
// render newsletter
@@ -92,7 +92,7 @@ class Newsletter {
}
// check if this is a post notification and if it contains posts
$newsletter_contains_posts = strpos($rendered_newsletter['html'], 'data-post-id');
if($newsletter->type === NewsletterModel::TYPE_NOTIFICATION_HISTORY &&
if ($newsletter->type === NewsletterModel::TYPE_NOTIFICATION_HISTORY &&
!$newsletter_contains_posts
) {
// delete notification history record since it will never be sent
@@ -111,19 +111,19 @@ class Newsletter {
);
// if the rendered subject is empty, use a default subject,
// having no subject in a newsletter is considered spammy
if(empty(trim($queue->newsletter_rendered_subject))) {
if (empty(trim($queue->newsletter_rendered_subject))) {
$queue->newsletter_rendered_subject = __('No subject', 'mailpoet');
}
$queue->newsletter_rendered_body = $rendered_newsletter;
$queue->save();
// catch DB errors
$queue_errors = $queue->getErrors();
if(!$queue_errors) {
if (!$queue_errors) {
// verify that the rendered body was successfully saved
$queue = SendingQueueModel::findOne($queue->id);
$queue_errors = ($queue->validate() !== true);
}
if($queue_errors) {
if ($queue_errors) {
$this->stopNewsletterPreProcessing(sprintf('QUEUE-%d-SAVE', $queue->id));
}
return $newsletter;
@@ -147,7 +147,7 @@ class Newsletter {
$subscriber,
$queue
);
if($this->tracking_enabled) {
if ($this->tracking_enabled) {
$prepared_newsletter = NewsletterLinks::replaceSubscriberData(
$subscriber->id,
$queue->id,
@@ -166,7 +166,7 @@ class Newsletter {
function markNewsletterAsSent($newsletter, $queue) {
// if it's a standard or notification history newsletter, update its status
if($newsletter->type === NewsletterModel::TYPE_STANDARD ||
if ($newsletter->type === NewsletterModel::TYPE_STANDARD ||
$newsletter->type === NewsletterModel::TYPE_NOTIFICATION_HISTORY
) {
$newsletter->status = NewsletterModel::STATUS_SENT;

View File

@@ -4,11 +4,11 @@ namespace MailPoet\Cron\Workers\SendingQueue\Tasks;
use MailPoet\Models\Newsletter as NewsletterModel;
use MailPoet\Models\NewsletterPost;
if(!defined('ABSPATH')) exit;
if (!defined('ABSPATH')) exit;
class Posts {
static function extractAndSave($rendered_newsletter, $newsletter) {
if($newsletter->type !== NewsletterModel::TYPE_NOTIFICATION_HISTORY) {
if ($newsletter->type !== NewsletterModel::TYPE_NOTIFICATION_HISTORY) {
return false;
}
preg_match_all(
@@ -16,7 +16,7 @@ class Posts {
$rendered_newsletter['html'],
$matched_posts_ids);
$matched_posts_ids = $matched_posts_ids[1];
if(!count($matched_posts_ids)) {
if (!count($matched_posts_ids)) {
return false;
}
$newsletter_id = $newsletter->parent_id; // parent post notification

View File

@@ -4,11 +4,11 @@ namespace MailPoet\Cron\Workers\SendingQueue\Tasks;
use MailPoet\Newsletter\Shortcodes\Shortcodes as NewsletterShortcodes;
if(!defined('ABSPATH')) exit;
if (!defined('ABSPATH')) exit;
class Shortcodes {
static function process($content, $content_source = null, $newsletter = null, $subscriber = null, $queue = null) {
$shortcodes = new NewsletterShortcodes($newsletter, $subscriber, $queue);
return $shortcodes->replace($content, $content_source);
}
}
}