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

remove doing_ajax logic from API and created dedicated class for subscription form non ajax submission

Browse Source
This commit is contained in:
Jonathan Labreuille
2016-09-22 16:24:13 +02:00
parent 6091751a4b
commit ea5c73721b
7 changed files with 117 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
lib/API/API.php
View File

@ -24,16 +24,6 @@ class API {
'wp_ajax_nopriv_mailpoet',
array($this, 'setupPublic')
);
// Public API (Post)
add_action(
'admin_post_mailpoet',
array($this, 'setupPublic')
);
add_action(
'admin_post_nopriv_mailpoet',
array($this, 'setupPublic')
);
}
function setupAdmin() {
@ -81,14 +71,7 @@ class API {
$class = ucfirst($_POST['endpoint']);
$endpoint = __NAMESPACE__ . "\\Endpoints\\" . $class;
$method = $_POST['method'];
$doing_ajax = (bool)(defined('DOING_AJAX') && DOING_AJAX);
if($doing_ajax) {
$data = isset($_POST['data']) ? stripslashes_deep($_POST['data']) : array();
} else {
$data = $_POST;
}
$data = isset($_POST['data']) ? stripslashes_deep($_POST['data']) : array();
if(is_array($data) && !empty($data)) {
// filter out reserved keywords from data
@ -104,16 +87,12 @@ class API {
try {
$endpoint = new $endpoint();
$response = $endpoint->$method($data);
if($doing_ajax) {
$response->send();
}
$response->send();
} catch(\Exception $e) {
if($doing_ajax) {
$error_response = new ErrorResponse(
array($e->getCode() => $e->getMessage())
);
$error_response->send();
}
$error_response = new ErrorResponse(
array($e->getCode() => $e->getMessage())
);
$error_response->send();
}
}

45
lib/API/Endpoints/Subscribers.php
View File

@ -11,7 +11,6 @@ use MailPoet\Models\Segment;
use MailPoet\Models\Setting;
use MailPoet\Models\Form;
use MailPoet\Models\StatisticsForms;
use MailPoet\Util\Url;
if(!defined('ABSPATH')) exit;
@ -56,7 +55,6 @@ class Subscribers extends APIEndpoint {
}
function subscribe($data = array()) {
$doing_ajax = (bool)(defined('DOING_AJAX') && DOING_AJAX);
$form_id = (isset($data['form_id']) ? (int)$data['form_id'] : false);
$form = Form::findOne($form_id);
unset($data['form_id']);
@ -68,31 +66,16 @@ class Subscribers extends APIEndpoint {
unset($data['segments']);
if(empty($segment_ids)) {
if($doing_ajax) {
return $this->badRequest(array(
APIError::BAD_REQUEST => __('Please select a list')
));
} else {
Url::redirectBack(array(
'mailpoet_error' => $form_id,
'mailpoet_success' => null
));
}
return $this->badRequest(array(
APIError::BAD_REQUEST => __('Please select a list')
));
}
// try to register and subscribe user to segments
$subscriber = Subscriber::subscribe($data, $segment_ids);
$errors = $subscriber->getErrors();
if($errors !== false) {
if($doing_ajax) {
return $this->badRequest($errors);
} else {
Url::redirectBack(array(
'mailpoet_error' => $form_id,
'mailpoet_success' => null
));
}
return $this->badRequest($errors);
} else {
$meta = array();
@ -110,22 +93,10 @@ class Subscribers extends APIEndpoint {
}
}
if($doing_ajax) {
return $this->successResponse(
Subscriber::findOne($subscriber->id)->asArray(),
$meta
);
} else {
if(isset($meta['redirect_url'])) {
Url::redirectTo($meta['redirect_url']);
} else {
Url::redirectBack(array(
'mailpoet_success' => $form['id'],
'mailpoet_error' => null
));
}
}
return $this->successResponse(
Subscriber::findOne($subscriber->id)->asArray(),
$meta
);
}
}