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

Add space between if and ‘(‘

Browse Source 
[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
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/API/JSON/v1/AutomatedLatestContent.php
View File

@ -7,7 +7,7 @@ use MailPoet\Config\AccessControl;
use MailPoet\WP\Functions as WPFunctions;
use MailPoet\WP\Posts as WPPosts;
if(!defined('ABSPATH')) exit;
if (!defined('ABSPATH')) exit;
class AutomatedLatestContent extends APIEndpoint {
/** @var \MailPoet\Newsletter\AutomatedLatestContent */

10
lib/API/JSON/v1/CustomFields.php
View File

@ -7,7 +7,7 @@ use MailPoet\API\JSON\Error as APIError;
use MailPoet\Config\AccessControl;
use MailPoet\Models\CustomField;
if(!defined('ABSPATH')) exit;
if (!defined('ABSPATH')) exit;
class CustomFields extends APIEndpoint {
public $permissions = array(
@ -26,7 +26,7 @@ class CustomFields extends APIEndpoint {
function delete($data = array()) {
$id = (isset($data['id']) ? (int)$data['id'] : null);
$custom_field = CustomField::findOne($id);
if($custom_field === false) {
if ($custom_field === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This custom field does not exist.', 'mailpoet')
));
@ -41,7 +41,7 @@ class CustomFields extends APIEndpoint {
$custom_field = CustomField::createOrUpdate($data);
$errors = $custom_field->getErrors();
if(!empty($errors)) {
if (!empty($errors)) {
return $this->badRequest($errors);
} else {
return $this->successResponse(
@ -53,7 +53,7 @@ class CustomFields extends APIEndpoint {
function get($data = array()) {
$id = (isset($data['id']) ? (int)$data['id'] : null);
$custom_field = CustomField::findOne($id);
if($custom_field === false) {
if ($custom_field === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This custom field does not exist.', 'mailpoet')
));
@ -61,4 +61,4 @@ class CustomFields extends APIEndpoint {
return $this->successResponse($custom_field->asArray());
}
}
}
}

30
lib/API/JSON/v1/Forms.php
View File

@ -11,7 +11,7 @@ use MailPoet\Listing;
use MailPoet\Models\Form;
use MailPoet\Models\StatisticsForms;
if(!defined('ABSPATH')) exit;
if (!defined('ABSPATH')) exit;
class Forms extends APIEndpoint {
@ -36,7 +36,7 @@ class Forms extends APIEndpoint {
function get($data = array()) {
$id = (isset($data['id']) ? (int)$data['id'] : false);
$form = Form::findOne($id);
if($form === false) {
if ($form === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This form does not exist.', 'mailpoet')
));
@ -110,7 +110,7 @@ class Forms extends APIEndpoint {
$form = Form::createOrUpdate($data);
$errors = $form->getErrors();
if(!empty($errors)) {
if (!empty($errors)) {
return $this->badRequest($errors);
} else {
return $this->successResponse(
@ -138,7 +138,7 @@ class Forms extends APIEndpoint {
function exportsEditor($data = array()) {
$id = (isset($data['id']) ? (int)$data['id'] : false);
$form = Form::findOne($id);
if($form === false) {
if ($form === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This form does not exist.', 'mailpoet')
));
@ -160,9 +160,9 @@ class Forms extends APIEndpoint {
// check if the form is used as a widget
$is_widget = false;
$widgets = get_option('widget_mailpoet_form');
if(!empty($widgets)) {
if (!empty($widgets)) {
foreach ($widgets as $widget) {
if(isset($widget['form']) && (int)$widget['form'] === $form_id) {
if (isset($widget['form']) && (int)$widget['form'] === $form_id) {
$is_widget = true;
break;
}
@ -174,9 +174,9 @@ class Forms extends APIEndpoint {
$has_segment_selection = false;
$list_selection = [];
foreach ($body as $i => $block) {
if($block['type'] === 'segment') {
if ($block['type'] === 'segment') {
$has_segment_selection = true;
if(!empty($block['params']['values'])) {
if (!empty($block['params']['values'])) {
$list_selection = array_filter(
array_map(function($segment) {
return (isset($segment['id'])
@ -191,7 +191,7 @@ class Forms extends APIEndpoint {
}
// check list selection
if($has_segment_selection === true) {
if ($has_segment_selection === true) {
$settings['segments_selected_by'] = 'user';
$settings['segments'] = $list_selection;
} else {
@ -208,7 +208,7 @@ class Forms extends APIEndpoint {
$errors = $form->getErrors();
if(!empty($errors)) {
if (!empty($errors)) {
return $this->badRequest($errors);
} else {
return $this->successResponse(
@ -221,7 +221,7 @@ class Forms extends APIEndpoint {
function restore($data = array()) {
$id = (isset($data['id']) ? (int)$data['id'] : false);
$form = Form::findOne($id);
if($form === false) {
if ($form === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This form does not exist.', 'mailpoet')
));
@ -237,7 +237,7 @@ class Forms extends APIEndpoint {
function trash($data = array()) {
$id = (isset($data['id']) ? (int)$data['id'] : false);
$form = Form::findOne($id);
if($form === false) {
if ($form === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This form does not exist.', 'mailpoet')
));
@ -253,7 +253,7 @@ class Forms extends APIEndpoint {
function delete($data = array()) {
$id = (isset($data['id']) ? (int)$data['id'] : false);
$form = Form::findOne($id);
if($form === false) {
if ($form === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This form does not exist.', 'mailpoet')
));
@ -267,7 +267,7 @@ class Forms extends APIEndpoint {
$id = (isset($data['id']) ? (int)$data['id'] : false);
$form = Form::findOne($id);
if($form === false) {
if ($form === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This form does not exist.', 'mailpoet')
));
@ -278,7 +278,7 @@ class Forms extends APIEndpoint {
$duplicate = $form->duplicate($data);
$errors = $duplicate->getErrors();
if(!empty($errors)) {
if (!empty($errors)) {
return $this->errorResponse($errors);
} else {
return $this->successResponse(

4
lib/API/JSON/v1/ImportExport.php
View File

@ -7,7 +7,7 @@ use MailPoet\Config\AccessControl;
use MailPoet\Models\Segment;
use MailPoet\Subscribers\ImportExport\Import\MailChimp;
if(!defined('ABSPATH')) exit;
if (!defined('ABSPATH')) exit;
class ImportExport extends APIEndpoint {
public $permissions = array(
@ -42,7 +42,7 @@ class ImportExport extends APIEndpoint {
$segment = Segment::createOrUpdate($data);
$errors = $segment->getErrors();
if(!empty($errors)) {
if (!empty($errors)) {
return $this->errorResponse($errors);
} else {
return $this->successResponse(

2
lib/API/JSON/v1/MP2Migrator.php
View File

@ -5,7 +5,7 @@ namespace MailPoet\API\JSON\v1;
use MailPoet\API\JSON\Endpoint as APIEndpoint;
use MailPoet\Config\AccessControl;
if(!defined('ABSPATH')) exit;
if (!defined('ABSPATH')) exit;
class MP2Migrator extends APIEndpoint {
public $permissions = array(

4
lib/API/JSON/v1/Mailer.php
View File

@ -7,7 +7,7 @@ use MailPoet\API\JSON\Error as APIError;
use MailPoet\Config\AccessControl;
use MailPoet\Mailer\MailerLog;
if(!defined('ABSPATH')) exit;
if (!defined('ABSPATH')) exit;
class Mailer extends APIEndpoint {
public $permissions = array(
@ -28,7 +28,7 @@ class Mailer extends APIEndpoint {
));
}
if($result['response'] === false) {
if ($result['response'] === false) {
$error = sprintf(
__('The email could not be sent: %s', 'mailpoet'),
$result['error']->getMessage()

12
lib/API/JSON/v1/NewsletterTemplates.php
View File

@ -7,7 +7,7 @@ use MailPoet\API\JSON\Error as APIError;
use MailPoet\Config\AccessControl;
use MailPoet\Models\NewsletterTemplate;
if(!defined('ABSPATH')) exit;
if (!defined('ABSPATH')) exit;
class NewsletterTemplates extends APIEndpoint {
public $permissions = array(
@ -17,7 +17,7 @@ class NewsletterTemplates extends APIEndpoint {
function get($data = array()) {
$id = (isset($data['id']) ? (int)$data['id'] : false);
$template = NewsletterTemplate::findOne($id);
if($template === false) {
if ($template === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This template does not exist.', 'mailpoet')
));
@ -43,9 +43,9 @@ class NewsletterTemplates extends APIEndpoint {
}
function save($data = array()) {
if(!empty($data['newsletter_id'])) {
if (!empty($data['newsletter_id'])) {
$template = NewsletterTemplate::whereEqual('newsletter_id', $data['newsletter_id'])->findOne();
if(!empty($template)) {
if (!empty($template)) {
$data['id'] = $template->id;
}
}
@ -55,7 +55,7 @@ class NewsletterTemplates extends APIEndpoint {
NewsletterTemplate::cleanRecentlySent($data);
if(!empty($errors)) {
if (!empty($errors)) {
return $this->errorResponse($errors);
} else {
return $this->successResponse(
@ -67,7 +67,7 @@ class NewsletterTemplates extends APIEndpoint {
function delete($data = array()) {
$id = (isset($data['id']) ? (int)$data['id'] : false);
$template = NewsletterTemplate::findOne($id);
if($template === false) {
if ($template === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This template does not exist.', 'mailpoet')
));

78
lib/API/JSON/v1/Newsletters.php
View File

@ -23,7 +23,7 @@ use MailPoet\Newsletter\Url as NewsletterUrl;
use MailPoet\Settings\SettingsController;
use MailPoet\WP\Functions as WPFunctions;
if(!defined('ABSPATH')) exit;
if (!defined('ABSPATH')) exit;
class Newsletters extends APIEndpoint {
@ -58,7 +58,7 @@ class Newsletters extends APIEndpoint {
function get($data = array()) {
$id = (isset($data['id']) ? (int)$data['id'] : false);
$newsletter = Newsletter::findOne($id);
if($newsletter === false) {
if ($newsletter === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This newsletter does not exist.', 'mailpoet')
));
@ -77,20 +77,20 @@ class Newsletters extends APIEndpoint {
$data = $this->wp->applyFilters('mailpoet_api_newsletters_save_before', $data);
$segments = array();
if(isset($data['segments'])) {
if (isset($data['segments'])) {
$segments = $data['segments'];
unset($data['segments']);
}
$options = array();
if(isset($data['options'])) {
if (isset($data['options'])) {
$options = $data['options'];
unset($data['options']);
}
if(!empty($data['template_id'])) {
if (!empty($data['template_id'])) {
$template = NewsletterTemplate::whereEqual('id', $data['template_id'])->findOne();
if(!empty($template)) {
if (!empty($template)) {
$template = $template->asArray();
$data['body'] = $template['body'];
}
@ -100,16 +100,16 @@ class Newsletters extends APIEndpoint {
$newsletter = Newsletter::createOrUpdate($data);
$errors = $newsletter->getErrors();
if(!empty($errors)) return $this->badRequest($errors);
if (!empty($errors)) return $this->badRequest($errors);
// Re-fetch newsletter to sync changes made by DB
// updated_at column use CURRENT_TIMESTAMP for update and this change is not updated automatically by ORM
$newsletter = Newsletter::findOne($newsletter->id);
if(!empty($segments)) {
if (!empty($segments)) {
NewsletterSegment::where('newsletter_id', $newsletter->id)
->deleteMany();
foreach ($segments as $segment) {
if(!is_array($segment)) continue;
if (!is_array($segment)) continue;
$relation = NewsletterSegment::create();
$relation->segment_id = (int)$segment['id'];
$relation->newsletter_id = $newsletter->id;
@ -117,18 +117,18 @@ class Newsletters extends APIEndpoint {
}
}
if(isset($data['sender_address']) && isset($data['sender_name'])) {
if (isset($data['sender_address']) && isset($data['sender_name'])) {
Setting::saveDefaultSenderIfNeeded($data['sender_address'], $data['sender_name']);
}
if(!empty($options)) {
if (!empty($options)) {
$option_fields = NewsletterOptionField::where(
'newsletter_type',
$newsletter->type
)->findMany();
// update newsletter options
foreach ($option_fields as $option_field) {
if(isset($options[$option_field->name])) {
if (isset($options[$option_field->name])) {
$newsletter_option = NewsletterOption::createOrUpdate(
array(
'newsletter_id' => $newsletter->id,
@ -141,7 +141,7 @@ class Newsletters extends APIEndpoint {
// reload newsletter with updated options
$newsletter = Newsletter::filter('filterWithOptions', $newsletter->type)->findOne($newsletter->id);
// if this is a post notification, process newsletter options and update its schedule
if($newsletter->type === Newsletter::TYPE_NOTIFICATION) {
if ($newsletter->type === Newsletter::TYPE_NOTIFICATION) {
// generate the new schedule from options and get the new "next run" date
$newsletter->schedule = Scheduler::processPostNotificationSchedule($newsletter);
$next_run_date = Scheduler::getNextRunDate($newsletter->schedule);
@ -155,9 +155,9 @@ class Newsletters extends APIEndpoint {
}
$queue = $newsletter->getQueue();
if($queue && !in_array($newsletter->type, array(Newsletter::TYPE_NOTIFICATION, Newsletter::TYPE_NOTIFICATION_HISTORY))) {
if ($queue && !in_array($newsletter->type, array(Newsletter::TYPE_NOTIFICATION, Newsletter::TYPE_NOTIFICATION_HISTORY))) {
// if newsletter was previously scheduled and is now unscheduled, set its status to DRAFT and delete associated queue record
if($newsletter->status === Newsletter::STATUS_SCHEDULED && isset($options['isScheduled']) && empty($options['isScheduled'])) {
if ($newsletter->status === Newsletter::STATUS_SCHEDULED && isset($options['isScheduled']) && empty($options['isScheduled'])) {
$queue->delete();
$newsletter->status = Newsletter::STATUS_DRAFT;
$newsletter->save();
@ -183,7 +183,7 @@ class Newsletters extends APIEndpoint {
function setStatus($data = array()) {
$status = (isset($data['status']) ? $data['status'] : null);
if(!$status) {
if (!$status) {
return $this->badRequest(array(
APIError::BAD_REQUEST => __('You need to specify a status.', 'mailpoet')
));
@ -192,7 +192,7 @@ class Newsletters extends APIEndpoint {
$id = (isset($data['id'])) ? (int)$data['id'] : false;
$newsletter = Newsletter::findOneWithOptions($id);
if($newsletter === false) {
if ($newsletter === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This newsletter does not exist.', 'mailpoet')
));
@ -201,15 +201,15 @@ class Newsletters extends APIEndpoint {
$newsletter->setStatus($status);
$errors = $newsletter->getErrors();
if(!empty($errors)) {
if (!empty($errors)) {
return $this->errorResponse($errors);
}
// if there are past due notifications, reschedule them for the next send date
if($newsletter->type === Newsletter::TYPE_NOTIFICATION && $status === Newsletter::STATUS_ACTIVE) {
if ($newsletter->type === Newsletter::TYPE_NOTIFICATION && $status === Newsletter::STATUS_ACTIVE) {
$next_run_date = Scheduler::getNextRunDate($newsletter->schedule);
$queue = $newsletter->queue()->findOne();
if($queue) {
if ($queue) {
$queue->task()
->whereLte('scheduled_at', Carbon::createFromTimestamp($this->wp->currentTime('timestamp')))
->where('status', SendingQueue::STATUS_SCHEDULED)
@ -229,7 +229,7 @@ class Newsletters extends APIEndpoint {
function restore($data = array()) {
$id = (isset($data['id']) ? (int)$data['id'] : false);
$newsletter = Newsletter::findOne($id);
if($newsletter === false) {
if ($newsletter === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This newsletter does not exist.', 'mailpoet')
));
@ -245,7 +245,7 @@ class Newsletters extends APIEndpoint {
function trash($data = array()) {
$id = (isset($data['id']) ? (int)$data['id'] : false);
$newsletter = Newsletter::findOne($id);
if($newsletter === false) {
if ($newsletter === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This newsletter does not exist.', 'mailpoet')
));
@ -261,7 +261,7 @@ class Newsletters extends APIEndpoint {
function delete($data = array()) {
$id = (isset($data['id']) ? (int)$data['id'] : false);
$newsletter = Newsletter::findOne($id);
if($newsletter === false) {
if ($newsletter === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This newsletter does not exist.', 'mailpoet')
));
@ -275,7 +275,7 @@ class Newsletters extends APIEndpoint {
$id = (isset($data['id']) ? (int)$data['id'] : false);
$newsletter = Newsletter::findOne($id);
if($newsletter === false) {
if ($newsletter === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This newsletter does not exist.', 'mailpoet')
));
@ -286,7 +286,7 @@ class Newsletters extends APIEndpoint {
$duplicate = $newsletter->duplicate($data);
$errors = $duplicate->getErrors();
if(!empty($errors)) {
if (!empty($errors)) {
return $this->errorResponse($errors);
} else {
$this->wp->doAction('mailpoet_api_newsletters_duplicate_after', $newsletter, $duplicate);
@ -299,7 +299,7 @@ class Newsletters extends APIEndpoint {
}
function showPreview($data = array()) {
if(empty($data['body'])) {
if (empty($data['body'])) {
return $this->badRequest(array(
APIError::BAD_REQUEST => __('Newsletter data is missing.', 'mailpoet')
));
@ -308,7 +308,7 @@ class Newsletters extends APIEndpoint {
$id = (isset($data['id'])) ? (int)$data['id'] : false;
$newsletter = Newsletter::findOne($id);
if($newsletter === false) {
if ($newsletter === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This newsletter does not exist.', 'mailpoet')
));
@ -332,7 +332,7 @@ class Newsletters extends APIEndpoint {
}
function sendPreview($data = array()) {
if(empty($data['subscriber'])) {
if (empty($data['subscriber'])) {
return $this->badRequest(array(
APIError::BAD_REQUEST => __('Please specify receiver information.', 'mailpoet')
));
@ -341,7 +341,7 @@ class Newsletters extends APIEndpoint {
$id = (isset($data['id'])) ? (int)$data['id'] : false;
$newsletter = Newsletter::findOne($id);
if($newsletter === false) {
if ($newsletter === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This newsletter does not exist.', 'mailpoet')
));
@ -383,7 +383,7 @@ class Newsletters extends APIEndpoint {
$extra_params = array('unsubscribe_url' => home_url());
$result = $mailer->send($rendered_newsletter, $data['subscriber'], $extra_params);
if($result['response'] === false) {
if ($result['response'] === false) {
$error = sprintf(
__('The email could not be sent: %s', 'mailpoet'),
$result['error']->getMessage()
@ -409,7 +409,7 @@ class Newsletters extends APIEndpoint {
foreach ($listing_data['items'] as $newsletter) {
$queue = false;
if($newsletter->type === Newsletter::TYPE_STANDARD) {
if ($newsletter->type === Newsletter::TYPE_STANDARD) {
$newsletter
->withSegments(true)
->withSendingQueue()
@ -432,7 +432,7 @@ class Newsletters extends APIEndpoint {
->withStatistics();
}
if($newsletter->status === Newsletter::STATUS_SENT ||
if ($newsletter->status === Newsletter::STATUS_SENT ||
$newsletter->status === Newsletter::STATUS_SENDING
) {
$queue = $newsletter->getQueue();
@ -473,7 +473,7 @@ class Newsletters extends APIEndpoint {
function create($data = array()) {
$options = array();
if(isset($data['options'])) {
if (isset($data['options'])) {
$options = $data['options'];
unset($data['options']);
}
@ -481,13 +481,13 @@ class Newsletters extends APIEndpoint {
$newsletter = Newsletter::createOrUpdate($data);
$errors = $newsletter->getErrors();
if(!empty($errors)) {
if (!empty($errors)) {
return $this->badRequest($errors);
} else {
// try to load template data
$template_id = (isset($data['template']) ? (int)$data['template'] : false);
$template = NewsletterTemplate::findOne($template_id);
if($template === false) {
if ($template === false) {
$newsletter->body = array();
} else {
$newsletter->body = $template->body;
@ -496,16 +496,16 @@ class Newsletters extends APIEndpoint {
$newsletter->save();
$errors = $newsletter->getErrors();
if(!empty($errors)) {
if (!empty($errors)) {
return $this->badRequest($errors);
} else {
if(!empty($options)) {
if (!empty($options)) {
$option_fields = NewsletterOptionField::where(
'newsletter_type', $newsletter->type
)->findArray();
foreach ($option_fields as $option_field) {
if(isset($options[$option_field['name']])) {
if (isset($options[$option_field['name']])) {
$relation = NewsletterOption::create();
$relation->newsletter_id = $newsletter->id;
$relation->option_field_id = $option_field['id'];
@ -515,7 +515,7 @@ class Newsletters extends APIEndpoint {
}
}
if(
if (
empty($data['id'])
&&
isset($data['type'])

16
lib/API/JSON/v1/Segments.php
View File

@ -9,7 +9,7 @@ use MailPoet\Listing;
use MailPoet\Models\Segment;
use MailPoet\Segments\WP;
if(!defined('ABSPATH')) exit;
if (!defined('ABSPATH')) exit;
class Segments extends APIEndpoint {
public $permissions = array(
@ -33,7 +33,7 @@ class Segments extends APIEndpoint {
function get($data = array()) {
$id = (isset($data['id']) ? (int)$data['id'] : false);
$segment = Segment::findOne($id);
if($segment === false) {
if ($segment === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This list does not exist.', 'mailpoet')
));
@ -67,7 +67,7 @@ class Segments extends APIEndpoint {
$segment = Segment::createOrUpdate($data);
$errors = $segment->getErrors();
if(!empty($errors)) {
if (!empty($errors)) {
return $this->badRequest($errors);
} else {
return $this->successResponse(
@ -79,7 +79,7 @@ class Segments extends APIEndpoint {
function restore($data = array()) {
$id = (isset($data['id']) ? (int)$data['id'] : false);
$segment = Segment::findOne($id);
if($segment === false) {
if ($segment === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This list does not exist.', 'mailpoet')
));
@ -95,7 +95,7 @@ class Segments extends APIEndpoint {
function trash($data = array()) {
$id = (isset($data['id']) ? (int)$data['id'] : false);
$segment = Segment::findOne($id);
if($segment === false) {
if ($segment === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This list does not exist.', 'mailpoet')
));
@ -111,7 +111,7 @@ class Segments extends APIEndpoint {
function delete($data = array()) {
$id = (isset($data['id']) ? (int)$data['id'] : false);
$segment = Segment::findOne($id);
if($segment === false) {
if ($segment === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This list does not exist.', 'mailpoet')
));
@ -125,7 +125,7 @@ class Segments extends APIEndpoint {
$id = (isset($data['id']) ? (int)$data['id'] : false);
$segment = Segment::findOne($id);
if($segment === false) {
if ($segment === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This list does not exist.', 'mailpoet')
));
@ -136,7 +136,7 @@ class Segments extends APIEndpoint {
$duplicate = $segment->duplicate($data);
$errors = $duplicate->getErrors();
if(!empty($errors)) {
if (!empty($errors)) {
return $this->errorResponse($errors);
} else {
return $this->successResponse(

22
lib/API/JSON/v1/SendingQueue.php
View File

@ -11,7 +11,7 @@ use MailPoet\Newsletter\Scheduler\Scheduler;
use MailPoet\Segments\SubscribersFinder;
use MailPoet\Tasks\Sending as SendingTask;
if(!defined('ABSPATH')) exit;
if (!defined('ABSPATH')) exit;
class SendingQueue extends APIEndpoint {
public $permissions = array(
@ -27,7 +27,7 @@ class SendingQueue extends APIEndpoint {
// check that the newsletter exists
$newsletter = Newsletter::findOneWithOptions($newsletter_id);
if($newsletter === false) {
if ($newsletter === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This newsletter does not exist.', 'mailpoet')
));
@ -48,7 +48,7 @@ class SendingQueue extends APIEndpoint {
->whereNull('tasks.status')
->findOne();
if(!empty($queue)) {
if (!empty($queue)) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This newsletter is already being sent.', 'mailpoet')
));
@ -58,14 +58,14 @@ class SendingQueue extends APIEndpoint {
->where('queues.newsletter_id', $newsletter->id)
->where('tasks.status', SendingQueueModel::STATUS_SCHEDULED)
->findOne();
if($scheduled_queue) {
if ($scheduled_queue) {
$queue = SendingTask::createFromQueue($scheduled_queue);
} else {
$queue = SendingTask::create();
$queue->newsletter_id = $newsletter->id;
}
if((bool)$newsletter->isScheduled) {
if ((bool)$newsletter->isScheduled) {
// set newsletter status
$newsletter->setStatus(Newsletter::STATUS_SCHEDULED);
@ -76,7 +76,7 @@ class SendingQueue extends APIEndpoint {
$segments = $newsletter->segments()->findMany();
$finder = new SubscribersFinder();
$subscribers_count = $finder->addSubscribersToTaskFromSegments($queue->task(), $segments);
if(!$subscribers_count) {
if (!$subscribers_count) {
return $this->errorResponse(array(
APIError::UNKNOWN => __('There are no subscribers in that list!', 'mailpoet')
));
@ -91,7 +91,7 @@ class SendingQueue extends APIEndpoint {
$queue->save();
$errors = $queue->getErrors();
if(!empty($errors)) {
if (!empty($errors)) {
return $this->errorResponse($errors);
} else {
return $this->successResponse(
@ -107,14 +107,14 @@ class SendingQueue extends APIEndpoint {
);
$newsletter = Newsletter::findOne($newsletter_id);
if($newsletter === false) {
if ($newsletter === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This newsletter does not exist.', 'mailpoet')
));
} else {
$queue = $newsletter->getQueue();
if($queue === false) {
if ($queue === false) {
return $this->errorResponse(array(
APIError::UNKNOWN => __('This newsletter has not been sent yet.', 'mailpoet')
));
@ -133,14 +133,14 @@ class SendingQueue extends APIEndpoint {
: false
);
$newsletter = Newsletter::findOne($newsletter_id);
if($newsletter === false) {
if ($newsletter === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This newsletter does not exist.', 'mailpoet')
));
} else {
$queue = $newsletter->getQueue();
if($queue === false) {
if ($queue === false) {
return $this->errorResponse(array(
APIError::UNKNOWN => __('This newsletter has not been sent yet.', 'mailpoet')
));

20
lib/API/JSON/v1/Services.php
View File

@ -11,7 +11,7 @@ use MailPoet\Models\Setting;
use MailPoet\Services\Bridge;
use MailPoet\WP\DateTime;
if(!defined('ABSPATH')) exit;
if (!defined('ABSPATH')) exit;
class Services extends APIEndpoint {
public $bridge;
@ -28,7 +28,7 @@ class Services extends APIEndpoint {
function checkMSSKey($data = array()) {
$key = isset($data['key']) ? trim($data['key']) : null;
if(!$key) {
if (!$key) {
return $this->badRequest(array(
APIError::BAD_REQUEST => __('Please specify a key.', 'mailpoet')
));
@ -46,7 +46,7 @@ class Services extends APIEndpoint {
$state = !empty($result['state']) ? $result['state'] : null;
$success_message = null;
if($state == Bridge::KEY_VALID) {
if ($state == Bridge::KEY_VALID) {
$success_message = __('Your MailPoet Sending Service key has been successfully validated.', 'mailpoet');
} elseif ($state == Bridge::KEY_EXPIRING) {
$success_message = sprintf(
@ -55,11 +55,11 @@ class Services extends APIEndpoint {
);
}
if(!empty($result['data']['public_id'])) {
if (!empty($result['data']['public_id'])) {
Analytics::setPublicId($result['data']['public_id']);
}
if($success_message) {
if ($success_message) {
return $this->successResponse(array('message' => $success_message));
}
@ -74,7 +74,7 @@ class Services extends APIEndpoint {
$code = !empty($result['code']) ? $result['code'] : Bridge::CHECK_ERROR_UNKNOWN;
$errorMessage = __('Error validating MailPoet Sending Service key, please try again later (%s).', 'mailpoet');
// If site runs on localhost
if( 1 === preg_match("/^(http|https)\:\/\/(localhost|127\.0\.0\.1)/", site_url()) ) {
if ( 1 === preg_match("/^(http|https)\:\/\/(localhost|127\.0\.0\.1)/", site_url()) ) {
$errorMessage .= ' ' . __("Note that it doesn't work on localhost.", 'mailpoet');
}
$error = sprintf(
@ -90,7 +90,7 @@ class Services extends APIEndpoint {
function checkPremiumKey($data = array()) {
$key = isset($data['key']) ? trim($data['key']) : null;
if(!$key) {
if (!$key) {
return $this->badRequest(array(
APIError::BAD_REQUEST => __('Please specify a key.', 'mailpoet')
));
@ -108,7 +108,7 @@ class Services extends APIEndpoint {
$state = !empty($result['state']) ? $result['state'] : null;
$success_message = null;
if($state == Bridge::KEY_VALID) {
if ($state == Bridge::KEY_VALID) {
$success_message = __('Your Premium key has been successfully validated.', 'mailpoet');
} elseif ($state == Bridge::KEY_EXPIRING) {
$success_message = sprintf(
@ -117,11 +117,11 @@ class Services extends APIEndpoint {
);
}
if(!empty($result['data']['public_id'])) {
if (!empty($result['data']['public_id'])) {
Analytics::setPublicId($result['data']['public_id']);
}
if($success_message) {
if ($success_message) {
return $this->successResponse(
array('message' => $success_message),
Installer::getPremiumStatus()

4
lib/API/JSON/v1/Settings.php
View File

@ -9,7 +9,7 @@ use MailPoet\Models\Setting;
use MailPoet\Services\Bridge;
use MailPoet\Settings\SettingsController;
if(!defined('ABSPATH')) exit;
if (!defined('ABSPATH')) exit;
class Settings extends APIEndpoint {
@ -29,7 +29,7 @@ class Settings extends APIEndpoint {
}
function set($settings = array()) {
if(empty($settings)) {
if (empty($settings)) {
return $this->badRequest(
array(
APIError::BAD_REQUEST =>

2
lib/API/JSON/v1/Setup.php
View File

@ -8,7 +8,7 @@ use MailPoet\Config\AccessControl;
use MailPoet\Config\Activator;
use MailPoet\Settings\SettingsController;
if(!defined('ABSPATH')) exit;
if (!defined('ABSPATH')) exit;
class Setup extends APIEndpoint {
private $wp;

46
lib/API/JSON/v1/Subscribers.php
View File

@ -19,7 +19,7 @@ use MailPoet\Subscribers\Source;
use MailPoet\Subscription\Throttling as SubscriptionThrottling;
use MailPoet\WP\Functions as WPFunctions;
if(!defined('ABSPATH')) exit;
if (!defined('ABSPATH')) exit;
class Subscribers extends APIEndpoint {
const SUBSCRIPTION_LIMIT_COOLDOWN = 60;
@ -66,7 +66,7 @@ class Subscribers extends APIEndpoint {
function get($data = array()) {
$id = (isset($data['id']) ? (int)$data['id'] : false);
$subscriber = Subscriber::findOne($id);
if($subscriber === false) {
if ($subscriber === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This subscriber does not exist.', 'mailpoet')
));
@ -82,7 +82,7 @@ class Subscribers extends APIEndpoint {
function listing($data = array()) {
if(!isset($data['filter']['segment'])) {
if (!isset($data['filter']['segment'])) {
$listing_data = $this->listing_handler->get('\MailPoet\Models\Subscriber', $data);
} else {
$listing_data = $this->subscribers_listings->getListingsInSegment($data);
@ -113,24 +113,24 @@ class Subscribers extends APIEndpoint {
$recaptcha = $this->settings->get('re_captcha');
if(!$form) {
if (!$form) {
return $this->badRequest(array(
APIError::BAD_REQUEST => __('Please specify a valid form ID.', 'mailpoet')
));
}
if(!empty($data['email'])) {
if (!empty($data['email'])) {
return $this->badRequest(array(
APIError::BAD_REQUEST => __('Please leave the first field empty.', 'mailpoet')
));
}
if(!empty($recaptcha['enabled']) && empty($data['recaptcha'])) {
if (!empty($recaptcha['enabled']) && empty($data['recaptcha'])) {
return $this->badRequest(array(
APIError::BAD_REQUEST => __('Please check the CAPTCHA.', 'mailpoet')
));
}
if(!empty($recaptcha['enabled'])) {
if (!empty($recaptcha['enabled'])) {
$res = empty($data['recaptcha']) ? $data['recaptcha-no-js'] : $data['recaptcha'];
$res = wp_remote_post('https://www.google.com/recaptcha/api/siteverify', array(
'body' => array(
@ -138,13 +138,13 @@ class Subscribers extends APIEndpoint {
'response' => $res
)
));
if(is_wp_error($res)) {
if (is_wp_error($res)) {
return $this->badRequest(array(
APIError::BAD_REQUEST => __('Error while validating the CAPTCHA.', 'mailpoet')
));
}
$res = json_decode(wp_remote_retrieve_body($res));
if(empty($res->success)) {
if (empty($res->success)) {
return $this->badRequest(array(
APIError::BAD_REQUEST => __('Error while validating the CAPTCHA.', 'mailpoet')
));
@ -166,7 +166,7 @@ class Subscribers extends APIEndpoint {
$segment_ids = $form->filterSegments($segment_ids);
unset($data['segments']);
if(empty($segment_ids)) {
if (empty($segment_ids)) {
return $this->badRequest(array(
APIError::BAD_REQUEST => __('Please select a list.', 'mailpoet')
));
@ -179,26 +179,26 @@ class Subscribers extends APIEndpoint {
// make sure we don't allow too many subscriptions with the same ip address
$timeout = SubscriptionThrottling::throttle();
if($timeout > 0) {
if ($timeout > 0) {
throw new \Exception(sprintf(__('You need to wait %d seconds before subscribing again.', 'mailpoet'), $timeout));
}
$subscriber = Subscriber::subscribe($data, $segment_ids);
$errors = $subscriber->getErrors();
if($errors !== false) {
if ($errors !== false) {
return $this->badRequest($errors);
} else {
$meta = array();
if($form !== false) {
if ($form !== false) {
// record form statistics
StatisticsForms::record($form->id, $subscriber->id);
$form = $form->asArray();
if(!empty($form['settings']['on_success'])) {
if($form['settings']['on_success'] === 'page') {
if (!empty($form['settings']['on_success'])) {
if ($form['settings']['on_success'] === 'page') {
// redirect to a page on a success, pass the page url in the meta
$meta['redirect_url'] = get_permalink($form['settings']['success_page']);
} else if ($form['settings']['on_success'] === 'url') {
@ -220,22 +220,22 @@ class Subscribers extends APIEndpoint {
}
function save($data = array()) {
if(empty($data['segments'])) {
if (empty($data['segments'])) {
$data['segments'] = array();
}
$subscriber = Subscriber::createOrUpdate($data);
$errors = $subscriber->getErrors();
if(!empty($errors)) {
if (!empty($errors)) {
return $this->badRequest($errors);
}
if($subscriber->isNew()) {
if ($subscriber->isNew()) {
$subscriber = Source::setSource($subscriber, Source::ADMINISTRATOR);
$subscriber->save();
}
if(!empty($data['segments'])) {
if (!empty($data['segments'])) {
Scheduler::scheduleSubscriberWelcomeNotification($subscriber->id, $data['segments']);
}
@ -247,7 +247,7 @@ class Subscribers extends APIEndpoint {
function restore($data = array()) {
$id = (isset($data['id']) ? (int)$data['id'] : false);
$subscriber = Subscriber::findOne($id);
if($subscriber === false) {
if ($subscriber === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This subscriber does not exist.', 'mailpoet')
));
@ -263,7 +263,7 @@ class Subscribers extends APIEndpoint {
function trash($data = array()) {
$id = (isset($data['id']) ? (int)$data['id'] : false);
$subscriber = Subscriber::findOne($id);
if($subscriber === false) {
if ($subscriber === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This subscriber does not exist.', 'mailpoet')
));
@ -279,7 +279,7 @@ class Subscribers extends APIEndpoint {
function delete($data = array()) {
$id = (isset($data['id']) ? (int)$data['id'] : false);
$subscriber = Subscriber::findOne($id);
if($subscriber === false) {
if ($subscriber === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This subscriber does not exist.', 'mailpoet')
));
@ -291,7 +291,7 @@ class Subscribers extends APIEndpoint {
function bulkAction($data = array()) {
try {
if(!isset($data['listing']['filter']['segment'])) {
if (!isset($data['listing']['filter']['segment'])) {
return $this->successResponse(
null,
$this->bulk_action_controller->apply('\MailPoet\Models\Subscriber', $data)