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

Replace all WP function calls

Browse Source
This commit is contained in:
Amine Ben hammou
2019-02-20 18:56:48 +01:00
committed by M. Shull
parent 986482e34b
commit 0a436087e1
176 changed files with 1066 additions and 803 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,19 +56,19 @@ class API {
function init() {
// admin security token and API version
add_action(
WPFunctions::get()->addAction(
'admin_head',
array($this, 'setTokenAndAPIVersion')
);
// ajax (logged in users)
add_action(
WPFunctions::get()->addAction(
'wp_ajax_mailpoet',
array($this, 'setupAjax')
);
// ajax (logged out users)
add_action(
WPFunctions::get()->addAction(
'wp_ajax_nopriv_mailpoet',
array($this, 'setupAjax')
);
@@ -85,7 +85,7 @@ class API {
);
if (!$ignoreToken && $this->checkToken() === false) {
$error_message = __("Sorry, but we couldn't connect to the MailPoet server. Please refresh the web page and try again.", 'mailpoet');
$error_message = WPFunctions::get()->__("Sorry, but we couldn't connect to the MailPoet server. Please refresh the web page and try again.", 'mailpoet');
$error_response = $this->createErrorResponse(Error::UNAUTHORIZED, $error_message, Response::STATUS_UNAUTHORIZED);
return $error_response->send();
}
@@ -112,7 +112,7 @@ class API {
: null;
if (!$this->_request_endpoint || !$this->_request_method || !$this->_request_api_version) {
$error_message = __('Invalid API request.', 'mailpoet');
$error_message = WPFunctions::get()->__('Invalid API request.', 'mailpoet');
$error_response = $this->createErrorResponse(Error::BAD_REQUEST, $error_message, Response::STATUS_BAD_REQUEST);
return $error_response;
} else if (!empty($this->_endpoint_namespaces[$this->_request_api_version])) {
@@ -128,7 +128,7 @@ class API {
}
}
$this->_request_data = isset($data['data'])
? stripslashes_deep($data['data'])
? WPFunctions::get()->stripslashesDeep($data['data'])
: array();
// remove reserved keywords from data
@@ -166,7 +166,7 @@ class API {
// check the accessibility of the requested endpoint's action
// by default, an endpoint's action is considered "private"
if (!$this->validatePermissions($this->_request_method, $endpoint->permissions)) {
$error_message = __('You do not have the required permissions.', 'mailpoet');
$error_message = WPFunctions::get()->__('You do not have the required permissions.', 'mailpoet');
$error_response = $this->createErrorResponse(Error::FORBIDDEN, $error_message, Response::STATUS_FORBIDDEN);
return $error_response;
}
@@ -187,7 +187,7 @@ class API {
}
function checkToken() {
return wp_verify_nonce($this->_request_token, 'mailpoet_token');
return WPFunctions::get()->wpVerifyNonce($this->_request_token, 'mailpoet_token');
}
function setTokenAndAPIVersion() {

5
lib/API/JSON/Endpoint.php
View File

@@ -3,6 +3,7 @@
namespace MailPoet\API\JSON;
use MailPoet\Config\AccessControl;
use MailPoet\WP\Functions as WPFunctions;
if (!defined('ABSPATH')) exit;
@@ -23,7 +24,7 @@ abstract class Endpoint {
) {
if (empty($errors)) {
$errors = array(
Error::UNKNOWN => __('An unknown error occurred.', 'mailpoet')
Error::UNKNOWN => WPFunctions::get()->__('An unknown error occurred.', 'mailpoet')
);
}
return new ErrorResponse($errors, $meta, $status);
@@ -32,7 +33,7 @@ abstract class Endpoint {
function badRequest($errors = array(), $meta = array()) {
if (empty($errors)) {
$errors = array(
Error::BAD_REQUEST => __('Invalid request parameters', 'mailpoet')
Error::BAD_REQUEST => WPFunctions::get()->__('Invalid request parameters', 'mailpoet')
);
}
return new ErrorResponse($errors, $meta, Response::STATUS_BAD_REQUEST);

3
lib/API/JSON/ErrorResponse.php
View File

@@ -1,6 +1,7 @@
<?php
namespace MailPoet\API\JSON;
use MailPoet\WP\Functions as WPFunctions;
if (!defined('ABSPATH')) exit;
@@ -20,7 +21,7 @@ class ErrorResponse extends Response {
return array_map(function($error, $message) {
// sanitize SQL error
if (preg_match('/^SQLSTATE/i', $message)) {
$message = __('An unknown error occurred.', 'mailpoet');
$message = WPFunctions::get()->__('An unknown error occurred.', 'mailpoet');
}
return array(
'error' => $error,

5
lib/API/JSON/Response.php
View File

@@ -1,5 +1,6 @@
<?php
namespace MailPoet\API\JSON;
use MailPoet\WP\Functions as WPFunctions;
if (!defined('ABSPATH')) exit;
@@ -21,7 +22,7 @@ abstract class Response {
}
function send() {
status_header($this->status);
WPFunctions::get()->statusHeader($this->status);
$data = $this->getData();
$response = array();
@@ -35,7 +36,7 @@ abstract class Response {
if (!empty($response)) {
@header('Content-Type: application/json; charset='.get_option('blog_charset'));
echo wp_json_encode($response);
echo WPFunctions::get()->wpJsonEncode($response);
}
die();
}

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

@@ -36,7 +36,7 @@ class AutomatedLatestContent extends APIEndpoint {
function getTaxonomies($data = array()) {
$post_type = (isset($data['postType'])) ? $data['postType'] : 'post';
$all_taxonomies = get_object_taxonomies($post_type, 'objects');
$all_taxonomies = WPFunctions::get()->getObjectTaxonomies($post_type, 'objects');
$taxonomies_with_label = array_filter($all_taxonomies, function($taxonomy) {
return $taxonomy->label;
});

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

@@ -6,6 +6,7 @@ use MailPoet\API\JSON\Endpoint as APIEndpoint;
use MailPoet\API\JSON\Error as APIError;
use MailPoet\Config\AccessControl;
use MailPoet\Models\CustomField;
use MailPoet\WP\Functions as WPFunctions;
if (!defined('ABSPATH')) exit;
@@ -28,7 +29,7 @@ class CustomFields extends APIEndpoint {
$custom_field = CustomField::findOne($id);
if ($custom_field === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This custom field does not exist.', 'mailpoet')
APIError::NOT_FOUND => WPFunctions::get()->__('This custom field does not exist.', 'mailpoet')
));
} else {
$custom_field->delete();
@@ -55,7 +56,7 @@ class CustomFields extends APIEndpoint {
$custom_field = CustomField::findOne($id);
if ($custom_field === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This custom field does not exist.', 'mailpoet')
APIError::NOT_FOUND => WPFunctions::get()->__('This custom field does not exist.', 'mailpoet')
));
} else {
return $this->successResponse($custom_field->asArray());

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

@@ -10,6 +10,7 @@ use MailPoet\Form\Util;
use MailPoet\Listing;
use MailPoet\Models\Form;
use MailPoet\Models\StatisticsForms;
use MailPoet\WP\Functions as WPFunctions;
if (!defined('ABSPATH')) exit;
@@ -38,7 +39,7 @@ class Forms extends APIEndpoint {
$form = Form::findOne($id);
if ($form === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This form does not exist.', 'mailpoet')
APIError::NOT_FOUND => WPFunctions::get()->__('This form does not exist.', 'mailpoet')
));
} else {
return $this->successResponse($form->asArray());
@@ -73,31 +74,31 @@ class Forms extends APIEndpoint {
function create() {
// create new form
$form_data = array(
'name' => __('New form', 'mailpoet'),
'name' => WPFunctions::get()->__('New form', 'mailpoet'),
'body' => array(
array(
'id' => 'email',
'name' => __('Email', 'mailpoet'),
'name' => WPFunctions::get()->__('Email', 'mailpoet'),
'type' => 'text',
'static' => true,
'params' => array(
'label' => __('Email', 'mailpoet'),
'label' => WPFunctions::get()->__('Email', 'mailpoet'),
'required' => true
)
),
array(
'id' => 'submit',
'name' => __('Submit', 'mailpoet'),
'name' => WPFunctions::get()->__('Submit', 'mailpoet'),
'type' => 'submit',
'static' => true,
'params' => array(
'label' => __('Subscribe!', 'mailpoet')
'label' => WPFunctions::get()->__('Subscribe!', 'mailpoet')
)
)
),
'settings' => array(
'on_success' => 'message',
'success_message' => __('Check your inbox or spam folder to confirm your subscription.', 'mailpoet'),
'success_message' => WPFunctions::get()->__('Check your inbox or spam folder to confirm your subscription.', 'mailpoet'),
'segments' => null,
'segments_selected_by' => 'admin'
)
@@ -124,7 +125,7 @@ class Forms extends APIEndpoint {
$html = FormRenderer::renderHTML($data);
// convert shortcodes
$html = do_shortcode($html);
$html = WPFunctions::get()->doShortcode($html);
// styles
$css = new Util\Styles(FormRenderer::getStyles($data));
@@ -140,7 +141,7 @@ class Forms extends APIEndpoint {
$form = Form::findOne($id);
if ($form === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This form does not exist.', 'mailpoet')
APIError::NOT_FOUND => WPFunctions::get()->__('This form does not exist.', 'mailpoet')
));
} else {
$exports = Util\Export::getAll($form->asArray());
@@ -152,14 +153,14 @@ class Forms extends APIEndpoint {
$id = (isset($data['id']) ? (int)$data['id'] : false);
$form_id = (isset($data['id']) ? (int)$data['id'] : 0);
$name = (isset($data['name']) ? $data['name'] : __('New form', 'mailpoet'));
$name = (isset($data['name']) ? $data['name'] : WPFunctions::get()->__('New form', 'mailpoet'));
$body = (isset($data['body']) ? $data['body'] : array());
$settings = (isset($data['settings']) ? $data['settings'] : array());
$styles = (isset($data['styles']) ? $data['styles'] : '');
// check if the form is used as a widget
$is_widget = false;
$widgets = get_option('widget_mailpoet_form');
$widgets = WPFunctions::get()->getOption('widget_mailpoet_form');
if (!empty($widgets)) {
foreach ($widgets as $widget) {
if (isset($widget['form']) && (int)$widget['form'] === $form_id) {
@@ -223,7 +224,7 @@ class Forms extends APIEndpoint {
$form = Form::findOne($id);
if ($form === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This form does not exist.', 'mailpoet')
APIError::NOT_FOUND => WPFunctions::get()->__('This form does not exist.', 'mailpoet')
));
} else {
$form->restore();
@@ -239,7 +240,7 @@ class Forms extends APIEndpoint {
$form = Form::findOne($id);
if ($form === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This form does not exist.', 'mailpoet')
APIError::NOT_FOUND => WPFunctions::get()->__('This form does not exist.', 'mailpoet')
));
} else {
$form->trash();
@@ -255,7 +256,7 @@ class Forms extends APIEndpoint {
$form = Form::findOne($id);
if ($form === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This form does not exist.', 'mailpoet')
APIError::NOT_FOUND => WPFunctions::get()->__('This form does not exist.', 'mailpoet')
));
} else {
$form->delete();
@@ -269,7 +270,7 @@ class Forms extends APIEndpoint {
if ($form === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This form does not exist.', 'mailpoet')
APIError::NOT_FOUND => WPFunctions::get()->__('This form does not exist.', 'mailpoet')
));
} else {
$data = array(

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

@@ -6,6 +6,7 @@ use MailPoet\API\JSON\Endpoint as APIEndpoint;
use MailPoet\API\JSON\Error as APIError;
use MailPoet\Config\AccessControl;
use MailPoet\Mailer\MailerLog;
use MailPoet\WP\Functions as WPFunctions;
if (!defined('ABSPATH')) exit;
@@ -30,7 +31,7 @@ class Mailer extends APIEndpoint {
if ($result['response'] === false) {
$error = sprintf(
__('The email could not be sent: %s', 'mailpoet'),
WPFunctions::get()->__('The email could not be sent: %s', 'mailpoet'),
$result['error']->getMessage()
);
return $this->errorResponse(array(APIError::BAD_REQUEST => $error));

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

@@ -6,6 +6,7 @@ use MailPoet\API\JSON\Endpoint as APIEndpoint;
use MailPoet\API\JSON\Error as APIError;
use MailPoet\Config\AccessControl;
use MailPoet\Models\NewsletterTemplate;
use MailPoet\WP\Functions as WPFunctions;
if (!defined('ABSPATH')) exit;
@@ -19,7 +20,7 @@ class NewsletterTemplates extends APIEndpoint {
$template = NewsletterTemplate::findOne($id);
if ($template === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This template does not exist.', 'mailpoet')
APIError::NOT_FOUND => WPFunctions::get()->__('This template does not exist.', 'mailpoet')
));
} else {
return $this->successResponse(
@@ -70,7 +71,7 @@ class NewsletterTemplates extends APIEndpoint {
$template = NewsletterTemplate::findOne($id);
if ($template === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This template does not exist.', 'mailpoet')
APIError::NOT_FOUND => WPFunctions::get()->__('This template does not exist.', 'mailpoet')
));
} else {
$template->delete();

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

@@ -60,7 +60,7 @@ class Newsletters extends APIEndpoint {
$newsletter = Newsletter::findOne($id);
if ($newsletter === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This newsletter does not exist.', 'mailpoet')
APIError::NOT_FOUND => WPFunctions::get()->__('This newsletter does not exist.', 'mailpoet')
));
} else {
$newsletter = $newsletter
@@ -191,7 +191,7 @@ class Newsletters extends APIEndpoint {
if (!$status) {
return $this->badRequest(array(
APIError::BAD_REQUEST => __('You need to specify a status.', 'mailpoet')
APIError::BAD_REQUEST => WPFunctions::get()->__('You need to specify a status.', 'mailpoet')
));
}
@@ -200,7 +200,7 @@ class Newsletters extends APIEndpoint {
if ($newsletter === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This newsletter does not exist.', 'mailpoet')
APIError::NOT_FOUND => WPFunctions::get()->__('This newsletter does not exist.', 'mailpoet')
));
}
@@ -237,7 +237,7 @@ class Newsletters extends APIEndpoint {
$newsletter = Newsletter::findOne($id);
if ($newsletter === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This newsletter does not exist.', 'mailpoet')
APIError::NOT_FOUND => WPFunctions::get()->__('This newsletter does not exist.', 'mailpoet')
));
} else {
$newsletter->restore();
@@ -253,7 +253,7 @@ class Newsletters extends APIEndpoint {
$newsletter = Newsletter::findOne($id);
if ($newsletter === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This newsletter does not exist.', 'mailpoet')
APIError::NOT_FOUND => WPFunctions::get()->__('This newsletter does not exist.', 'mailpoet')
));
} else {
$newsletter->trash();
@@ -269,7 +269,7 @@ class Newsletters extends APIEndpoint {
$newsletter = Newsletter::findOne($id);
if ($newsletter === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This newsletter does not exist.', 'mailpoet')
APIError::NOT_FOUND => WPFunctions::get()->__('This newsletter does not exist.', 'mailpoet')
));
} else {
$newsletter->delete();
@@ -283,7 +283,7 @@ class Newsletters extends APIEndpoint {
if ($newsletter === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This newsletter does not exist.', 'mailpoet')
APIError::NOT_FOUND => WPFunctions::get()->__('This newsletter does not exist.', 'mailpoet')
));
} else {
$data = array(
@@ -307,7 +307,7 @@ class Newsletters extends APIEndpoint {
function showPreview($data = array()) {
if (empty($data['body'])) {
return $this->badRequest(array(
APIError::BAD_REQUEST => __('Newsletter data is missing.', 'mailpoet')
APIError::BAD_REQUEST => WPFunctions::get()->__('Newsletter data is missing.', 'mailpoet')
));
}
@@ -316,7 +316,7 @@ class Newsletters extends APIEndpoint {
if ($newsletter === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This newsletter does not exist.', 'mailpoet')
APIError::NOT_FOUND => WPFunctions::get()->__('This newsletter does not exist.', 'mailpoet')
));
} else {
$newsletter->body = $data['body'];
@@ -340,7 +340,7 @@ class Newsletters extends APIEndpoint {
function sendPreview($data = array()) {
if (empty($data['subscriber'])) {
return $this->badRequest(array(
APIError::BAD_REQUEST => __('Please specify receiver information.', 'mailpoet')
APIError::BAD_REQUEST => WPFunctions::get()->__('Please specify receiver information.', 'mailpoet')
));
}
@@ -349,7 +349,7 @@ class Newsletters extends APIEndpoint {
if ($newsletter === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This newsletter does not exist.', 'mailpoet')
APIError::NOT_FOUND => WPFunctions::get()->__('This newsletter does not exist.', 'mailpoet')
));
} else {
$renderer = new Renderer($newsletter, $preview = true);
@@ -386,12 +386,12 @@ class Newsletters extends APIEndpoint {
$sender = false,
$reply_to = false
);
$extra_params = array('unsubscribe_url' => home_url());
$extra_params = array('unsubscribe_url' => WPFunctions::get()->homeUrl());
$result = $mailer->send($rendered_newsletter, $data['subscriber'], $extra_params);
if ($result['response'] === false) {
$error = sprintf(
__('The email could not be sent: %s', 'mailpoet'),
WPFunctions::get()->__('The email could not be sent: %s', 'mailpoet'),
$result['error']->getMessage()
);
return $this->errorResponse(array(APIError::BAD_REQUEST => $error));

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

@@ -8,6 +8,7 @@ use MailPoet\Config\AccessControl;
use MailPoet\Listing;
use MailPoet\Models\Segment;
use MailPoet\Segments\WP;
use MailPoet\WP\Functions as WPFunctions;
if (!defined('ABSPATH')) exit;
@@ -35,7 +36,7 @@ class Segments extends APIEndpoint {
$segment = Segment::findOne($id);
if ($segment === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This list does not exist.', 'mailpoet')
APIError::NOT_FOUND => WPFunctions::get()->__('This list does not exist.', 'mailpoet')
));
} else {
return $this->successResponse($segment->asArray());
@@ -47,7 +48,7 @@ class Segments extends APIEndpoint {
$data = array();
foreach ($listing_data['items'] as $segment) {
$segment->subscribers_url = admin_url(
$segment->subscribers_url = WPFunctions::get()->adminUrl(
'admin.php?page=mailpoet-subscribers#/filter[segment='.$segment->id.']'
);
@@ -81,7 +82,7 @@ class Segments extends APIEndpoint {
$segment = Segment::findOne($id);
if ($segment === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This list does not exist.', 'mailpoet')
APIError::NOT_FOUND => WPFunctions::get()->__('This list does not exist.', 'mailpoet')
));
} else {
$segment->restore();
@@ -97,7 +98,7 @@ class Segments extends APIEndpoint {
$segment = Segment::findOne($id);
if ($segment === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This list does not exist.', 'mailpoet')
APIError::NOT_FOUND => WPFunctions::get()->__('This list does not exist.', 'mailpoet')
));
} else {
$segment->trash();
@@ -113,7 +114,7 @@ class Segments extends APIEndpoint {
$segment = Segment::findOne($id);
if ($segment === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This list does not exist.', 'mailpoet')
APIError::NOT_FOUND => WPFunctions::get()->__('This list does not exist.', 'mailpoet')
));
} else {
$segment->delete();
@@ -127,7 +128,7 @@ class Segments extends APIEndpoint {
if ($segment === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This list does not exist.', 'mailpoet')
APIError::NOT_FOUND => WPFunctions::get()->__('This list does not exist.', 'mailpoet')
));
} else {
$data = array(

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

@@ -10,6 +10,7 @@ use MailPoet\Models\SendingQueue as SendingQueueModel;
use MailPoet\Newsletter\Scheduler\Scheduler;
use MailPoet\Segments\SubscribersFinder;
use MailPoet\Tasks\Sending as SendingTask;
use MailPoet\WP\Functions as WPFunctions;
if (!defined('ABSPATH')) exit;
@@ -29,7 +30,7 @@ class SendingQueue extends APIEndpoint {
if ($newsletter === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This newsletter does not exist.', 'mailpoet')
APIError::NOT_FOUND => WPFunctions::get()->__('This newsletter does not exist.', 'mailpoet')
));
}
@@ -50,7 +51,7 @@ class SendingQueue extends APIEndpoint {
if (!empty($queue)) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This newsletter is already being sent.', 'mailpoet')
APIError::NOT_FOUND => WPFunctions::get()->__('This newsletter is already being sent.', 'mailpoet')
));
}
@@ -78,7 +79,7 @@ class SendingQueue extends APIEndpoint {
$subscribers_count = $finder->addSubscribersToTaskFromSegments($queue->task(), $segments);
if (!$subscribers_count) {
return $this->errorResponse(array(
APIError::UNKNOWN => __('There are no subscribers in that list!', 'mailpoet')
APIError::UNKNOWN => WPFunctions::get()->__('There are no subscribers in that list!', 'mailpoet')
));
}
$queue->updateCount();
@@ -109,14 +110,14 @@ class SendingQueue extends APIEndpoint {
if ($newsletter === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This newsletter does not exist.', 'mailpoet')
APIError::NOT_FOUND => WPFunctions::get()->__('This newsletter does not exist.', 'mailpoet')
));
} else {
$queue = $newsletter->getQueue();
if ($queue === false) {
return $this->errorResponse(array(
APIError::UNKNOWN => __('This newsletter has not been sent yet.', 'mailpoet')
APIError::UNKNOWN => WPFunctions::get()->__('This newsletter has not been sent yet.', 'mailpoet')
));
} else {
$queue->pause();
@@ -135,14 +136,14 @@ class SendingQueue extends APIEndpoint {
$newsletter = Newsletter::findOne($newsletter_id);
if ($newsletter === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This newsletter does not exist.', 'mailpoet')
APIError::NOT_FOUND => WPFunctions::get()->__('This newsletter does not exist.', 'mailpoet')
));
} else {
$queue = $newsletter->getQueue();
if ($queue === false) {
return $this->errorResponse(array(
APIError::UNKNOWN => __('This newsletter has not been sent yet.', 'mailpoet')
APIError::UNKNOWN => WPFunctions::get()->__('This newsletter has not been sent yet.', 'mailpoet')
));
} else {
$queue->resume();

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

@@ -9,6 +9,7 @@ use MailPoet\Config\AccessControl;
use MailPoet\Config\Installer;
use MailPoet\Services\Bridge;
use MailPoet\WP\DateTime;
use MailPoet\WP\Functions as WPFunctions;
if (!defined('ABSPATH')) exit;
@@ -29,7 +30,7 @@ class Services extends APIEndpoint {
if (!$key) {
return $this->badRequest(array(
APIError::BAD_REQUEST => __('Please specify a key.', 'mailpoet')
APIError::BAD_REQUEST => WPFunctions::get()->__('Please specify a key.', 'mailpoet')
));
}
@@ -46,10 +47,10 @@ class Services extends APIEndpoint {
$success_message = null;
if ($state == Bridge::KEY_VALID) {
$success_message = __('Your MailPoet Sending Service key has been successfully validated.', 'mailpoet');
$success_message = WPFunctions::get()->__('Your MailPoet Sending Service key has been successfully validated.', 'mailpoet');
} elseif ($state == Bridge::KEY_EXPIRING) {
$success_message = sprintf(
__('Your MailPoet Sending Service key expires on %s!', 'mailpoet'),
WPFunctions::get()->__('Your MailPoet Sending Service key expires on %s!', 'mailpoet'),
$this->date_time->formatDate(strtotime($result['data']['expire_at']))
);
}
@@ -64,17 +65,17 @@ class Services extends APIEndpoint {
switch ($state) {
case Bridge::KEY_INVALID:
$error = __('Your MailPoet Sending Service key is invalid.', 'mailpoet');
$error = WPFunctions::get()->__('Your MailPoet Sending Service key is invalid.', 'mailpoet');
break;
case Bridge::KEY_ALREADY_USED:
$error = __('Your MailPoet Sending Service key is already used on another site.', 'mailpoet');
$error = WPFunctions::get()->__('Your MailPoet Sending Service key is already used on another site.', 'mailpoet');
break;
default:
$code = !empty($result['code']) ? $result['code'] : Bridge::CHECK_ERROR_UNKNOWN;
$errorMessage = __('Error validating MailPoet Sending Service key, please try again later (%s).', 'mailpoet');
$errorMessage = WPFunctions::get()->__('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()) ) {
$errorMessage .= ' ' . __("Note that it doesn't work on localhost.", 'mailpoet');
if ( 1 === preg_match("/^(http|https)\:\/\/(localhost|127\.0\.0\.1)/", WPFunctions::get()->siteUrl()) ) {
$errorMessage .= ' ' . WPFunctions::get()->__("Note that it doesn't work on localhost.", 'mailpoet');
}
$error = sprintf(
$errorMessage,
@@ -91,7 +92,7 @@ class Services extends APIEndpoint {
if (!$key) {
return $this->badRequest(array(
APIError::BAD_REQUEST => __('Please specify a key.', 'mailpoet')
APIError::BAD_REQUEST => WPFunctions::get()->__('Please specify a key.', 'mailpoet')
));
}
@@ -108,10 +109,10 @@ class Services extends APIEndpoint {
$success_message = null;
if ($state == Bridge::KEY_VALID) {
$success_message = __('Your Premium key has been successfully validated.', 'mailpoet');
$success_message = WPFunctions::get()->__('Your Premium key has been successfully validated.', 'mailpoet');
} elseif ($state == Bridge::KEY_EXPIRING) {
$success_message = sprintf(
__('Your Premium key expires on %s.', 'mailpoet'),
WPFunctions::get()->__('Your Premium key expires on %s.', 'mailpoet'),
$this->date_time->formatDate(strtotime($result['data']['expire_at']))
);
}
@@ -129,15 +130,15 @@ class Services extends APIEndpoint {
switch ($state) {
case Bridge::KEY_INVALID:
$error = __('Your Premium key is invalid.', 'mailpoet');
$error = WPFunctions::get()->__('Your Premium key is invalid.', 'mailpoet');
break;
case Bridge::KEY_ALREADY_USED:
$error = __('Your Premium key is already used on another site.', 'mailpoet');
$error = WPFunctions::get()->__('Your Premium key is already used on another site.', 'mailpoet');
break;
default:
$code = !empty($result['code']) ? $result['code'] : Bridge::CHECK_ERROR_UNKNOWN;
$error = sprintf(
__('Error validating Premium key, please try again later (%s)', 'mailpoet'),
WPFunctions::get()->__('Error validating Premium key, please try again later (%s)', 'mailpoet'),
$this->getErrorDescriptionByCode($code)
);
break;
@@ -149,10 +150,10 @@ class Services extends APIEndpoint {
private function getErrorDescriptionByCode($code) {
switch ($code) {
case Bridge::CHECK_ERROR_UNAVAILABLE:
$text = __('Service unavailable', 'mailpoet');
$text = WPFunctions::get()->__('Service unavailable', 'mailpoet');
break;
case Bridge::CHECK_ERROR_UNKNOWN:
$text = __('Contact your hosting support to check the connection between your host and https://bridge.mailpoet.com', 'mailpoet');
$text = WPFunctions::get()->__('Contact your hosting support to check the connection between your host and https://bridge.mailpoet.com', 'mailpoet');
break;
default:
$text = sprintf(_x('code: %s', 'Error code (inside parentheses)', 'mailpoet'), $code);

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

@@ -7,6 +7,7 @@ use MailPoet\API\JSON\Error as APIError;
use MailPoet\Config\AccessControl;
use MailPoet\Services\Bridge;
use MailPoet\Settings\SettingsController;
use MailPoet\WP\Functions as WPFunctions;
if (!defined('ABSPATH')) exit;
@@ -32,7 +33,7 @@ class Settings extends APIEndpoint {
return $this->badRequest(
array(
APIError::BAD_REQUEST =>
__('You have not specified any settings to be saved.', 'mailpoet')
WPFunctions::get()->__('You have not specified any settings to be saved.', 'mailpoet')
));
} else {
foreach ($settings as $name => $value) {

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

@@ -74,7 +74,7 @@ class Subscribers extends APIEndpoint {
$subscriber = Subscriber::findOne($id);
if ($subscriber === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This subscriber does not exist.', 'mailpoet')
APIError::NOT_FOUND => WPFunctions::get()->__('This subscriber does not exist.', 'mailpoet')
));
} else {
return $this->successResponse(
@@ -121,24 +121,24 @@ class Subscribers extends APIEndpoint {
if (!$form) {
return $this->badRequest(array(
APIError::BAD_REQUEST => __('Please specify a valid form ID.', 'mailpoet')
APIError::BAD_REQUEST => WPFunctions::get()->__('Please specify a valid form ID.', 'mailpoet')
));
}
if (!empty($data['email'])) {
return $this->badRequest(array(
APIError::BAD_REQUEST => __('Please leave the first field empty.', 'mailpoet')
APIError::BAD_REQUEST => WPFunctions::get()->__('Please leave the first field empty.', 'mailpoet')
));
}
if (!empty($recaptcha['enabled']) && empty($data['recaptcha'])) {
return $this->badRequest(array(
APIError::BAD_REQUEST => __('Please check the CAPTCHA.', 'mailpoet')
APIError::BAD_REQUEST => WPFunctions::get()->__('Please check the CAPTCHA.', 'mailpoet')
));
}
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(
$res = WPFunctions::get()->wpRemotePost('https://www.google.com/recaptcha/api/siteverify', array(
'body' => array(
'secret' => $recaptcha['secret_token'],
'response' => $res
@@ -146,13 +146,13 @@ class Subscribers extends APIEndpoint {
));
if (is_wp_error($res)) {
return $this->badRequest(array(
APIError::BAD_REQUEST => __('Error while validating the CAPTCHA.', 'mailpoet')
APIError::BAD_REQUEST => WPFunctions::get()->__('Error while validating the CAPTCHA.', 'mailpoet')
));
}
$res = json_decode(wp_remote_retrieve_body($res));
if (empty($res->success)) {
return $this->badRequest(array(
APIError::BAD_REQUEST => __('Error while validating the CAPTCHA.', 'mailpoet')
APIError::BAD_REQUEST => WPFunctions::get()->__('Error while validating the CAPTCHA.', 'mailpoet')
));
}
}
@@ -174,7 +174,7 @@ class Subscribers extends APIEndpoint {
if (empty($segment_ids)) {
return $this->badRequest(array(
APIError::BAD_REQUEST => __('Please select a list.', 'mailpoet')
APIError::BAD_REQUEST => WPFunctions::get()->__('Please select a list.', 'mailpoet')
));
}
@@ -206,7 +206,7 @@ class Subscribers extends APIEndpoint {
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']);
$meta['redirect_url'] = WPFunctions::get()->getPermalink($form['settings']['success_page']);
} else if ($form['settings']['on_success'] === 'url') {
$meta['redirect_url'] = $form['settings']['success_url'];
}
@@ -255,7 +255,7 @@ class Subscribers extends APIEndpoint {
$subscriber = Subscriber::findOne($id);
if ($subscriber === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This subscriber does not exist.', 'mailpoet')
APIError::NOT_FOUND => WPFunctions::get()->__('This subscriber does not exist.', 'mailpoet')
));
} else {
$subscriber->restore();
@@ -271,7 +271,7 @@ class Subscribers extends APIEndpoint {
$subscriber = Subscriber::findOne($id);
if ($subscriber === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This subscriber does not exist.', 'mailpoet')
APIError::NOT_FOUND => WPFunctions::get()->__('This subscriber does not exist.', 'mailpoet')
));
} else {
$subscriber->trash();
@@ -287,7 +287,7 @@ class Subscribers extends APIEndpoint {
$subscriber = Subscriber::findOne($id);
if ($subscriber === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This subscriber does not exist.', 'mailpoet')
APIError::NOT_FOUND => WPFunctions::get()->__('This subscriber does not exist.', 'mailpoet')
));
} else {
$subscriber->delete();