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

- Refactors view in browser

Browse Source
This commit is contained in:
Vlad
2016-08-23 23:42:26 -04:00
parent c807ead5fd
commit 80fddd6c58
2 changed files with 55 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
lib/Newsletter/ViewInBrowser.php
View File

@@ -1,67 +1,32 @@
<?php <?php
namespace MailPoet\Newsletter; namespace MailPoet\Newsletter;
use MailPoet\Models\Newsletter;
use MailPoet\Models\SendingQueue;
use MailPoet\Models\Setting; use MailPoet\Models\Setting;
use MailPoet\Models\Subscriber;
use MailPoet\Newsletter\Links\Links; use MailPoet\Newsletter\Links\Links;
use MailPoet\Newsletter\Renderer\Renderer; use MailPoet\Newsletter\Renderer\Renderer;
use MailPoet\Newsletter\Shortcodes\Shortcodes; use MailPoet\Newsletter\Shortcodes\Shortcodes;
class ViewInBrowser { class ViewInBrowser {
static function view($data) { function view($data) {
$data = self::preProcessData($data); if(!$data) {
if(!self::validateData($data)) self::abort(); return $this->abort();
}
$wp_user_preview = ($data->preview && $data->subscriber->isWPUser());
$rendered_newsletter = $rendered_newsletter =
self::getAndRenderNewsletter( $this->renderNewsletter(
$data->newsletter, $data->newsletter,
$data->subscriber, $data->subscriber,
$data->queue, $data->queue,
$data->preview $wp_user_preview
); );
header('Content-Type: text/html; charset=utf-8'); return $this->displayNewsletter($rendered_newsletter);
echo $rendered_newsletter;
exit;
} }
static function preProcessData($data) { function renderNewsletter($newsletter, $subscriber, $queue, $wp_user_preview) {
$data = (object)$data;
if(empty($data->subscriber_id) ||
empty($data->subscriber_token) ||
empty($data->newsletter_id)
) {
return false;
}
$data->newsletter = Newsletter::findOne($data->newsletter_id);
$data->subscriber = Subscriber::findOne($data->subscriber_id);
$data->queue = ($data->queue_id) ?
SendingQueue::findOne($data->queue_id) :
false;
return $data;
}
static function validateData($data) {
if(!$data || !$data->subscriber || !$data->newsletter) return false;
$subscriber_token_match =
Subscriber::verifyToken($data->subscriber->email, $data->subscriber_token);
if(!$subscriber_token_match) return false;
// return if this is a WP user previewing the newsletter
if($data->subscriber->isWPUser() && $data->preview) {
return $data;
}
// if queue exists, check if the newsletter was sent to the subscriber
if($data->queue && !$data->queue->isSubscriberProcessed($data->subscriber->id)) {
$data = false;
}
return $data;
}
static function getAndRenderNewsletter($newsletter, $subscriber, $queue, $preview) {
if($queue && $queue->newsletter_rendered_body) { if($queue && $queue->newsletter_rendered_body) {
$newsletter_body = $queue->getRenderedNewsletterBody(); $newsletter_body = $queue->getRenderedNewsletterBody();
} else { } else {
$renderer = new Renderer($newsletter, $preview); $renderer = new Renderer($newsletter, $wp_user_preview);
$newsletter_body = $renderer->render(); $newsletter_body = $renderer->render();
} }
$shortcodes = new Shortcodes( $shortcodes = new Shortcodes(
@@ -75,13 +40,19 @@ class ViewInBrowser {
$subscriber->id, $subscriber->id,
$queue->id, $queue->id,
$rendered_newsletter, $rendered_newsletter,
$preview $wp_user_preview
); );
} }
return $rendered_newsletter; return $rendered_newsletter;
} }
private static function abort() { function displayNewsletter($rendered_newsletter) {
header('Content-Type: text/html; charset=utf-8');
echo $rendered_newsletter;
exit;
}
function abort() {
status_header(404); status_header(404);
exit; exit;
} }

38
lib/Router/Endpoints/ViewInBrowser.php
View File

@@ -1,6 +1,9 @@
<?php <?php
namespace MailPoet\Router\Endpoints; namespace MailPoet\Router\Endpoints;
use MailPoet\Models\Newsletter;
use MailPoet\Models\SendingQueue;
use MailPoet\Models\Subscriber;
use MailPoet\Newsletter\ViewInBrowser as NewsletterViewInBrowser; use MailPoet\Newsletter\ViewInBrowser as NewsletterViewInBrowser;
if(!defined('ABSPATH')) exit; if(!defined('ABSPATH')) exit;
@@ -10,6 +13,39 @@ class ViewInBrowser {
const ACTION_VIEW = 'view'; const ACTION_VIEW = 'view';
static function view($data) { static function view($data) {
NewsletterViewInBrowser::view($data); $view_in_browser = new NewsletterViewInBrowser();
$view_in_browser->view(self::_processBrowserPreviewData($data));
}
static function _processBrowserPreviewData($data) {
$data = (object)$data;
if(empty($data->subscriber_id) ||
empty($data->subscriber_token) ||
empty($data->newsletter_id)
) {
return false;
}
$data->newsletter = Newsletter::findOne($data->newsletter_id);
$data->subscriber = Subscriber::findOne($data->subscriber_id);
$data->queue = ($data->queue_id) ?
SendingQueue::findOne($data->queue_id) :
false;
return self::_validateBrowserPreviewData($data);
}
static function _validateBrowserPreviewData($data) {
if(!$data || !$data->subscriber || !$data->newsletter) return false;
$subscriber_token_match =
Subscriber::verifyToken($data->subscriber->email, $data->subscriber_token);
if(!$subscriber_token_match) return false;
// return if this is a WP user previewing the newsletter
if($data->subscriber->isWPUser() && $data->preview) {
return $data;
}
// if queue exists, check if the newsletter was sent to the subscriber
if($data->queue && !$data->queue->isSubscriberProcessed($data->subscriber->id)) {
$data = false;
}
return $data;
} }
} }