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

Verify preview input data, remove "Sender" inputs

Browse Source
This commit is contained in:
Tautvidas Sipavičius
2016-01-13 14:28:43 +02:00
parent 2cb32e7a78
commit 6642bb3bfa
3 changed files with 26 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
assets/js/src/newsletter_editor/components/sidebar.js
View File

@ -242,10 +242,6 @@ define([
console.log('trying to send a preview');
// get form data
var data = {
sender: {
name: this.$('#mailpoet_preview_from_name').val(),
address: this.$('#mailpoet_preview_from_email').val(),
},
subscriber: this.$('#mailpoet_preview_to_email').val(),
id: App.getNewsletter().get('id'),
};
@ -258,7 +254,7 @@ define([
MailPoet.Notice.success(App.getConfig().get('translations.newsletterPreviewSent'));
} else {
if (_.isArray(response.errors)) {
MailPoet.Notice.error("\n".join(response.errors));
MailPoet.Notice.error(response.errors.join("\n"));
} else {
MailPoet.Notice.error(App.getConfig().get('translations.newsletterPreviewFailedToSend'));
}

48
lib/Router/Newsletters.php
View File

@ -225,32 +225,34 @@ class Newsletters {
wp_send_json(array(
'result' => false
));
} else {
$newsletter = $newsletter->asArray();
}
if (empty($data['subscriber'])) {
wp_send_json(array(
'result' => false,
'errors' => array(__('Please specify receiver information')),
));
}
$renderer = new Renderer($newsletter);
$rendered_body = $renderer->render();
$newsletter['body'] = array(
'html' => $rendered_body,
'text' => '',
);
$newsletter = $newsletter->asArray();
try {
$mailer = new \MailPoet\Mailer\Mailer(
false,
(isset($data['sender'])) ? $data['sender'] : false,
false
);
$renderer = new Renderer($newsletter);
$rendered_body = $renderer->render();
$newsletter['body'] = array(
'html' => $rendered_body,
'text' => '',
);
wp_send_json(array(
'result' => $mailer->send($newsletter, $data['subscriber'])
));
} catch (\Exception $e) {
wp_send_json(array(
'result' => false,
'errors' => array($e->getMessage()),
));
}
try {
$mailer = new \MailPoet\Mailer\Mailer(false, false, false);
wp_send_json(array(
'result' => $mailer->send($newsletter, $data['subscriber'])
));
} catch (\Exception $e) {
wp_send_json(array(
'result' => false,
'errors' => array($e->getMessage()),
));
}
}

14
views/newsletter/templates/components/sidebar/preview.hbs
View File

@ -1,20 +1,6 @@
<div class="handlediv" title="Click to toggle"><br></div>
<h3><%= __('Preview') %></h3>
<div class="mailpoet_region_content">
<div class="mailpoet_form_field">
<label>
<%= __('From name') %><br />
<input id="mailpoet_preview_from_name" class="mailpoet_input mailpoet_input_full" type="text" name="from_name" value="{{ from_name }}" />
</label>
</div>
<div class="mailpoet_form_field">
<label>
<%= __('From email') %><br />
<input id="mailpoet_preview_from_email" class="mailpoet_input mailpoet_input_full" type="text" name="from_email" value="{{ from_email }}" />
</label>
</div>
<div class="mailpoet_form_field">
<label>
<%= __('Send preview to') %><br />