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

Prevents previewing of sent welcome emails

Browse Source
This commit is contained in:
Vlad
2017-01-25 19:04:29 -05:00
parent e77717c4c2
commit 32f7d7771f
2 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,17 +52,22 @@ class ViewInBrowser {
) return false;
} else if(!$data->subscriber && !empty($data->preview)) {
// if this is a preview and subscriber does not exist,
// attemp to set subscriber to the current logged-in WP user
// attempt to set subscriber to the current logged-in WP user
$data->subscriber = Subscriber::getCurrentWPUser();
}
// if newsletter hash is not provided but newsletter ID is defined then subscriber must exist
if(empty($data->newsletter_hash) && $data->newsletter_id && !$data->subscriber) return false;
// queue is optional; if defined, get it
// queue is optional; try to find it if it's not defined and this is not a welcome email
if($data->newsletter->type !== Newsletter::TYPE_WELCOME) {
$data->queue = (!empty($data->queue_id)) ?
SendingQueue::findOne($data->queue_id) :
SendingQueue::where('newsletter_id', $data->newsletter->id)->findOne();
SendingQueue::where('newsletter_id', $data->newsletter->id)
->findOne();
} else {
$data->queue = false;
}
// allow users with 'manage_options' permission to preview any newsletter
if(!empty($data->preview) && current_user_can(Env::$required_permission)

19
tests/unit/Router/Endpoints/ViewInBrowserTest.php
View File

@ -158,6 +158,25 @@ class ViewInBrowserRouterTest extends MailPoetTest {
expect($result->subscriber->id)->equals(1);
}
function testItGetsOrFindsQueueWhenItIsNotAWelcomeEmail() {
$data = (object)$this->browser_preview_data;
// queue will be found when not defined
$data->queue_id = null;
$result = $this->view_in_browser->_validateBrowserPreviewData($data);
expect($result->queue->id)->equals($this->queue->id);
// queue will be found when defined
$data->queue_id = $this->queue->id;
$result = $this->view_in_browser->_validateBrowserPreviewData($data);
expect($result->queue->id)->equals($this->queue->id);
// queue will not be found when it is a welcome email
$newsletter = $this->newsletter;
$newsletter->type = Newsletter::TYPE_WELCOME;
$newsletter->save();
$data->queue_id = null;
$result = $this->view_in_browser->_validateBrowserPreviewData($data);
expect($result->queue)->false();
}
function testItProcessesBrowserPreviewData() {
$processed_data = $this->view_in_browser->_processBrowserPreviewData($this->browser_preview_data);
expect($processed_data->queue->id)->equals($this->queue->id);