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

- Updates method names

Browse Source
This commit is contained in:
Vlad
2016-08-18 09:18:44 -04:00
parent 31008a6895
commit 44f84c6cdb
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Newsletter/ViewInBrowser.php
View File

@@ -11,8 +11,8 @@ use MailPoet\Newsletter\Shortcodes\Shortcodes;
class ViewInBrowser { class ViewInBrowser {
static function view($data) { static function view($data) {
$data = self::processData($data); $data = self::preProcessData($data);
if(!$data) self::abort(); if(!self::validateData($data)) self::abort();
$rendered_newsletter = $rendered_newsletter =
self::getAndRenderNewsletter( self::getAndRenderNewsletter(
$data->newsletter, $data->newsletter,
@@ -25,7 +25,7 @@ class ViewInBrowser {
exit; exit;
} }
static function processData($data) { static function preProcessData($data) {
$data = (object)$data; $data = (object)$data;
if(empty($data->subscriber_id) || if(empty($data->subscriber_id) ||
empty($data->subscriber_token) || empty($data->subscriber_token) ||
@@ -38,11 +38,11 @@ class ViewInBrowser {
$data->queue = ($data->queue_id) ? $data->queue = ($data->queue_id) ?
SendingQueue::findOne($data->queue_id) : SendingQueue::findOne($data->queue_id) :
false; false;
return self::validateData($data); return $data;
} }
static function validateData($data) { static function validateData($data) {
if(!$data->subscriber || !$data->newsletter) return false; if(!$data || !$data->subscriber || !$data->newsletter) return false;
$subscriber_token_match = $subscriber_token_match =
Subscriber::verifyToken($data->subscriber->email, $data->subscriber_token); Subscriber::verifyToken($data->subscriber->email, $data->subscriber_token);
if(!$subscriber_token_match) return false; if(!$subscriber_token_match) return false;