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

Fix phpstan level 6

Browse Source 
[MAILPOET-1969]
This commit is contained in:
Pavel Dohnal
2019-04-09 13:46:03 +02:00
committed by M. Shull
parent 46a0b7501b
commit 3e66e9e1dd
36 changed files with 320 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,14 +27,14 @@ 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) {
return $this->errorResponse(array(
APIError::NOT_FOUND => WPFunctions::get()->__('This custom field does not exist.', 'mailpoet')
));
} else {
if ($custom_field instanceof CustomField) {
$custom_field->delete();
return $this->successResponse($custom_field->asArray());
} else {
return $this->errorResponse(array(
APIError::NOT_FOUND => WPFunctions::get()->__('This custom field does not exist.', 'mailpoet')
));
}
}
@ -44,22 +44,20 @@ class CustomFields extends APIEndpoint {
if (!empty($errors)) {
return $this->badRequest($errors);
} else {
return $this->successResponse(
CustomField::findOne($custom_field->id)->asArray()
);
}
$custom_field = CustomField::findOne($custom_field->id);
if(!$custom_field instanceof CustomField) return $this->errorResponse();
return $this->successResponse($custom_field->asArray());
}
function get($data = array()) {
$id = (isset($data['id']) ? (int)$data['id'] : null);
$custom_field = CustomField::findOne($id);
if ($custom_field === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => WPFunctions::get()->__('This custom field does not exist.', 'mailpoet')
));
} else {
if ($custom_field instanceof CustomField) {
return $this->successResponse($custom_field->asArray());
}
return $this->errorResponse(array(
APIError::NOT_FOUND => WPFunctions::get()->__('This custom field does not exist.', 'mailpoet')
));
}
}

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

