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

- Updates code based on review comments

Browse Source
This commit is contained in:
Vlad
2016-07-07 09:01:59 -04:00
parent 8dba4727c4
commit f557881462
2 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
lib/API/API.php
View File

@ -12,32 +12,37 @@ class API {
public $data; public $data;
const API_NAME = 'mailpoet_api'; const API_NAME = 'mailpoet_api';
const ENDPOINT_NAMESCAPE = '\MailPoet\API\Endpoints\\'; const ENDPOINT_NAMESCAPE = '\MailPoet\API\Endpoints\\';
const API_RESPONSE_CODE_ERROR = 404;
function __construct() { function __construct($api_data = false) {
$this->api_request = isset($_GET[self::API_NAME]) ? true : false; $api_data = ($api_data) ? $api_data : $_GET;
$this->endpoint = isset($_GET['endpoint']) ? $this->api_request = isset($api_data[self::API_NAME]);
Helpers::underscoreToCamelCase($_GET['endpoint']) : $this->endpoint = isset($api_data['endpoint']) ?
Helpers::underscoreToCamelCase($api_data['endpoint']) :
false; false;
$this->endpoint = self::ENDPOINT_NAMESCAPE . ucfirst($this->endpoint); $this->action = isset($api_data['action']) ?
$this->action = isset($_GET['action']) ? Helpers::underscoreToCamelCase($api_data['action']) :
Helpers::underscoreToCamelCase($_GET['action']) :
false; false;
$this->data = isset($_GET['data']) ? $this->data = isset($api_data['data']) ?
self::decodeRequestData($_GET['data']) : self::decodeRequestData($api_data['data']) :
false; false;
} }
function init() { function init() {
if(!$this->api_request) return; if(!$this->api_request) return;
if(!$this->endpoint) { if(!$this->endpoint) {
$this->terminateRequest(404, __('Invalid API endpoint.')); $this->terminateRequest(self::API_RESPONSE_CODE_ERROR, __('Invalid API endpoint.'));
} }
$this->callEndpoint($this->endpoint, $this->action, $this->data); $this->callEndpoint(
self::ENDPOINT_NAMESCAPE . $this->endpoint,
$this->action,
$this->data
);
} }
function callEndpoint($endpoint, $action, $data) { function callEndpoint($endpoint, $action, $data) {
if(!method_exists($endpoint, $action)) { if(!method_exists($endpoint, $action)) {
$this->terminateRequest(404, __('Invalid API action.')); $this->terminateRequest(self::API_RESPONSE_CODE_ERROR, __('Invalid API action.'));
} }
call_user_func( call_user_func(
array( array(
@ -52,7 +57,7 @@ class API {
$data = base64_decode($data); $data = base64_decode($data);
return (is_serialized($data)) ? return (is_serialized($data)) ?
unserialize($data) : unserialize($data) :
self::terminateRequest(404, __('Invalid API data format.')); self::terminateRequest(self::API_RESPONSE_CODE_ERROR, __('Invalid API data format.'));
} }
static function encodeRequestData($data) { static function encodeRequestData($data) {
@ -60,7 +65,7 @@ class API {
} }
static function buildRequest($endpoint, $action, $data) { static function buildRequest($endpoint, $action, $data) {
$data = base64_encode(serialize($data)); $data = self::encodeRequestData($data);
$params = array( $params = array(
self::API_NAME => '', self::API_NAME => '',
'endpoint' => $endpoint, 'endpoint' => $endpoint,

2
lib/Newsletter/Links/Links.php
View File

@ -97,7 +97,7 @@ class Links {
$queue_id, $queue_id,
$content $content
) { ) {
// match [mailpoet_click]-urlHash or [mailpoet_open] // match data tags
$regex = sprintf( $regex = sprintf(
'/((%s|%s)(?:-\w+)?)/', '/((%s|%s)(?:-\w+)?)/',
preg_quote(self::DATA_TAG_CLICK), preg_quote(self::DATA_TAG_CLICK),