'+
diff --git a/lib/Form/Widget.php b/lib/Form/Widget.php
index d9e7247839..7568a815a3 100644
--- a/lib/Form/Widget.php
+++ b/lib/Form/Widget.php
@@ -11,22 +11,28 @@ if(!defined('ABSPATH')) exit;
class Widget extends \WP_Widget {
function __construct () {
- add_action(
- 'wp_ajax_mailpoet_form_subscribe',
- array($this, 'subscribe')
- );
- add_action(
- 'wp_ajax_nopriv_mailpoet_form_subscribe',
- array($this, 'subscribe')
- );
- add_action(
- 'admin_post_nopriv_mailpoet_form_subscribe',
- array($this, 'subscribe')
- );
- add_action(
- 'admin_post_mailpoet_form_subscribe',
- array($this, 'subscribe')
- );
+ // add_action(
+ // 'wp_ajax_mailpoet_form_subscribe',
+ // array($this, 'subscribe')
+ // );
+ // add_action(
+ // 'wp_ajax_nopriv_mailpoet_form_subscribe',
+ // array($this, 'subscribe')
+ // );
+ // add_action(
+ // 'admin_post_nopriv_mailpoet_form_subscribe',
+ // array($this, 'subscribe')
+ // );
+ // add_action(
+ // 'admin_post_mailpoet_form_subscribe',
+ // array($this, 'subscribe')
+ // );
+
+ // add_action(
+ // 'init',
+ // array($this, 'subscribe')
+ // );
+
return parent::__construct(
'mailpoet_form',
__("MailPoet Subscription Form"),
@@ -190,249 +196,6 @@ class Widget extends \WP_Widget {
}
}
}
-
- static function subscribe() {
- // check to see if we're in an ajax request or post request
- $doing_ajax = (bool)(defined('DOING_AJAX') && DOING_AJAX);
-
- if(isset($_GET['action']) && $_GET['action'] === 'mailpoet_form_subscribe') {
- // input data
- $data = array();
-
- // output errors
- $errors = array();
-
- // get posted data
- // ajax data
- $data = json_decode(file_get_contents('php://input'), true);
- // -or- post data
- if($data === NULL && !empty($_POST)) { $data = $_POST; }
-
- // create or update subscriber
- $subscriber = Subscriber::where('email', $data['email'])->findOne();
-
- // is signup confirmation enabled?
- $signup_confirmation = Setting::getValue('signup_confirmation');
- if($subscriber === false) {
- // create new subscriber
- $data['status'] = (
- ($signup_confirmation['enabled'] === true)
- ? 'unconfirmed' : 'subscribed'
- );
-
- // // set custom fields
- // $meta_fields = $mailpoet->getOption('mailpoet_subscriber_meta', array());
- // if(!empty($meta_fields)) {
- // // loop through data to see if any meta field has been passed
- // foreach($meta_fields as $field => $field_data) {
- // // check if it's a mandatory field
- // $is_required = (isset($field_data['params']['required']) && (bool)$field_data['params']['required'] === true);
-
- // if(array_key_exists($field, $data)) {
- // // check if it's a mandatory field
- // if($is_required === true && empty($data[$field])) {
- // // if it's missing, throw an error
- // $errors[] = sprintf(__('"%s" is required'), $field_data['name']);
- // } else {
- // // assign field to subscriber
- // $subscriber[$field] = $data[$field];
- // }
- // }
- // }
- // }
-
- if(empty($errors)) {
- // insert new subscriber
- $subscriber = Subscriber::createOrUpdate($data);
- if($subscriber === false || !$subscriber->id()) {
- $errors = array_merge($errors, $subscriber->getValidationErrors());
- }
- }
- } else {
- // restore deleted subscriber
- if($subscriber->deleted_at !== NULL) {
- // reset subscriber state (depends whether signup confirmation is enabled)
- $subscriber
- ->set('status', array(
- ($signup_confirmation['enabled'] === true)
- ? 'unconfirmed' : 'subscribed'
- ))
- ->setExpr('deleted_at', 'NULL');
-
-
- if(!$subscriber->save()) {
- $errors[] = __('An error occurred. Please try again later.');
- }
- }
- }
-
- // check if form id has been passed
- if(isset($data['form']) && (int)$data['form'] > 0) {
- // get form id
- $form_id = (int)$data['form'];
- // get form
- $form = Form::findOne($form_id);
-
- if($form === false || !$form->id()) {
- $errors[] = __('This form does not exist. Please check your forms.');
- } else {
- // set subscriptions
- if(empty($data['segments'])) {
- $errors[] = __('You need to select a list');
- } else {
- // get segments
- $segments = Segment::whereIn('id', $data['segments'])->findMany();
- $segments_subscribed = array();
- foreach($segments as $segment) {
- if($segment->addSubscriber($subscriber->id())) {
- $segments_subscribed[] = $segment->id;
- }
- }
-
- // if signup confirmation is enabled and the subscriber is unconfirmed
- if($signup_confirmation['enabled'] === true
- && !empty($segments_subscribed)
- && $subscriber->status !== 'subscribed'
- ) {
- // TODO: send confirmation email
- // resend confirmation email
- $is_sent = static::sendSignupConfirmation(
- $subscriber->asArray(),
- $segments->asArray()
- );
-
- // error message if the email could not be sent
- if($is_sent === false) {
- $errors[] = __('The signup confirmation email could not be sent. Please check your settings.');
- }
- }
- }
- }
-
- // get success message to display after subscription
- $form_settings = (
- isset($form->settings)
- ? unserialize($form->settings) : null
- );
-
- if($subscriber !== null && empty($errors)) {
- $success = true;
- $message = $form_settings['success_message'];
- } else {
- $success = false;
- $message = join('
', $errors);
- }
-
- if($form_settings !== null) {
-
- // url params for non ajax requests
- if($doing_ajax === false) {
- // get referer
- $referer = (wp_get_referer() !== false) ? wp_get_referer() : $_SERVER['HTTP_REFERER'];
-
- // redirection parameters
- $params = array(
- 'mailpoet_form' => (int)$data['form']
- );
-
- // handle success/error messages
- if($success === false) {
- $params['mailpoet_error'] = urlencode($message);
- } else {
- $params['mailpoet_success'] = urlencode($message);
- }
- }
-
- switch ($form_settings['on_success']) {
- case 'page':
- // response depending on context
- if($doing_ajax === true) {
- echo json_encode(array(
- 'success' => $success,
- 'page' => get_permalink($form_settings['success_page']),
- 'message' => $message
- ));
- } else {
- $redirect_to = ($success === false) ? $referer : get_permalink($form_settings['success_page']);
- wp_redirect(add_query_arg($params, $redirect_to));
- }
- break;
-
- case 'message':
- default:
- // response depending on context
- if($doing_ajax === true) {
- echo json_encode(array(
- 'success' => $success,
- 'message' => $message
- ));
- } else {
- // redirect to previous page
- wp_redirect(add_query_arg($params, $referer));
- }
- break;
- }
- }
- }
- exit();
- }
- }
-
- static function sendSignupConfirmation(array $subscriber, array $segments) {
- print "
"; - print_r($subscriber); - print_r($segments); - print ""; - //$mailer = new MailPoetMailer($mailpoet->settings()->getAll()); - $signup_confirmation = Setting::getValue('signup_confirmation'); - - $body = ( - !empty($signup_confirmation['body']) - ? $signup_confirmation['body'] : '' - ); - - // check for lists_to_confirm tag - if(strpos($body, '[lists_to_confirm]') !== FALSE) { - // gather all names from lists - $segment_names = array_map(function($segment) { return $segment['list_name']; }, $segments); - // replace shortcode by list names in email's body - $body = str_replace('[lists_to_confirm]', join(', ', $segment_names), $body); - } - - // check for activation_link tags - if(strpos($body, '[activation_link]') !== FALSE && strpos($body, '[/activation_link]') !== FALSE) { - // get confirmation page id - $confirmation_page_id = $mailpoet->settings()->get('signup_confirmation_page'); - - // generate confirmation link - $confirmation_link = add_query_arg(array( - 'mailpoet_key' => $subscriber['subscriber_digest'] - ), get_permalink($confirmation_page_id)); - - // we have both tags - $body = str_replace( - array('[activation_link]', '[/activation_link]'), - array('', ''), - $body - ); - } else { - // no activation link tags detected - // TODO... - } - - // send confirmation email - return $mailer->send(array( - 'from_email' => $mailpoet->settings()->get('signup_confirmation_from_email'), - 'from_name' => $mailpoet->settings()->get('signup_confirmation_from_name'), - 'reply_email' => $mailpoet->settings()->get('signup_confirmation_reply_email'), - 'reply_name' => $mailpoet->settings()->get('signup_confirmation_reply_name'), - 'subject' => $signup_confirmation['subject'], - 'html' => nl2br($signup_confirmation['body']), -// 'text' => '', - 'to_email' => $subscriber['subscriber_email'], - 'to_name' => $subscriber['subscriber_email'], - )); - } } // mailpoet shortcodes @@ -453,13 +216,6 @@ function mailpoet_form_shortcode($params = array()) { } } -/* -add_action( - 'init', - array(__NAMESPACE__.'\Widget', 'subscribe') -); -*/ - // set the content filter to replace the shortcode if(isset($_GET['mailpoet_page']) && strlen(trim($_GET['mailpoet_page'])) > 0) { switch($_GET['mailpoet_page']) { diff --git a/lib/Listing/ItemAction.php b/lib/Listing/ItemAction.php deleted file mode 100644 index 537a503001..0000000000 --- a/lib/Listing/ItemAction.php +++ /dev/null @@ -1,36 +0,0 @@ -action = $data['action']; - unset($data['action']); - $this->model = $model_class::findOne($id); - if(!empty($data)) { - $this->data = $data; - } - return $this; - } - - function apply() { - if($this->data === null) { - return call_user_func_array( - array($this->model, $this->action), - array() - ); - } else { - return call_user_func_array( - array($this->model, $this->action), - array($this->data) - ); - } - } -} \ No newline at end of file diff --git a/lib/Models/Form.php b/lib/Models/Form.php index 78809d3bfa..d588d92225 100644 --- a/lib/Models/Form.php +++ b/lib/Models/Form.php @@ -79,33 +79,6 @@ class Form extends Model { $form = self::findOne((int)$data['id']); } - // check if the user gets to pick his own lists - // or if it's selected by the admin - $has_segment_selection = false; - - if(!empty($body)) { - foreach ($body as $i => $block) { - if($block['type'] === 'segment') { - $has_segment_selection = true; - if(!empty($block['params']['values'])) { - $list_selection = array_map(function($segment) { - if(!empty($segment)) { - return (int)$segment['id']; - } - }, $block['params']['values']); - } - break; - } - } - } - - // check list selectio - if($has_segment_selection === true) { - $settings['segments_selected_by'] = 'user'; - } else { - $settings['segments_selected_by'] = 'admin'; - } - if($form === false) { $form = self::create(); $form->hydrate($data); diff --git a/lib/Models/Segment.php b/lib/Models/Segment.php index c70dc12408..7f5abc51fe 100644 --- a/lib/Models/Segment.php +++ b/lib/Models/Segment.php @@ -109,16 +109,7 @@ class Segment extends Model { $segment->set($data); } - $saved = $segment->save(); - - if($saved === true) { - return true; - } else { - $errors = $segment->getValidationErrors(); - if(!empty($errors)) { - return $errors; - } - } - return false; + $segment->save(); + return $segment; } } diff --git a/lib/Models/Subscriber.php b/lib/Models/Subscriber.php index 3e641bf685..3df7c42603 100644 --- a/lib/Models/Subscriber.php +++ b/lib/Models/Subscriber.php @@ -117,6 +117,8 @@ class Subscriber extends Model { static function groupBy($orm, $group = null) { if($group === 'trash') { return $orm->whereNotNull('deleted_at'); + } else if($group === 'all') { + return $orm->whereNull('deleted_at'); } else { return $orm->filter($group); } @@ -158,13 +160,13 @@ class Subscriber extends Model { if(isset($data['id']) && (int)$data['id'] > 0) { $subscriber = self::findOne((int)$data['id']); + unset($data['id']); } if($subscriber === false) { $subscriber = self::create(); $subscriber->hydrate($data); } else { - unset($data['id']); $subscriber->set($data); } diff --git a/lib/Router/Forms.php b/lib/Router/Forms.php index 85276dcb46..a253469d1c 100644 --- a/lib/Router/Forms.php +++ b/lib/Router/Forms.php @@ -34,7 +34,11 @@ class Forms { // fetch segments relations for each returned item foreach($listing_data['items'] as &$item) { // form's segments - $form_settings = unserialize($item['settings']); + $form_settings = ( + (is_serialized($item['settings'])) + ? unserialize($item['settings']) + : array() + ); $item['segments'] = ( !empty($form_settings['segments']) @@ -128,7 +132,7 @@ class Forms { } } - function save_editor($data = array()) { + function saveEditor($data = array()) { $form_id = (isset($data['id']) ? (int)$data['id'] : 0); $body = (isset($data['body']) ? $data['body'] : array()); $settings = (isset($data['settings']) ? $data['settings'] : array()); @@ -149,6 +153,31 @@ class Forms { } } } + + // check if the user gets to pick his own lists + // or if it's selected by the admin + $has_segment_selection = false; + + foreach ($body as $i => $block) { + if($block['type'] === 'segment') { + $has_segment_selection = true; + if(!empty($block['params']['values'])) { + $list_selection = array_map(function($segment) { + if(!empty($segment)) { + return (int)$segment['id']; + } + }, $block['params']['values']); + } + break; + } + } + + // check list selectio + if($has_segment_selection === true) { + $settings['segments_selected_by'] = 'user'; + } else { + $settings['segments_selected_by'] = 'admin'; + } } $form = Form::createOrUpdate(array( @@ -213,7 +242,7 @@ class Forms { wp_send_json($result); } - function item_action($data = array()) { + function itemAction($data = array()) { $item_action = new Listing\ItemAction( '\MailPoet\Models\Form', $data @@ -222,7 +251,7 @@ class Forms { wp_send_json($item_action->apply()); } - function bulk_action($data = array()) { + function bulkAction($data = array()) { $bulk_action = new Listing\BulkAction( '\MailPoet\Models\Form', $data diff --git a/lib/Router/Newsletters.php b/lib/Router/Newsletters.php index c4bbe7d0e7..302314f3f3 100644 --- a/lib/Router/Newsletters.php +++ b/lib/Router/Newsletters.php @@ -204,7 +204,15 @@ class Newsletters { wp_send_json($listing_data); } - function bulk_action($data = array()) { + function itemAction($data = array()) { + $item_action = new Listing\ItemAction( + '\MailPoet\Models\Newsletter', + $data + ); + wp_send_json($item_action->apply()); + } + + function bulkAction($data = array()) { $bulk_action = new Listing\BulkAction( '\MailPoet\Models\Newsletter', $data diff --git a/lib/Router/Segments.php b/lib/Router/Segments.php index ca27ee0f90..5b4f9be6bf 100644 --- a/lib/Router/Segments.php +++ b/lib/Router/Segments.php @@ -128,16 +128,7 @@ class Segments { wp_send_json($result); } - function item_action($data = array()) { - $item_action = new Listing\ItemAction( - '\MailPoet\Models\Segment', - $data - ); - - wp_send_json($item_action->apply()); - } - - function bulk_action($data = array()) { + function bulkAction($data = array()) { $bulk_action = new Listing\BulkAction( '\MailPoet\Models\Segment', $data diff --git a/lib/Router/Subscribers.php b/lib/Router/Subscribers.php index 1663f283e0..ad35ca3fa2 100644 --- a/lib/Router/Subscribers.php +++ b/lib/Router/Subscribers.php @@ -4,6 +4,9 @@ namespace MailPoet\Router; use MailPoet\Listing; use MailPoet\Models\Subscriber; use MailPoet\Models\SubscriberSegment; +use MailPoet\Models\Segment; +use MailPoet\Models\Setting; +use MailPoet\Models\Form; if(!defined('ABSPATH')) exit; @@ -55,10 +58,188 @@ class Subscribers { } function save($data = array()) { - $result = Subscriber::createOrUpdate($data); + $result = false; + + $subscriber = Subscriber::createOrUpdate($data); + + if($subscriber !== false && !$subscriber->id()) { + $result = array( + 'errors' => $subscriber->getValidationErrors() + ); + } else { + $result = true; + } wp_send_json($result); } + function subscribe($data = array()) { + $doing_ajax = (bool)(defined('DOING_AJAX') && DOING_AJAX); + $errors = array(); + + $form = Form::findOne($data['form_id']); + unset($data['form_id']); + if($form === false || !$form->id()) { + $errors[] = __('This form does not exist.'); + } + + $segments = Segment::whereIn('id', (array)$data['segments'])->findMany(); + unset($data['segments']); + if(empty($segments)) { + $errors[] = __('You need to select a list'); + } + + if(!empty($errors)) { + wp_send_json(array('errors' => $errors)); + } else { + $subscriber = Subscriber::where('email', $data['email'])->findOne(); + } + + $signup_confirmation = Setting::getValue('signup_confirmation', array()); + + if($subscriber === false) { + // create new subscriber + $data['status'] = ( + (!empty($signup_confirmation['enabled'])) + ? 'unconfirmed' : 'subscribed' + ); + + // // set custom fields + // $meta_fields = $mailpoet->getOption('mailpoet_subscriber_meta', array()); + // if(!empty($meta_fields)) { + // // loop through data to see if any meta field has been passed + // foreach($meta_fields as $field => $field_data) { + // // check if it's a mandatory field + // $is_required = (isset($field_data['params']['required']) && (bool)$field_data['params']['required'] === true); + + // if(array_key_exists($field, $data)) { + // // check if it's a mandatory field + // if($is_required === true && empty($data[$field])) { + // // if it's missing, throw an error + // $errors[] = sprintf(__('"%s" is required'), $field_data['name']); + // } else { + // // assign field to subscriber + // $subscriber[$field] = $data[$field]; + // } + // } + // } + // } + + // insert new subscriber + $subscriber = Subscriber::createOrUpdate($data); + + if($subscriber === false || !$subscriber->id()) { + $errors = array_merge($errors, $subscriber->getValidationErrors()); + } + } else { + $subscriber->set('status', ( + !empty($signup_confirmation['enabled']) + ? 'unconfirmed' : 'subscribed' + )); + + // restore deleted subscriber + if($subscriber->deleted_at !== NULL) { + $subscriber->setExpr('deleted_at', 'NULL'); + } + + if(!$subscriber->save()) { + $errors[] = __('An error occurred. Please try again later.'); + } + } + + // get segments + // IDEA: $subscriptions->addToSegments($data['segments']); + $segments_subscribed = array(); + foreach($segments as $segment) { + if($segment->addSubscriber($subscriber->id())) { + $segments_subscribed[] = $segment->id; + } + } + + // if signup confirmation is enabled and the subscriber is unconfirmed + if(!empty($signup_confirmation['enabled']) + && !empty($segments_subscribed) + && $subscriber->status !== 'subscribed' + ) { + // TODO: send confirmation email + // resend confirmation email + $is_sent = true; + /*$is_sent = static::sendSignupConfirmation( + $subscriber->asArray(), + $segments->asArray() + );*/ + + // error message if the email could not be sent + if($is_sent === false) { + $errors[] = __('The signup confirmation email could not be sent. Please check your settings.'); + } + } + + // get success message to display after subscription + $form_settings = ( + isset($form->settings) + ? unserialize($form->settings) : null + ); + + if($subscriber !== null && empty($errors)) { + $result = true; + $message = $form_settings['success_message']; + } else { + $result = false; + } + + if($form_settings !== null) { + + // url params for non ajax requests + if($doing_ajax === false) { + // get referer + $referer = (wp_get_referer() !== false) + ? wp_get_referer() : $_SERVER['HTTP_REFERER']; + + // redirection parameters + $params = array( + 'mailpoet_form' => $form->id() + ); + + // handle success/error messages + if($result === false) { + $params['mailpoet_error'] = urlencode($message); + } else { + $params['mailpoet_success'] = urlencode($message); + } + } + + switch ($form_settings['on_success']) { + case 'page': + // response depending on context + if($doing_ajax === true) { + wp_send_json(array( + 'result' => $result, + 'page' => get_permalink($form_settings['success_page']), + 'message' => $message + )); + } else { + $redirect_to = ($result === false) ? $referer : get_permalink($form_settings['success_page']); + wp_redirect(add_query_arg($params, $redirect_to)); + } + break; + + case 'message': + default: + // response depending on context + if($doing_ajax === true) { + wp_send_json(array( + 'result' => $result, + 'message' => $message + )); + } else { + // redirect to previous page + wp_redirect(add_query_arg($params, $referer)); + } + break; + } + } + } + function restore($id) { $result = false; @@ -93,16 +274,7 @@ class Subscribers { wp_send_json($result); } - function item_action($data = array()) { - $item_action = new Listing\ItemAction( - '\MailPoet\Models\Segment', - $data - ); - - wp_send_json($item_action->apply()); - } - - function bulk_action($data = array()) { + function bulkAction($data = array()) { $bulk_action = new Listing\BulkAction( '\MailPoet\Models\Subscriber', $data diff --git a/views/form/editor.html b/views/form/editor.html index 43922f649c..a6463c4931 100644 --- a/views/form/editor.html +++ b/views/form/editor.html @@ -225,7 +225,7 @@ }, { name: "<%= __('First name') %>", - field: 'firstname', + field: 'first_name', type: 'input', params: { label: "<%= __('First name') %>" @@ -234,7 +234,7 @@ }, { name: "<%= __('Last name') %>", - field: 'lastname', + field: 'last_name', type: 'input', params: { label: "<%= __('Last name') %>" @@ -272,7 +272,7 @@ }); // toolbar: open default section - $('.mailpoet_toolbar_section[data-section="fields"]').removeClass('closed'); + $('.mailpoet_toolbar_section[data-section="shortcodes"]').removeClass('closed'); // form: edit name (in place editor) $('#mailpoet_form_edit_name').on('click', function() { @@ -381,7 +381,7 @@ MailPoet.Ajax.post({ endpoint: 'forms', - action: 'save_editor', + action: 'saveEditor', data: form }).done(function(response) { if(response === false) { @@ -425,9 +425,17 @@ $('#mailpoet_on_success_'+value).show(); } - function mailpoet_form_export(exports) { + function mailpoet_form_export() { var template = Handlebars.compile($('#form_template_exports').html()); - $('#mailpoet_form_export').html(template({ exports: exports })); + MailPoet.Ajax.post({ + endpoint: 'forms', + action: 'getExports', + data: $('#mailpoet_form_id').val() + }).done(function(response) { + if(response !== false) { + $('#mailpoet_form_export').html(template({ exports: response })); + } + }); } $(document).on('click', '.mailpoet_form_export_toggle', function() { diff --git a/views/form/templates/settings/field.hbs b/views/form/templates/settings/field.hbs index fc702f770e..ebeae74af5 100644 --- a/views/form/templates/settings/field.hbs +++ b/views/form/templates/settings/field.hbs @@ -6,7 +6,7 @@ {{#ifCond type '==' 'input'}} {{> _settings_label }} {{> _settings_label_within }} - {{#ifCond field 'in' 'firstname,lastname' }} + {{#ifCond field 'in' 'first_name,last_name' }} {{> _settings_required }} {{/ifCond}} {{/ifCond}} diff --git a/views/form/widget.html b/views/form/widget.html index 607b937264..acb12d277c 100644 --- a/views/form/widget.html +++ b/views/form/widget.html @@ -15,7 +15,7 @@ > - + <% if not(settings.segments_selected_by == 'user') %> diff --git a/webpack.config.js b/webpack.config.js index 4df585b886..475ad7d704 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -146,7 +146,12 @@ config.push(_.extend({}, baseConfig, { config.push(_.extend({}, baseConfig, { name: 'public', entry: { - public: ['mailpoet', 'ajax', 'public.js'] + public: [ + 'mailpoet', + 'ajax', + 'jquery.serialize_object', + 'public.js' + ] }, externals: { 'jquery': 'jQuery'