@ -37,13 +37,12 @@ class Forms extends APIEndpoint {
function get($data = array()) {
$id = (isset($data['id']) ? (int)$data['id'] : false);
$form = Form::findOne($id);
if ($form === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => WPFunctions::get()->__('This form does not exist.', 'mailpoet')
));
} else {
if ($form instanceof Form) {
return $this->successResponse($form->asArray());
}
return $this->errorResponse(array(
APIError::NOT_FOUND => WPFunctions::get()->__('This form does not exist.', 'mailpoet')
));
}
function listing($data = array()) {
@ -111,13 +110,12 @@ class Forms extends APIEndpoint {
$form = Form::createOrUpdate($data);
$errors = $form->getErrors();
if (!empty($errors)) {
return $this->badRequest($errors);
} else {
return $this->successResponse(
Form::findOne($form->id)->asArray()
);
if (empty($errors)) {
$form = Form::findOne($form->id);
if(!$form instanceof Form) return $this->errorResponse();
return $this->successResponse($form->asArray());
}
return $this->badRequest($errors);
}
function previewEditor($data = array()) {
@ -139,19 +137,16 @@ class Forms extends APIEndpoint {
function exportsEditor($data = array()) {
$id = (isset($data['id']) ? (int)$data['id'] : false);
$form = Form::findOne($id);
if ($form === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => WPFunctions::get()->__('This form does not exist.', 'mailpoet')
));
} else {
if ($form instanceof Form) {
$exports = Util\Export::getAll($form->asArray());
return $this->successResponse($exports);
}
return $this->errorResponse(array(
APIError::NOT_FOUND => WPFunctions::get()->__('This form does not exist.', 'mailpoet')
));
}
function saveEditor($data = array()) {
$id = (isset($data['id']) ? (int)$data['id'] : false);
$form_id = (isset($data['id']) ? (int)$data['id'] : 0);
$name = (isset($data['name']) ? $data['name'] : WPFunctions::get()->__('New form', 'mailpoet'));
$body = (isset($data['body']) ? $data['body'] : array());
@ -211,56 +206,62 @@ class Forms extends APIEndpoint {
if (!empty($errors)) {
return $this->badRequest($errors);
} else {
return $this->successResponse(
Form::findOne($form->id)->asArray(),
array('is_widget' => $is_widget)
);
}
$form = Form::findOne($form->id);
if(!$form instanceof Form) return $this->errorResponse();
return $this->successResponse(
$form->asArray(),
array('is_widget' => $is_widget)
);
}
function restore($data = array()) {
$id = (isset($data['id']) ? (int)$data['id'] : false);
$form = Form::findOne($id);
if ($form === false) {
if ($form instanceof Form) {
$form->restore();
$form = Form::findOne($form->id);
if(!$form instanceof Form) return $this->errorResponse();
return $this->successResponse(
$form->asArray(),
array('count' => 1)
);
} else {
return $this->errorResponse(array(
APIError::NOT_FOUND => WPFunctions::get()->__('This form does not exist.', 'mailpoet')
));
} else {
$form->restore();
return $this->successResponse(
Form::findOne($form->id)->asArray(),
array('count' => 1)
);
}
}
function trash($data = array()) {
$id = (isset($data['id']) ? (int)$data['id'] : false);
$form = Form::findOne($id);
if ($form === false) {
if ($form instanceof Form) {
$form->trash();
$form = Form::findOne($form->id);
if(!$form instanceof Form) return $this->errorResponse();
return $this->successResponse(
$form->asArray(),
array('count' => 1)
);
} else {
return $this->errorResponse(array(
APIError::NOT_FOUND => WPFunctions::get()->__('This form does not exist.', 'mailpoet')
));
} else {
$form->trash();
return $this->successResponse(
Form::findOne($form->id)->asArray(),
array('count' => 1)
);
}
}
function delete($data = array()) {
$id = (isset($data['id']) ? (int)$data['id'] : false);
$form = Form::findOne($id);
if ($form === false) {
if ($form instanceof Form) {
$form->delete();
return $this->successResponse(null, array('count' => 1));
} else {
return $this->errorResponse(array(
APIError::NOT_FOUND => WPFunctions::get()->__('This form does not exist.', 'mailpoet')
));
} else {
$form->delete();
return $this->successResponse(null, array('count' => 1));
}
}
@ -268,11 +269,7 @@ class Forms extends APIEndpoint {
$id = (isset($data['id']) ? (int)$data['id'] : false);
$form = Form::findOne($id);
if ($form === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => WPFunctions::get()->__('This form does not exist.', 'mailpoet')
));
} else {
if ($form instanceof Form) {
$data = array(
'name' => sprintf(__('Copy of %s', 'mailpoet'), $form->name)
);
@ -282,11 +279,17 @@ class Forms extends APIEndpoint {
if (!empty($errors)) {
return $this->errorResponse($errors);
} else {
$duplicate = Form::findOne($duplicate->id);
if(!$duplicate instanceof Form) return $this->errorResponse();
return $this->successResponse(
Form::findOne($duplicate->id)->asArray(),
$duplicate->asArray(),
array('count' => 1)
);
}
} else {
return $this->errorResponse(array(
APIError::NOT_FOUND => WPFunctions::get()->__('This form does not exist.', 'mailpoet')
));
}
}

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

@ -45,9 +45,9 @@ class ImportExport extends APIEndpoint {
if (!empty($errors)) {
return $this->errorResponse($errors);
} else {
return $this->successResponse(
Segment::findOne($segment->id)->asArray()
);
$segment = Segment::findOne($segment->id);
if(!$segment instanceof Segment) return $this->errorResponse();
return $this->successResponse($segment->asArray());
}
}

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

@ -18,14 +18,14 @@ class NewsletterTemplates extends APIEndpoint {
function get($data = array()) {
$id = (isset($data['id']) ? (int)$data['id'] : false);
$template = NewsletterTemplate::findOne($id);
if ($template === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => WPFunctions::get()->__('This template does not exist.', 'mailpoet')
));
} else {
if ($template instanceof NewsletterTemplate) {
return $this->successResponse(
$template->asArray()
);
} else {
return $this->errorResponse(array(
APIError::NOT_FOUND => WPFunctions::get()->__('This template does not exist.', 'mailpoet')
));
}
}
@ -47,7 +47,7 @@ class NewsletterTemplates extends APIEndpoint {
ignore_user_abort(true);
if (!empty($data['newsletter_id'])) {
$template = NewsletterTemplate::whereEqual('newsletter_id', $data['newsletter_id'])->findOne();
if (!empty($template)) {
if ($template instanceof NewsletterTemplate) {
$data['id'] = $template->id;
}
}
@ -60,8 +60,10 @@ class NewsletterTemplates extends APIEndpoint {
if (!empty($errors)) {
return $this->errorResponse($errors);
} else {
$template = NewsletterTemplate::findOne($template->id);
if(!$template instanceof NewsletterTemplate) return $this->errorResponse();
return $this->successResponse(
NewsletterTemplate::findOne($template->id)->asArray()
$template->asArray()
);
}
}
@ -69,13 +71,13 @@ 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 instanceof NewsletterTemplate) {
$template->delete();
return $this->successResponse(null, array('count' => 1));
} else {
return $this->errorResponse(array(
APIError::NOT_FOUND => WPFunctions::get()->__('This template does not exist.', 'mailpoet')
));
} else {
$template->delete();
return $this->successResponse(null, array('count' => 1));
}
}
}

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

@ -58,11 +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) {
return $this->errorResponse(array(
APIError::NOT_FOUND => WPFunctions::get()->__('This newsletter does not exist.', 'mailpoet')
));
} else {
if ($newsletter instanceof Newsletter) {
$newsletter = $newsletter
->withSegments()
->withOptions()
@ -76,6 +72,10 @@ class Newsletters extends APIEndpoint {
$newsletter = $this->wp->applyFilters('mailpoet_api_newsletters_get_after', $newsletter->asArray());
return $this->successResponse($newsletter, ['preview_url' => $preview_url]);
} else {
return $this->errorResponse(array(
APIError::NOT_FOUND => WPFunctions::get()->__('This newsletter does not exist.', 'mailpoet')
));
}
}
@ -96,7 +96,7 @@ class Newsletters extends APIEndpoint {
if (!empty($data['template_id'])) {
$template = NewsletterTemplate::whereEqual('id', $data['template_id'])->findOne();
if (!empty($template)) {
if ($template instanceof NewsletterTemplate) {
$template = $template->asArray();
$data['body'] = $template['body'];
}
@ -110,6 +110,7 @@ class Newsletters extends APIEndpoint {
// 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(!$newsletter instanceof Newsletter) return $this->errorResponse();
if (!empty($segments)) {
NewsletterSegment::where('newsletter_id', $newsletter->id)
@ -146,6 +147,7 @@ class Newsletters extends APIEndpoint {
}
// reload newsletter with updated options
$newsletter = Newsletter::filter('filterWithOptions', $newsletter->type)->findOne($newsletter->id);
if(!$newsletter instanceof Newsletter) return $this->errorResponse();
// if this is a post notification, process newsletter options and update its schedule
if ($newsletter->type === Newsletter::TYPE_NOTIFICATION) {
// generate the new schedule from options and get the new "next run" date
@ -226,54 +228,62 @@ class Newsletters extends APIEndpoint {
Scheduler::createPostNotificationSendingTask($newsletter);
}
$newsletter = Newsletter::findOne($newsletter->id);
if(!$newsletter instanceof Newsletter) return $this->errorResponse();
return $this->successResponse(
Newsletter::findOne($newsletter->id)->asArray()
$newsletter->asArray()
);
}
function restore($data = array()) {
$id = (isset($data['id']) ? (int)$data['id'] : false);
$newsletter = Newsletter::findOne($id);
if ($newsletter === false) {
if ($newsletter instanceof Newsletter) {
$newsletter->restore();
$newsletter = Newsletter::findOne($newsletter->id);
if(!$newsletter instanceof Newsletter) return $this->errorResponse();
return $this->successResponse(
$newsletter->asArray(),
array('count' => 1)
);
} else {
return $this->errorResponse(array(
APIError::NOT_FOUND => WPFunctions::get()->__('This newsletter does not exist.', 'mailpoet')
));
} else {
$newsletter->restore();
return $this->successResponse(
Newsletter::findOne($newsletter->id)->asArray(),
array('count' => 1)
);
}
}
function trash($data = array()) {
$id = (isset($data['id']) ? (int)$data['id'] : false);
$newsletter = Newsletter::findOne($id);
if ($newsletter === false) {
if ($newsletter instanceof Newsletter) {
$newsletter->trash();
$newsletter = Newsletter::findOne($newsletter->id);
if(!$newsletter instanceof Newsletter) return $this->errorResponse();
return $this->successResponse(
$newsletter->asArray(),
array('count' => 1)
);
} else {
return $this->errorResponse(array(
APIError::NOT_FOUND => WPFunctions::get()->__('This newsletter does not exist.', 'mailpoet')
));
} else {
$newsletter->trash();
return $this->successResponse(
Newsletter::findOne($newsletter->id)->asArray(),
array('count' => 1)
);
}
}
function delete($data = array()) {
$id = (isset($data['id']) ? (int)$data['id'] : false);
$newsletter = Newsletter::findOne($id);
if ($newsletter === false) {
if ($newsletter instanceof Newsletter) {
$newsletter->delete();
return $this->successResponse(null, array('count' => 1));
} else {
return $this->errorResponse(array(
APIError::NOT_FOUND => WPFunctions::get()->__('This newsletter does not exist.', 'mailpoet')
));
} else {
$newsletter->delete();
return $this->successResponse(null, array('count' => 1));
}
}
@ -281,11 +291,7 @@ class Newsletters extends APIEndpoint {
$id = (isset($data['id']) ? (int)$data['id'] : false);
$newsletter = Newsletter::findOne($id);
if ($newsletter === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => WPFunctions::get()->__('This newsletter does not exist.', 'mailpoet')
));
} else {
if ($newsletter instanceof Newsletter) {
$data = array(
'subject' => sprintf(__('Copy of %s', 'mailpoet'), $newsletter->subject)
);
@ -296,11 +302,17 @@ class Newsletters extends APIEndpoint {
return $this->errorResponse($errors);
} else {
$this->wp->doAction('mailpoet_api_newsletters_duplicate_after', $newsletter, $duplicate);
$duplicate = Newsletter::findOne($duplicate->id);
if(!$duplicate instanceof Newsletter) return $this->errorResponse();
return $this->successResponse(
Newsletter::findOne($duplicate->id)->asArray(),
$duplicate->asArray(),
array('count' => 1)
);
}
} else {
return $this->errorResponse(array(
APIError::NOT_FOUND => WPFunctions::get()->__('This newsletter does not exist.', 'mailpoet')
));
}
}
@ -314,11 +326,7 @@ class Newsletters extends APIEndpoint {
$id = (isset($data['id'])) ? (int)$data['id'] : false;
$newsletter = Newsletter::findOne($id);
if ($newsletter === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => WPFunctions::get()->__('This newsletter does not exist.', 'mailpoet')
));
} else {
if ($newsletter instanceof Newsletter) {
$newsletter->body = $data['body'];
$newsletter->save();
$subscriber = Subscriber::getCurrentWPUser();
@ -330,10 +338,16 @@ class Newsletters extends APIEndpoint {
// strip protocol to avoid mix content error
$preview_url = preg_replace('{^https?:}i', '', $preview_url);
$newsletter = Newsletter::findOne($newsletter->id);
if(!$newsletter instanceof Newsletter) return $this->errorResponse();
return $this->successResponse(
Newsletter::findOne($newsletter->id)->asArray(),
$newsletter->asArray(),
array('preview_url' => $preview_url)
);
} else {
return $this->errorResponse(array(
APIError::NOT_FOUND => WPFunctions::get()->__('This newsletter does not exist.', 'mailpoet')
));
}
}
@ -347,11 +361,7 @@ class Newsletters extends APIEndpoint {
$id = (isset($data['id'])) ? (int)$data['id'] : false;
$newsletter = Newsletter::findOne($id);
if ($newsletter === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => WPFunctions::get()->__('This newsletter does not exist.', 'mailpoet')
));
} else {
if ($newsletter instanceof Newsletter) {
$renderer = new Renderer($newsletter, $preview = true);
$rendered_newsletter = $renderer->render();
$divider = '***MailPoet***';
@ -376,7 +386,7 @@ class Newsletters extends APIEndpoint {
$rendered_newsletter['subject'],
$rendered_newsletter['body']['html'],
$rendered_newsletter['body']['text']
) = explode($divider, $shortcodes->replace($body));
) = explode($divider, $shortcodes->replace($body));
$rendered_newsletter['id'] = $newsletter->id;
try {
@ -386,7 +396,7 @@ class Newsletters extends APIEndpoint {
$mailer = false,
$sender = false,
$reply_to = false
);
);
$extra_params = array('unsubscribe_url' => WPFunctions::get()->homeUrl());
$result = $mailer->send($rendered_newsletter, $data['subscriber'], $extra_params);
@ -397,8 +407,11 @@ class Newsletters extends APIEndpoint {
);
return $this->errorResponse(array(APIError::BAD_REQUEST => $error));
} else {
$newsletter = Newsletter::findOne($newsletter->id);
if(!$newsletter instanceof Newsletter) return $this->errorResponse();
return $this->successResponse(
Newsletter::findOne($id)->asArray()
$newsletter->asArray()
);
}
} catch (\Exception $e) {
@ -406,6 +419,10 @@ class Newsletters extends APIEndpoint {
$e->getCode() => $e->getMessage()
));
}
} else {
return $this->errorResponse(array(
APIError::NOT_FOUND => WPFunctions::get()->__('This newsletter does not exist.', 'mailpoet')
));
}
}
@ -494,10 +511,10 @@ class Newsletters extends APIEndpoint {
// try to load template data
$template_id = (isset($data['template']) ? (int)$data['template'] : false);
$template = NewsletterTemplate::findOne($template_id);
if ($template === false) {
$newsletter->body = array();
} else {
if ($template instanceof NewsletterTemplate) {
$newsletter->body = $template->body;
} else {
$newsletter->body = array();
}
}
@ -533,8 +550,10 @@ class Newsletters extends APIEndpoint {
Scheduler::processPostNotificationSchedule($newsletter);
}
$newsletter = Newsletter::findOne($newsletter->id);
if(!$newsletter instanceof Newsletter) return $this->errorResponse();
return $this->successResponse(
Newsletter::findOne($newsletter->id)->asArray()
$newsletter->asArray()
);
}
}

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

@ -40,12 +40,12 @@ 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 instanceof Segment) {
return $this->successResponse($segment->asArray());
} else {
return $this->errorResponse(array(
APIError::NOT_FOUND => WPFunctions::get()->__('This list does not exist.', 'mailpoet')
));
} else {
return $this->successResponse($segment->asArray());
}
}
@ -77,8 +77,10 @@ class Segments extends APIEndpoint {
if (!empty($errors)) {
return $this->badRequest($errors);
} else {
$segment = Segment::findOne($segment->id);
if(!$segment instanceof Segment) return $this->errorResponse();
return $this->successResponse(
Segment::findOne($segment->id)->asArray()
$segment->asArray()
);
}
}
@ -86,45 +88,49 @@ 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 instanceof Segment) {
$segment->restore();
$segment = Segment::findOne($segment->id);
if(!$segment instanceof Segment) return $this->errorResponse();
return $this->successResponse(
$segment->asArray(),
array('count' => 1)
);
} else {
return $this->errorResponse(array(
APIError::NOT_FOUND => WPFunctions::get()->__('This list does not exist.', 'mailpoet')
));
} else {
$segment->restore();
return $this->successResponse(
Segment::findOne($segment->id)->asArray(),
array('count' => 1)
);
}
}
function trash($data = array()) {
$id = (isset($data['id']) ? (int)$data['id'] : false);
$segment = Segment::findOne($id);
if ($segment === false) {
if ($segment instanceof Segment) {
$segment->trash();
$segment = Segment::findOne($segment->id);
if(!$segment instanceof Segment) return $this->errorResponse();
return $this->successResponse(
$segment->asArray(),
array('count' => 1)
);
} else {
return $this->errorResponse(array(
APIError::NOT_FOUND => WPFunctions::get()->__('This list does not exist.', 'mailpoet')
));
} else {
$segment->trash();
return $this->successResponse(
Segment::findOne($segment->id)->asArray(),
array('count' => 1)
);
}
}
function delete($data = array()) {
$id = (isset($data['id']) ? (int)$data['id'] : false);
$segment = Segment::findOne($id);
if ($segment === false) {
if ($segment instanceof Segment) {
$segment->delete();
return $this->successResponse(null, array('count' => 1));
} else {
return $this->errorResponse(array(
APIError::NOT_FOUND => WPFunctions::get()->__('This list does not exist.', 'mailpoet')
));
} else {
$segment->delete();
return $this->successResponse(null, array('count' => 1));
}
}
@ -132,11 +138,7 @@ class Segments extends APIEndpoint {
$id = (isset($data['id']) ? (int)$data['id'] : false);
$segment = Segment::findOne($id);
if ($segment === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => WPFunctions::get()->__('This list does not exist.', 'mailpoet')
));
} else {
if ($segment instanceof Segment) {
$data = array(
'name' => sprintf(__('Copy of %s', 'mailpoet'), $segment->name)
);
@ -146,11 +148,17 @@ class Segments extends APIEndpoint {
if (!empty($errors)) {
return $this->errorResponse($errors);
} else {
$duplicate = Segment::findOne($duplicate->id);
if(!$duplicate instanceof Segment) return $this->errorResponse();
return $this->successResponse(
Segment::findOne($duplicate->id)->asArray(),
$duplicate->asArray(),
array('count' => 1)
);
}
} else {
return $this->errorResponse(array(
APIError::NOT_FOUND => WPFunctions::get()->__('This list does not exist.', 'mailpoet')
));
}
}

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

@ -28,7 +28,7 @@ class SendingQueue extends APIEndpoint {
// check that the newsletter exists
$newsletter = Newsletter::findOneWithOptions($newsletter_id);
if ($newsletter === false) {
if (!$newsletter instanceof Newsletter) {
return $this->errorResponse(array(
APIError::NOT_FOUND => WPFunctions::get()->__('This newsletter does not exist.', 'mailpoet')
));
@ -59,7 +59,7 @@ class SendingQueue extends APIEndpoint {
->where('queues.newsletter_id', $newsletter->id)
->where('tasks.status', SendingQueueModel::STATUS_SCHEDULED)
->findOne();
if ($scheduled_queue) {
if ($scheduled_queue instanceof SendingQueueModel) {
$queue = SendingTask::createFromQueue($scheduled_queue);
} else {
$queue = SendingTask::create();
@ -108,11 +108,7 @@ class SendingQueue extends APIEndpoint {
);
$newsletter = Newsletter::findOne($newsletter_id);
if ($newsletter === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => WPFunctions::get()->__('This newsletter does not exist.', 'mailpoet')
));
} else {
if ($newsletter instanceof Newsletter) {
$queue = $newsletter->getQueue();
if ($queue === false) {
@ -125,6 +121,10 @@ class SendingQueue extends APIEndpoint {
$newsletter->getQueue()->asArray()
);
}
} else {
return $this->errorResponse(array(
APIError::NOT_FOUND => WPFunctions::get()->__('This newsletter does not exist.', 'mailpoet')
));
}
}
@ -134,11 +134,7 @@ class SendingQueue extends APIEndpoint {
: false
);
$newsletter = Newsletter::findOne($newsletter_id);
if ($newsletter === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => WPFunctions::get()->__('This newsletter does not exist.', 'mailpoet')
));
} else {
if ($newsletter instanceof Newsletter) {
$queue = $newsletter->getQueue();
if ($queue === false) {
@ -151,6 +147,10 @@ class SendingQueue extends APIEndpoint {
$newsletter->getQueue()->asArray()
);
}
} else {
return $this->errorResponse(array(
APIError::NOT_FOUND => WPFunctions::get()->__('This newsletter does not exist.', 'mailpoet')
));
}
}
}

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

@ -120,7 +120,7 @@ class Subscribers extends APIEndpoint {
$recaptcha = $this->settings->get('re_captcha');
if (!$form) {
if (!$form instanceof Form) {
return $this->badRequest(array(
APIError::BAD_REQUEST => WPFunctions::get()->__('Please specify a valid form ID.', 'mailpoet')
));
@ -266,45 +266,49 @@ 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 instanceof Subscriber) {
$subscriber->restore();
$subscriber = Subscriber::findOne($subscriber->id);
if(!$subscriber instanceof Subscriber) return $this->errorResponse();
return $this->successResponse(
$subscriber->asArray(),
array('count' => 1)
);
} else {
return $this->errorResponse(array(
APIError::NOT_FOUND => WPFunctions::get()->__('This subscriber does not exist.', 'mailpoet')
));
} else {
$subscriber->restore();
return $this->successResponse(
Subscriber::findOne($subscriber->id)->asArray(),
array('count' => 1)
);
}
}
function trash($data = array()) {
$id = (isset($data['id']) ? (int)$data['id'] : false);
$subscriber = Subscriber::findOne($id);
if ($subscriber === false) {
if ($subscriber instanceof Subscriber) {
$subscriber->trash();
$subscriber = Subscriber::findOne($subscriber->id);
if(!$subscriber instanceof Subscriber) return $this->errorResponse();
return $this->successResponse(
$subscriber->asArray(),
array('count' => 1)
);
} else {
return $this->errorResponse(array(
APIError::NOT_FOUND => WPFunctions::get()->__('This subscriber does not exist.', 'mailpoet')
));
} else {
$subscriber->trash();
return $this->successResponse(
Subscriber::findOne($subscriber->id)->asArray(),
array('count' => 1)
);
}
}
function delete($data = array()) {
$id = (isset($data['id']) ? (int)$data['id'] : false);
$subscriber = Subscriber::findOne($id);
if ($subscriber === false) {
if ($subscriber instanceof Subscriber) {
$subscriber->delete();
return $this->successResponse(null, array('count' => 1));
} else {
return $this->errorResponse(array(
APIError::NOT_FOUND => WPFunctions::get()->__('This subscriber does not exist.', 'mailpoet')
));
} else {
$subscriber->delete();
return $this->successResponse(null, array('count' => 1));
}
}