Bump up release version to 0.0.46

Unit tests

assets/js/src/forms/list.jsx

@@ -151,6 +151,10 @@ const FormList = React.createClass({
       return segment.name;
     }).join(', ');
 
+    if (form.settings.segments_selected_by === 'user') {
+      segments = MailPoet.I18n.t('userChoice') + ' ' + segments;
+    }
+
     return (
       <div>
         <td className={ row_classes }>

assets/js/src/newsletter_editor/blocks/footer.js

@@ -71,11 +71,17 @@ define([
             that.model.set('text', editor.getContent());
           });
 
+          editor.on('click', function(e) {
+            editor.focus();
+          });
+
           editor.on('focus', function(e) {
+            that.disableDragging();
             that.disableShowingTools();
           });
 
           editor.on('blur', function(e) {
+            that.enableDragging();
             that.enableShowingTools();
           });
         },
@@ -84,6 +90,12 @@ define([
         mailpoet_shortcodes_window_title: MailPoet.I18n.t('shortcodesWindowTitle'),
       });
     },
+    disableDragging: function() {
+      this.$('.mailpoet_content').addClass('mailpoet_ignore_drag');
+    },
+    enableDragging: function() {
+      this.$('.mailpoet_content').removeClass('mailpoet_ignore_drag');
+    },
   });
 
   Module.FooterBlockToolsView = base.BlockToolsView.extend({

assets/js/src/newsletter_editor/blocks/header.js

@@ -71,11 +71,17 @@ define([
             that.model.set('text', editor.getContent());
           });
 
+          editor.on('click', function(e) {
+            editor.focus();
+          });
+
           editor.on('focus', function(e) {
+            that.disableDragging();
             that.disableShowingTools();
           });
 
           editor.on('blur', function(e) {
+            that.enableDragging();
             that.enableShowingTools();
           });
         },
@@ -84,6 +90,12 @@ define([
         mailpoet_shortcodes_window_title: MailPoet.I18n.t('shortcodesWindowTitle'),
       });
     },
+    disableDragging: function() {
+      this.$('.mailpoet_content').addClass('mailpoet_ignore_drag');
+    },
+    enableDragging: function() {
+      this.$('.mailpoet_content').removeClass('mailpoet_ignore_drag');
+    },
   });
 
   Module.HeaderBlockToolsView = base.BlockToolsView.extend({

assets/js/src/newsletter_editor/blocks/text.js

@@ -69,11 +69,17 @@ define([
               that.model.set('text', editor.getContent());
             });
 
+            editor.on('click', function(e) {
+              editor.focus();
+            });
+
             editor.on('focus', function(e) {
+              that.disableDragging();
               that.disableShowingTools();
             });
 
             editor.on('blur', function(e) {
+              that.enableDragging();
               that.enableShowingTools();
             });
           },
@@ -83,6 +89,12 @@ define([
         });
       }
     },
+    disableDragging: function() {
+      this.$('.mailpoet_content').addClass('mailpoet_ignore_drag');
+    },
+    enableDragging: function() {
+      this.$('.mailpoet_content').removeClass('mailpoet_ignore_drag');
+    },
   });
 
   Module.TextBlockToolsView = base.BlockToolsView.extend({

assets/js/src/public.js

@@ -44,29 +44,36 @@ function(
               endpoint: 'subscribers',
               action: 'subscribe',
               data: data
+            }).fail(function(response) {
+              form.find('.mailpoet_validate_error').html(
+                response.errors.map(function(error) {
+                  return error.message;
+                }).join('<br />')
+              ).show();
             }).done(function(response) {
-              if(response.result === false) {
+              // successfully subscribed
-                form.find('.mailpoet_validate_error').html(
+              if (
-                  response.errors.join('<br />')
+                response.meta !== undefined
-                ).show();
+                && response.meta.redirect_url !== undefined
+              ) {
+                // go to page
+                window.location.href = response.meta.redirect_url;
               } else {
-                // successfully subscribed
+                // display success message
-                if(response.page !== undefined) {
+                form.find('.mailpoet_validate_success').show();
-                  // go to page
-                  window.location.href = response.page;
-                } else {
-                  // display success message
-                  form.find('.mailpoet_validate_success').show();
-                }
-
-                // reset form
-                form.trigger('reset');
-                // reset validation
-                parsley.reset();
               }
 
+              // reset form
+              form.trigger('reset');
+              // reset validation
+              parsley.reset();
+
               // resize iframe
-              if(window.frameElement !== null) {
+              if (
+                window.frameElement !== null
+                && MailPoet !== undefined
+                && MailPoet['Iframe']
+              ) {
                 MailPoet.Iframe.autoSize(window.frameElement);
               }
             });

lib/API/API.php

@@ -6,9 +6,6 @@ use \MailPoet\Util\Security;
 if(!defined('ABSPATH')) exit;
 
 class API {
-  function __construct() {
-  }
-
   function init() {
     // security token
     add_action(
@@ -27,11 +24,6 @@ class API {
       'wp_ajax_nopriv_mailpoet',
       array($this, 'setupPublic')
     );
-    // Public API (Post)
-    add_action(
-      'admin_post_nopriv_mailpoet',
-      array($this, 'setupPublic')
-    );
   }
 
   function setupAdmin() {
@@ -79,14 +71,7 @@ class API {
     $class = ucfirst($_POST['endpoint']);
     $endpoint =  __NAMESPACE__ . "\\Endpoints\\" . $class;
     $method = $_POST['method'];
-
+    $data = isset($_POST['data']) ? stripslashes_deep($_POST['data']) : array();
-    $doing_ajax = (bool)(defined('DOING_AJAX') && DOING_AJAX);
-
-    if($doing_ajax) {
-      $data = isset($_POST['data']) ? stripslashes_deep($_POST['data']) : array();
-    } else {
-      $data = $_POST;
-    }
 
     if(is_array($data) && !empty($data)) {
       // filter out reserved keywords from data

lib/API/Endpoints/CustomFields.php

@@ -8,7 +8,7 @@ if(!defined('ABSPATH')) exit;
 
 class CustomFields extends APIEndpoint {
   function getAll() {
-    $collection = CustomField::findMany();
+    $collection = CustomField::orderByAsc('created_at')->findMany();
     $custom_fields = array_map(function($custom_field) {
       return $custom_field->asArray();
     }, $collection);

lib/API/Endpoints/Forms.php

@@ -156,7 +156,6 @@ class Forms extends APIEndpoint {
     // 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;
@@ -164,7 +163,7 @@ class Forms extends APIEndpoint {
           $list_selection = array_filter(
             array_map(function($segment) {
               return (isset($segment['id'])
-                ? (int)$segment['id']
+                ? $segment['id']
                 : null
               );
             }, $block['params']['values'])
@@ -177,6 +176,7 @@ class Forms extends APIEndpoint {
     // check list selection
     if($has_segment_selection === true) {
       $settings['segments_selected_by'] = 'user';
+      $settings['segments'] = $list_selection;
     } else {
       $settings['segments_selected_by'] = 'admin';
     }

lib/API/Endpoints/Newsletters.php

@@ -404,7 +404,8 @@ class Newsletters extends APIEndpoint {
         &&
         $data['type'] === Newsletter::TYPE_NOTIFICATION
       ) {
-        Scheduler::processPostNotificationSchedule($newsletter->id);
+        $newsletter = Newsletter::filter('filterWithOptions')->findOne($newsletter->id);
+        Scheduler::processPostNotificationSchedule($newsletter);
       }
 
       return $this->successResponse(

lib/API/Endpoints/SendingQueue.php

@@ -67,7 +67,7 @@ class SendingQueue extends APIEndpoint {
 
       // set queue status
       $queue->status = SendingQueueModel::STATUS_SCHEDULED;
-      $queue->scheduled_at = Scheduler::scheduleFromTimestamp(
+      $queue->scheduled_at = Scheduler::formatDatetimeString(
         $newsletter->scheduledAt
       );
       $queue->subscribers = null;

lib/API/Endpoints/Subscribers.php

@@ -11,7 +11,6 @@ use MailPoet\Models\Segment;
 use MailPoet\Models\Setting;
 use MailPoet\Models\Form;
 use MailPoet\Models\StatisticsForms;
-use MailPoet\Util\Url;
 
 if(!defined('ABSPATH')) exit;
 
@@ -56,14 +55,9 @@ class Subscribers extends APIEndpoint {
   }
 
   function subscribe($data = array()) {
-    $doing_ajax = (bool)(defined('DOING_AJAX') && DOING_AJAX);
+    $form_id = (isset($data['form_id']) ? (int)$data['form_id'] : false);
-    $errors = array();
+    $form = Form::findOne($form_id);
-
-    $form = Form::findOne($data['form_id']);
     unset($data['form_id']);
-    if($form === false || !$form->id()) {
-      $errors[] = __('This form does not exist');
-    }
 
     $segment_ids = (!empty($data['segments'])
       ? (array)$data['segments']
@@ -72,72 +66,37 @@ class Subscribers extends APIEndpoint {
     unset($data['segments']);
 
     if(empty($segment_ids)) {
-      $errors[] = __('Please select a list');
+      return $this->badRequest(array(
-    }
+        APIError::BAD_REQUEST => __('Please select a list')
-
+      ));
-    if(!empty($errors)) {
-      return array(
-        'result' => false,
-        'errors' => $errors
-      );
     }
 
     $subscriber = Subscriber::subscribe($data, $segment_ids);
     $errors = $subscriber->getErrors();
-    $result = ($errors === false && $subscriber->id() > 0);
 
-    // record form statistics
+    if($errors !== false) {
-    if($result === true && $form !== false && $form->id > 0) {
+      return $this->badRequest($errors);
-      StatisticsForms::record($form->id, $subscriber->id);
+    } else {
-    }
+      $meta = array();
 
-    // get success message to display after subscription
+      if($form !== false) {
-    $form_settings = (
+        // record form statistics
-      isset($form->settings)
+        StatisticsForms::record($form->id, $subscriber->id);
-      ? unserialize($form->settings)
-      : null
-    );
 
-    if($form_settings !== null) {
+        $form = $form->asArray();
-      switch($form_settings['on_success']) {
-        case 'page':
-          $success_page_url = get_permalink($form_settings['success_page']);
 
-          // response depending on context
+        if($form['settings']['on_success'] === 'page') {
-          if($doing_ajax === true) {
+          // redirect to a page on a success, pass the page url in the meta
-            return array(
+          $meta['redirect_url'] = get_permalink($form['settings']['success_page']);
-              'result' => $result,
+        } else if($form['settings']['on_success'] === 'url') {
-              'page' => $success_page_url,
+          $meta['redirect_url'] = $form['settings']['success_url'];
-              'errors' => $errors
+        }
-            );
-          } else {
-            if($result === false) {
-              Url::redirectBack();
-            } else {
-              Url::redirectTo($success_page_url);
-            }
-          }
-          break;
-
-        case 'message':
-        default:
-          // response depending on context
-          if($doing_ajax === true) {
-            return array(
-              'result' => $result,
-              'errors' => $errors
-            );
-          } else {
-            $params = (
-              ($result === true)
-              ? array('mailpoet_success' => $form->id)
-              : array()
-            );
-
-            Url::redirectBack($params);
-          }
-          break;
       }
+
+      return $this->successResponse(
+        Subscriber::findOne($subscriber->id)->asArray(),
+        $meta
+      );
     }
   }
 

lib/Config/Hooks.php

@@ -91,6 +91,16 @@ class Hooks {
       'admin_post_nopriv_mailpoet_subscription_update',
       '\MailPoet\Subscription\Manage::onSave'
     );
+
+    // Subscription form
+    add_action(
+      'admin_post_mailpoet_subscription_form',
+      '\MailPoet\Subscription\Form::onSubmit'
+    );
+    add_action(
+      'admin_post_nopriv_mailpoet_subscription_form',
+      '\MailPoet\Subscription\Form::onSubmit'
+    );
   }
 
   function setupWPUsers() {

lib/Cron/CronHelper.php

@@ -38,11 +38,6 @@ class CronHelper {
     );
   }
 
-  static function stopDaemon() {
-    $daemon = self::getDaemon();
-    return self::saveDaemon($daemon);
-  }
-
   static function deleteDaemon() {
     return Setting::deleteValue(self::DAEMON_SETTING);
   }

lib/Cron/Workers/SendingQueue/SendingQueue.php

@@ -4,24 +4,22 @@ namespace MailPoet\Cron\Workers\SendingQueue;
 use MailPoet\Cron\CronHelper;
 use MailPoet\Cron\Workers\SendingQueue\Tasks\Mailer as MailerTask;
 use MailPoet\Cron\Workers\SendingQueue\Tasks\Newsletter as NewsletterTask;
-use MailPoet\Cron\Workers\SendingQueue\Tasks\Subscribers as SubscribersTask;
 use MailPoet\Mailer\MailerLog;
 use MailPoet\Models\SendingQueue as SendingQueueModel;
 use MailPoet\Models\StatisticsNewsletters as StatisticsNewslettersModel;
 use MailPoet\Models\Subscriber as SubscriberModel;
-use MailPoet\Util\Helpers;
 
 if(!defined('ABSPATH')) exit;
 
 class SendingQueue {
   public $mailer_task;
   public $newsletter_task;
-  private $timer;
+  public $timer;
   const BATCH_SIZE = 50;
 
-  function __construct($timer = false) {
+  function __construct($timer = false, $mailer_task = false, $newsletter_task = false) {
-    $this->mailer_task = new MailerTask();
+    $this->mailer_task = ($mailer_task) ? $mailer_task : new MailerTask();
-    $this->newsletter_task = new NewsletterTask();
+    $this->newsletter_task = ($newsletter_task) ? $newsletter_task : new NewsletterTask();
     $this->timer = ($timer) ? $timer : microtime(true);
     // abort if execution or sending limit are reached
     CronHelper::enforceExecutionLimit($this->timer);
@@ -32,17 +30,13 @@ class SendingQueue {
       // abort if sending limit is reached
       MailerLog::enforceSendingLimit();
       // get and pre-process newsletter (render, replace shortcodes/links, etc.)
-      $newsletter = $this->newsletter_task->getAndPreProcess($queue->asArray());
+      $newsletter = $this->newsletter_task->getAndPreProcess($queue);
       if(!$newsletter) {
         $queue->delete();
         continue;
       }
       // configure mailer
       $this->mailer_task->configureMailer($newsletter);
-      if(is_null($queue->newsletter_rendered_body)) {
-        $queue->newsletter_rendered_body = json_encode($newsletter['rendered_body']);
-        $queue->save();
-      }
       // get subscribers
       $queue->subscribers = $queue->getSubscribers();
       $subscriber_batches = array_chunk(
@@ -50,20 +44,24 @@ class SendingQueue {
         self::BATCH_SIZE
       );
       foreach($subscriber_batches as $subscribers_to_process_ids) {
+        // abort if execution limit is reached
+        CronHelper::enforceExecutionLimit($this->timer);
         $found_subscribers = SubscriberModel::whereIn('id', $subscribers_to_process_ids)
-          ->findArray();
+          ->findMany();
-        $found_subscribers_ids = Helpers::arrayColumn($found_subscribers, 'id');
+        $found_subscribers_ids = array_map(function($subscriber) {
+          return $subscriber->id;
+        }, $found_subscribers);
         // if some subscribers weren't found, remove them from the processing list
         if(count($found_subscribers_ids) !== count($subscribers_to_process_ids)) {
-          $queue->subscribers = SubscribersTask::updateToProcessList(
+          $subscibers_to_remove = array_diff(
-            $found_subscribers_ids,
             $subscribers_to_process_ids,
-            $queue->subscribers
+            $found_subscribers_ids
           );
-        }
+          $queue->removeNonexistentSubscribers($subscibers_to_remove);
-        if(!count($queue->subscribers['to_process'])) {
+          if(!count($queue->subscribers['to_process'])) {
-          $this->updateQueue($queue);
+            $this->newsletter_task->markNewsletterAsSent($newsletter);
-          continue;
+            continue;
+          }
         }
         $queue = $this->processQueue(
           $queue,
@@ -71,10 +69,8 @@ class SendingQueue {
           $found_subscribers
         );
         if($queue->status === SendingQueueModel::STATUS_COMPLETED) {
-          $this->newsletter_task->markNewsletterAsSent($queue->newsletter_id);
+          $this->newsletter_task->markNewsletterAsSent($newsletter);
         }
-        // abort if execution limit is reached
-        CronHelper::enforceExecutionLimit($this->timer);
       }
     }
   }
@@ -92,7 +88,7 @@ class SendingQueue {
         $this->newsletter_task->prepareNewsletterForSending(
           $newsletter,
           $subscriber,
-          $queue->asArray()
+          $queue
         );
       if(!$queue->newsletter_rendered_subject) {
         $queue->newsletter_rendered_subject = $prepared_newsletters[0]['subject'];
@@ -101,11 +97,11 @@ class SendingQueue {
       $prepared_subscribers[] = $this->mailer_task->prepareSubscriberForSending(
         $subscriber
       );
-      $prepared_subscribers_ids[] = $subscriber['id'];
+      $prepared_subscribers_ids[] = $subscriber->id;
       // keep track of values for statistics purposes
       $statistics[] = array(
-        'newsletter_id' => $newsletter['id'],
+        'newsletter_id' => $newsletter->id,
-        'subscriber_id' => $subscriber['id'],
+        'subscriber_id' => $subscriber->id,
         'queue_id' => $queue->id
       );
       if($processing_method === 'individual') {
@@ -145,22 +141,14 @@ class SendingQueue {
     );
     if(!$send_result) {
       // update failed/to process list
-      $queue->subscribers = SubscribersTask::updateFailedList(
+      $queue->updateFailedSubscribers($prepared_subscribers_ids);
-        $prepared_subscribers_ids,
-        $queue->subscribers
-      );
-      $queue = $this->updateQueue($queue);
     } else {
       // update processed/to process list
-      $queue->subscribers = SubscribersTask::updateProcessedList(
+      $queue->updateProcessedSubscribers($prepared_subscribers_ids);
-        $prepared_subscribers_ids,
-        $queue->subscribers
-      );
       // log statistics
       StatisticsNewslettersModel::createMultiple($statistics);
       // update the sent count
       $this->mailer_task->updateSentCount();
-      $queue = $this->updateQueue($queue);
       // enforce sending limit if there are still subscribers left to process
       if($queue->count_to_process) {
         MailerLog::enforceSendingLimit();
@@ -175,18 +163,4 @@ class SendingQueue {
       ->whereNull('status')
       ->findMany();
   }
-
-  function updateQueue($queue) {
-    $queue->count_processed =
-      count($queue->subscribers['processed']) + count($queue->subscribers['failed']);
-    $queue->count_to_process = count($queue->subscribers['to_process']);
-    $queue->count_failed = count($queue->subscribers['failed']);
-    $queue->count_total =
-      $queue->count_processed + $queue->count_to_process;
-    if(!$queue->count_to_process) {
-      $queue->processed_at = current_time('mysql');
-      $queue->status = SendingQueueModel::STATUS_COMPLETED;
-    }
-    return $queue->save();
-  }
 }

lib/Cron/Workers/SendingQueue/Tasks/Links.php

@@ -7,27 +7,27 @@ use MailPoet\Util\Helpers;
 if(!defined('ABSPATH')) exit;
 
 class Links {
-  static function process(array $newsletter, array $queue) {
+  static function process($rendered_newsletter, $newsletter, $queue) {
-    list($newsletter, $links) = self::hashAndReplaceLinks($newsletter, $queue);
+    list($rendered_newsletter, $links) =
+      self::hashAndReplaceLinks($rendered_newsletter);
     self::saveLinks($links, $newsletter, $queue);
-    return $newsletter;
+    return $rendered_newsletter;
   }
 
-  static function hashAndReplaceLinks(array $newsletter, array $queue) {
+  static function hashAndReplaceLinks($rendered_newsletter) {
     // join HTML and TEXT rendered body into a text string
-    $content = Helpers::joinObject($newsletter['rendered_body']);
+    $content = Helpers::joinObject($rendered_newsletter);
     list($content, $links) = NewsletterLinks::process($content);
     // split the processed body with hashed links back to HTML and TEXT
-    list($newsletter['rendered_body']['html'], $newsletter['rendered_body']['text'])
+    list($rendered_newsletter['html'], $rendered_newsletter['text'])
       = Helpers::splitObject($content);
     return array(
-      $newsletter,
+      $rendered_newsletter,
       $links
     );
   }
 
   static function saveLinks($links, $newsletter, $queue) {
-    return NewsletterLinks::save($links, $newsletter['id'], $queue['id']);
+    return NewsletterLinks::save($links, $newsletter->id, $queue->id);
   }
-}
+}
-

lib/Cron/Workers/SendingQueue/Tasks/Mailer.php

@@ -9,22 +9,22 @@ if(!defined('ABSPATH')) exit;
 class Mailer {
   public $mailer;
 
-  function __construct() {
+  function __construct($mailer = false) {
-    $this->mailer = $this->configureMailer();
+    $this->mailer = ($mailer) ? $mailer : $this->configureMailer();
   }
 
-  function configureMailer(array $newsletter = null) {
+  function configureMailer($newsletter = null) {
-    $sender['address'] = (!empty($newsletter['sender_address'])) ?
+    $sender['address'] = (!empty($newsletter->sender_address)) ?
-      $newsletter['sender_address'] :
+      $newsletter->sender_address :
       false;
-    $sender['name'] = (!empty($newsletter['sender_name'])) ?
+    $sender['name'] = (!empty($newsletter->sender_name)) ?
-      $newsletter['sender_name'] :
+      $newsletter->sender_name :
       false;
-    $reply_to['address'] = (!empty($newsletter['reply_to_address'])) ?
+    $reply_to['address'] = (!empty($newsletter->reply_to_address)) ?
-      $newsletter['reply_to_address'] :
+      $newsletter->reply_to_address :
       false;
-    $reply_to['name'] = (!empty($newsletter['reply_to_name'])) ?
+    $reply_to['name'] = (!empty($newsletter->reply_to_name)) ?
-      $newsletter['reply_to_name'] :
+      $newsletter->reply_to_name :
       false;
     if(!$sender['address']) {
       $sender = false;
@@ -50,8 +50,8 @@ class Mailer {
       'individual';
   }
 
-  function prepareSubscriberForSending(array $subscriber) {
+  function prepareSubscriberForSending($subscriber) {
-    return $this->mailer->transformSubscriber($subscriber);
+    return $this->mailer->formatSubscriberNameAndEmailAddress($subscriber);
   }
 
   function send($prepared_newsletters, $prepared_subscribers) {

lib/Cron/Workers/SendingQueue/Tasks/Newsletter.php

@@ -19,65 +19,52 @@ class Newsletter {
 
   function __construct() {
     $this->tracking_enabled = (boolean)Setting::getValue('tracking.enabled');
-    $this->tracking_image_inserted = false;
   }
 
-  function get($newsletter_id) {
+  function getAndPreProcess($queue) {
-    $newsletter = NewsletterModel::findOne($newsletter_id);
+    $newsletter = $queue->newsletter()->findOne();
-    return ($newsletter) ? $newsletter->asArray() : false;
-  }
-
-  function getAndPreProcess(array $queue) {
-    $newsletter = $this->get($queue['newsletter_id']);
     if(!$newsletter) {
       return false;
     }
     // if the newsletter was previously rendered, return it
     // otherwise, process/render it
-    if(!is_null($queue['newsletter_rendered_body'])) {
+    if(!is_null($queue->getNewsletterRenderedBody())) {
-      $newsletter['rendered_body'] = json_decode($queue['newsletter_rendered_body'], true);
       return $newsletter;
     }
     // if tracking is enabled, do additional processing
     if($this->tracking_enabled) {
-      // hook once to the newsletter post-processing filter and add tracking image
+      // hook to the newsletter post-processing filter and add tracking image
-      if(!$this->tracking_image_inserted) {
+      $this->tracking_image_inserted = OpenTracking::addTrackingImage();
-        $this->tracking_image_inserted = OpenTracking::addTrackingImage();
+      // render newsletter and save its
-      }
+      $rendered_newsletter = $newsletter->render();
-      // render newsletter
-      $newsletter = $this->render($newsletter);
       // hash and save all links
-      $newsletter = LinksTask::process($newsletter, $queue);
+      $rendered_newsletter = LinksTask::process($rendered_newsletter, $newsletter, $queue);
     } else {
       // render newsletter
-      $newsletter = $this->render($newsletter);
+      $rendered_newsletter = $newsletter->render();
     }
     // check if this is a post notification and if it contains posts
-    $newsletter_contains_posts = strpos($newsletter['rendered_body']['html'], 'data-post-id');
+    $newsletter_contains_posts = strpos($rendered_newsletter['html'], 'data-post-id');
-    if($newsletter['type'] === 'notification' && !$newsletter_contains_posts) {
+    if($newsletter->type === 'notification' && !$newsletter_contains_posts) {
       return false;
     }
     // extract and save newsletter posts
-    PostsTask::extractAndSave($newsletter);
+    PostsTask::extractAndSave($rendered_newsletter, $newsletter);
+    // update queue with the rendered and pre-processed newsletter
+    $queue->newsletter_rendered_body = $rendered_newsletter;
+    $queue->save();
     return $newsletter;
   }
 
-  function render(array $newsletter) {
+  function prepareNewsletterForSending($newsletter, $subscriber, $queue) {
-    $renderer = new Renderer($newsletter);
-    $newsletter['rendered_body'] = $renderer->render();
-    return $newsletter;
-  }
-
-  function prepareNewsletterForSending(
-    array $newsletter, array $subscriber, array $queue
-  ) {
     // shortcodes and links will be replaced in the subject, html and text body
     // to speed the processing, join content into a continuous string
+    $rendered_newsletter = $queue->getNewsletterRenderedBody();
     $prepared_newsletter = Helpers::joinObject(
       array(
-        $newsletter['subject'],
+        $newsletter->subject,
-        $newsletter['rendered_body']['html'],
+        $rendered_newsletter['html'],
-        $newsletter['rendered_body']['text']
+        $rendered_newsletter['text']
       )
     );
     $prepared_newsletter = ShortcodesTask::process(
@@ -88,8 +75,8 @@ class Newsletter {
     );
     if($this->tracking_enabled) {
       $prepared_newsletter = NewsletterLinks::replaceSubscriberData(
-        $subscriber['id'],
+        $subscriber->id,
-        $queue['id'],
+        $queue->id,
         $prepared_newsletter
       );
     }
@@ -103,8 +90,7 @@ class Newsletter {
     );
   }
 
-  function markNewsletterAsSent($newsletter_id) {
+  function markNewsletterAsSent($newsletter) {
-    $newsletter = NewsletterModel::findOne($newsletter_id);
     // if it's a standard newsletter, update its status
     if($newsletter->type === NewsletterModel::TYPE_STANDARD) {
       $newsletter->setStatus(NewsletterModel::STATUS_SENT);

lib/Cron/Workers/SendingQueue/Tasks/Posts.php

@@ -7,26 +7,24 @@ use MailPoet\Models\NewsletterPost;
 if(!defined('ABSPATH')) exit;
 
 class Posts {
-  static function extractAndSave(array $newsletter) {
+  static function extractAndSave($rendered_newsletter, $newsletter) {
-    if(empty($newsletter['rendered_body']['html']) || empty($newsletter['id'])) {
-      return;
-    }
     preg_match_all(
       '/data-post-id="(\d+)"/ism',
-      $newsletter['rendered_body']['html'],
+      $rendered_newsletter['html'],
       $matched_posts_ids);
     $matched_posts_ids = $matched_posts_ids[1];
     if(!count($matched_posts_ids)) {
-      return $newsletter;
+      return false;
     }
-    $newsletter_id = ($newsletter['type'] === NewsletterModel::TYPE_NOTIFICATION_HISTORY) ?
+    $newsletter_id = ($newsletter->type === NewsletterModel::TYPE_NOTIFICATION_HISTORY) ?
-      $newsletter['parent_id'] :
+      $newsletter->parent_id :
-      $newsletter['id'];
+      $newsletter->id;
     foreach($matched_posts_ids as $post_id) {
       $newletter_post = NewsletterPost::create();
       $newletter_post->newsletter_id = $newsletter_id;
       $newletter_post->post_id = $post_id;
       $newletter_post->save();
     }
+    return true;
   }
 }

lib/Cron/Workers/SendingQueue/Tasks/Shortcodes.php

@@ -6,9 +6,8 @@ use MailPoet\Newsletter\Shortcodes\Shortcodes as NewsletterShortcodes;
 if(!defined('ABSPATH')) exit;
 
 class Shortcodes {
-  static function process($content, array $newsletter, array $subscriber, array $queue) {
+  static function process($content, $newsletter, $subscriber, $queue) {
     $shortcodes = new NewsletterShortcodes($newsletter, $subscriber, $queue);
     return $shortcodes->replace($content);
   }
-}
+}
-

lib/Cron/Workers/SendingQueue/Tasks/Subscribers.php

@@ -1,52 +0,0 @@
-<?php
-namespace MailPoet\Cron\Workers\SendingQueue\Tasks;
-
-if(!defined('ABSPATH')) exit;
-
-class Subscribers {
-  static function updateToProcessList(
-    array $found_subscribers_ids,
-    array $subscribers_to_process_ids,
-    array $queue_subscribers
-  ) {
-    // compare existing subscriber to the ones that queued for processing
-    $subscibers_to_exclude = array_diff(
-      $subscribers_to_process_ids,
-      $found_subscribers_ids
-    );
-    // remove nonexistent subscribers from the processing list
-    $queue_subscribers['to_process'] = array_diff(
-      $subscibers_to_exclude,
-      $queue_subscribers['to_process']
-    );
-    return $queue_subscribers;
-  }
-
-  static function updateFailedList(
-    array $failed_subscribers, array $queue_subscribers
-  ) {
-    $queue_subscribers['failed'] = array_merge(
-      $queue_subscribers['failed'],
-      $failed_subscribers
-    );
-    $queue_subscribers['to_process'] = array_diff(
-      $queue_subscribers['to_process'],
-      $failed_subscribers
-    );
-    return $queue_subscribers;
-  }
-
-  static function updateProcessedList(
-    array $processed_subscribers, array $queue_subscribers
-  ) {
-    $queue_subscribers['processed'] = array_merge(
-      $queue_subscribers['processed'],
-      $processed_subscribers
-    );
-    $queue_subscribers['to_process'] = array_diff(
-      $queue_subscribers['to_process'],
-      $processed_subscribers
-    );
-    return $queue_subscribers;
-  }
-}

lib/Form/Block/Checkbox.php

@@ -22,7 +22,6 @@ class Checkbox extends Base {
 
     foreach($options as $option) {
       $html .= '<label class="mailpoet_checkbox_label">';
-      $html .= '<input type="hidden" name="'.$field_name.'" value="0" />';
       $html .= '<input type="checkbox" class="mailpoet_checkbox" ';
 
       $html .= 'name="'.$field_name.'" ';

lib/Form/Util/Export.php

@@ -24,13 +24,14 @@ class Export {
         return join(' ', array(
           '<iframe',
           'width="100%"',
+          'height="100%"',
           'scrolling="no"',
           'frameborder="0"',
           'src="'.$iframe_url.'"',
           'class="mailpoet_form_iframe"',
           'vspace="0"',
           'tabindex="0"',
-          'onload="MailPoet.Iframe.autoSize(this);"',
+          'onload="if(window[\'MailPoet\']) MailPoet.Iframe.autoSize(this);"',
           'marginwidth="0"',
           'marginheight="0"',
           'hspace="0"',

lib/Form/Widget.php

@@ -148,12 +148,17 @@ class Widget extends \WP_Widget {
           'after_title' => (!empty($after_title) ? $after_title : '')
         );
 
-        // check if the form was successfully submitted via POST (non ajax)
+        // (POST) non ajax success/error variables
         $data['success'] = (
           (isset($_GET['mailpoet_success']))
           &&
           ((int)$_GET['mailpoet_success'] === (int)$form['id'])
         );
+        $data['error'] = (
+          (isset($_GET['mailpoet_error']))
+          &&
+          ((int)$_GET['mailpoet_error'] === (int)$form['id'])
+        );
 
         // generate security token
         $data['token'] = Security::generateToken();

lib/Mailer/Mailer.php

@@ -24,13 +24,13 @@ class Mailer {
 
   function __construct($mailer = false, $sender = false, $reply_to = false) {
     $this->mailer_config = self::getMailerConfig($mailer);
-    $this->sender = $this->getSender($sender);
+    $this->sender = $this->getSenderNameAndAddress($sender);
-    $this->reply_to = $this->getReplyTo($reply_to);
+    $this->reply_to = $this->getReplyToNameAndAddress($reply_to);
     $this->mailer_instance = $this->buildMailer();
   }
 
   function send($newsletter, $subscriber) {
-    $subscriber = $this->transformSubscriber($subscriber);
+    $subscriber = $this->formatSubscriberNameAndEmailAddress($subscriber);
     return $this->mailer_instance->send($newsletter, $subscriber);
   }
 
@@ -115,7 +115,7 @@ class Mailer {
     return $mailer;
   }
 
-  function getSender($sender = false) {
+  function getSenderNameAndAddress($sender = false) {
     if(empty($sender)) {
       $sender = Setting::getValue('sender', array());
       if(empty($sender['address'])) throw new \Exception(__('Sender name and email are not configured'));
@@ -127,15 +127,15 @@ class Mailer {
     );
   }
 
-  function getReplyTo($reply_to = false) {
+  function getReplyToNameAndAddress($reply_to = array()) {
     if(!$reply_to) {
       $reply_to = Setting::getValue('reply_to', null);
-      if(!$reply_to) {
+      $reply_to['name'] = (!empty($reply_to['name'])) ?
-        $reply_to = array(
+        $reply_to['name'] :
-          'name' => $this->sender['from_name'],
+        $this->sender['from_name'];
-          'address' => $this->sender['from_email']
+      $reply_to['address'] = (!empty($reply_to['address'])) ?
-        );
+        $reply_to['address'] :
-      }
+        $this->sender['from_email'];
     }
     if(empty($reply_to['address'])) {
       $reply_to['address'] = $this->sender['from_email'];
@@ -147,7 +147,8 @@ class Mailer {
     );
   }
 
-  function transformSubscriber($subscriber) {
+  function formatSubscriberNameAndEmailAddress($subscriber) {
+    $subscriber = (is_object($subscriber)) ? $subscriber->asArray() : $subscriber;
     if(!is_array($subscriber)) return $subscriber;
     if(isset($subscriber['address'])) $subscriber['email'] = $subscriber['address'];
     $first_name = (isset($subscriber['first_name'])) ? $subscriber['first_name'] : '';

lib/Mailer/MailerLog.php

@@ -34,8 +34,8 @@ class MailerLog {
     return $mailer_log;
   }
 
-  static function incrementSentCount($mailer_log = false) {
+  static function incrementSentCount() {
-    $mailer_log = ($mailer_log) ? $mailer_log : self::getMailerLog();
+    $mailer_log = self::getMailerLog();
     (int)$mailer_log['sent']++;
     return self::updateMailerLog($mailer_log);
   }
@@ -54,7 +54,7 @@ class MailerLog {
 
   static function enforceSendingLimit() {
     if(self::isSendingLimitReached()) {
-      throw new \Exception(__('Sending frequency limit has been reached'));
+      throw new \Exception(__('Sending frequency limit has been reached.'));
     }
   }
 }

lib/Models/Newsletter.php

@@ -1,12 +1,12 @@
 <?php
 namespace MailPoet\Models;
+use MailPoet\Newsletter\Renderer\Renderer;
 use MailPoet\Util\Helpers;
 
 if(!defined('ABSPATH')) exit;
 
 class Newsletter extends Model {
   public static $_table = MP_NEWSLETTERS_TABLE;
-
   const TYPE_STANDARD = 'standard';
   const TYPE_WELCOME = 'welcome';
   const TYPE_NOTIFICATION = 'notification';
@@ -22,7 +22,6 @@ class Newsletter extends Model {
 
   function __construct() {
     parent::__construct();
-
     $this->addValidations('type', array(
       'required' => __('Please specify a type')
     ));
@@ -246,6 +245,11 @@ class Newsletter extends Model {
     return $this;
   }
 
+  function render() {
+    $renderer = new Renderer($this);
+    return $renderer->render();
+  }
+
   function getStatistics() {
     $statistics_query = SendingQueue::tableAlias('queues')
       ->selectExpr(

lib/Models/SendingQueue.php

@@ -5,11 +5,14 @@ if(!defined('ABSPATH')) exit;
 
 class SendingQueue extends Model {
   public static $_table = MP_SENDING_QUEUES_TABLE;
-
   const STATUS_COMPLETED = 'completed';
   const STATUS_SCHEDULED = 'scheduled';
   const STATUS_PAUSED = 'paused';
 
+  function newsletter() {
+    return $this->has_one(__NAMESPACE__ . '\Newsletter', 'id', 'newsletter_id');
+  }
+
   function pause() {
     if($this->count_processed === $this->count_total) {
       return false;
@@ -40,8 +43,12 @@ class SendingQueue extends Model {
     if(!is_serialized($this->subscribers)) {
       $this->set('subscribers', serialize($this->subscribers));
     }
+    if(!is_serialized($this->newsletter_rendered_body)) {
+      $this->set('newsletter_rendered_body', serialize($this->newsletter_rendered_body));
+    }
     parent::save();
     $this->subscribers = $this->getSubscribers();
+    $this->newsletter_rendered_body = $this->getNewsletterRenderedBody();
     return $this;
   }
 
@@ -59,8 +66,10 @@ class SendingQueue extends Model {
     return $subscribers;
   }
 
-  function getRenderedNewsletterBody() {
+  function getNewsletterRenderedBody() {
-    return json_decode($this->newsletter_rendered_body, true);
+    return (!is_serialized($this->newsletter_rendered_body)) ?
+      $this->newsletter_rendered_body :
+      unserialize($this->newsletter_rendered_body);
   }
 
   function isSubscriberProcessed($subscriber_id) {
@@ -75,4 +84,62 @@ class SendingQueue extends Model {
       : $this->subscribers;
     return $model;
   }
-}
+
+  function removeNonexistentSubscribers($subscribers_to_remove) {
+    $subscribers = $this->getSubscribers();
+    $subscribers['to_process'] = array_values(
+      array_diff(
+        $subscribers['to_process'],
+        $subscribers_to_remove
+      )
+    );
+    $this->subscribers = $subscribers;
+    $this->updateCount();
+  }
+
+  function updateFailedSubscribers($failed_subscribers) {
+    $subscribers = $this->getSubscribers();
+    $subscribers['failed'] = array_merge(
+      $subscribers['failed'],
+      $failed_subscribers
+    );
+    $subscribers['to_process'] = array_values(
+      array_diff(
+        $subscribers['to_process'],
+        $failed_subscribers
+      )
+    );
+    $this->subscribers = $subscribers;
+    $this->updateCount();
+  }
+
+  function updateProcessedSubscribers($processed_subscribers) {
+    $subscribers = $this->getSubscribers();
+    $subscribers['processed'] = array_merge(
+      $subscribers['processed'],
+      $processed_subscribers
+    );
+    $subscribers['to_process'] = array_values(
+      array_diff(
+        $subscribers['to_process'],
+        $processed_subscribers
+      )
+    );
+    $this->subscribers = $subscribers;
+    $this->updateCount();
+  }
+
+  function updateCount() {
+    $this->subscribers = $this->getSubscribers();
+    $this->count_processed =
+      count($this->subscribers['processed']) + count($this->subscribers['failed']);
+    $this->count_to_process = count($this->subscribers['to_process']);
+    $this->count_failed = count($this->subscribers['failed']);
+    $this->count_total = $this->count_processed + $this->count_to_process;
+    if(!$this->count_to_process) {
+      $this->processed_at = current_time('mysql');
+      $this->status = self::STATUS_COMPLETED;
+    }
+    return $this->save();
+  }
+}

lib/Models/Subscriber.php

@@ -73,72 +73,69 @@ class Subscriber extends Model {
   }
 
   function sendConfirmationEmail() {
-    if($this->status === self::STATUS_UNCONFIRMED) {
+    $signup_confirmation = Setting::getValue('signup_confirmation');
-      $signup_confirmation = Setting::getValue('signup_confirmation');
 
-      $segments = $this->segments()->findMany();
+    $segments = $this->segments()->findMany();
-      $segment_names = array_map(function($segment) {
+    $segment_names = array_map(function($segment) {
-        return $segment->name;
+      return $segment->name;
-      }, $segments);
+    }, $segments);
 
-      $body = nl2br($signup_confirmation['body']);
+    $body = nl2br($signup_confirmation['body']);
 
-      // replace list of segments shortcode
+    // replace list of segments shortcode
-      $body = str_replace(
+    $body = str_replace(
-        '[lists_to_confirm]',
+      '[lists_to_confirm]',
-        '<strong>'.join(', ', $segment_names).'</strong>',
+      '<strong>'.join(', ', $segment_names).'</strong>',
-        $body
+      $body
-      );
+    );
 
-      // replace activation link
+    // replace activation link
-      $body = str_replace(
+    $body = str_replace(
-        array(
+      array(
-          '[activation_link]',
+        '[activation_link]',
-          '[/activation_link]'
+        '[/activation_link]'
-        ),
+      ),
-        array(
+      array(
-          '<a href="'.esc_attr(Subscription\Url::getConfirmationUrl($this)).'">',
+        '<a href="'.esc_attr(Subscription\Url::getConfirmationUrl($this)).'">',
-          '</a>'
+        '</a>'
-        ),
+      ),
-        $body
+      $body
-      );
+    );
 
-      // build email data
+    // build email data
-      $email = array(
+    $email = array(
-        'subject' => $signup_confirmation['subject'],
+      'subject' => $signup_confirmation['subject'],
-        'body' => array(
+      'body' => array(
-          'html' => $body,
+        'html' => $body,
-          'text' => $body
+        'text' => $body
-        )
+      )
-      );
+    );
 
-      // convert subscriber to array
+    // convert subscriber to array
-      $subscriber = $this->asArray();
+    $subscriber = $this->asArray();
 
-      // set from
+    // set from
-      $from = (
+    $from = (
-        !empty($signup_confirmation['from'])
+      !empty($signup_confirmation['from'])
-        && !empty($signup_confirmation['from']['address'])
+      && !empty($signup_confirmation['from']['address'])
-      ) ? $signup_confirmation['from']
+    ) ? $signup_confirmation['from']
-        : false;
+      : false;
 
-      // set reply to
+    // set reply to
-      $reply_to = (
+    $reply_to = (
-        !empty($signup_confirmation['reply_to'])
+      !empty($signup_confirmation['reply_to'])
-        && !empty($signup_confirmation['reply_to']['address'])
+      && !empty($signup_confirmation['reply_to']['address'])
-      ) ? $signup_confirmation['reply_to']
+    ) ? $signup_confirmation['reply_to']
-        : false;
+      : false;
 
-      // send email
+    // send email
-      try {
+    try {
-        $mailer = new Mailer(false, $from, $reply_to);
+      $mailer = new Mailer(false, $from, $reply_to);
-        return $mailer->send($email, $subscriber);
+      return $mailer->send($email, $subscriber);
-      } catch(\Exception $e) {
+    } catch(\Exception $e) {
-        $this->setError($e->getMessage());
+      $this->setError($e->getMessage());
-        return false;
+      return false;
-      }
     }
-    return false;
   }
 
   static function generateToken($email = null) {
@@ -153,49 +150,48 @@ class Subscriber extends Model {
   }
 
   static function subscribe($subscriber_data = array(), $segment_ids = array()) {
-    if(empty($subscriber_data) or empty($segment_ids)) {
-      return false;
-    }
-
     $signup_confirmation_enabled = (bool)Setting::getValue(
       'signup_confirmation.enabled'
     );
 
-    $subscriber = self::createOrUpdate($subscriber_data);
+    $subscriber = self::findOne($subscriber_data['email']);
-    $errors = $subscriber->getErrors();
+
+    if($subscriber === false) {
+      // create new subscriber
+      $subscriber = self::createOrUpdate($subscriber_data);
+      if($subscriber->getErrors() !== false) {
+        return $subscriber;
+      }
 
-    if($errors === false && $subscriber->id > 0) {
       $subscriber = self::findOne($subscriber->id);
+    }
 
-      // restore deleted subscriber
+    // restore trashed subscriber
-      if($subscriber->deleted_at !== null) {
+    if($subscriber->deleted_at !== null) {
-        $subscriber->setExpr('deleted_at', 'NULL');
+      $subscriber->setExpr('deleted_at', 'NULL');
+    }
+
+    // set status depending on signup confirmation setting
+    if($subscriber->status !== self::STATUS_SUBSCRIBED) {
+      if($signup_confirmation_enabled === true) {
+        $subscriber->set('status', self::STATUS_UNCONFIRMED);
+      } else {
+        $subscriber->set('status', self::STATUS_SUBSCRIBED);
       }
+    }
 
-      if($subscriber->status !== self::STATUS_SUBSCRIBED) {
+    if($subscriber->save()) {
-        // auto subscribe when signup confirmation is disabled
+      // link subscriber to segments
-        if($signup_confirmation_enabled === true) {
+      SubscriberSegment::subscribeToSegments($subscriber, $segment_ids);
-          $subscriber->set('status', self::STATUS_UNCONFIRMED);
-        } else {
-          $subscriber->set('status', self::STATUS_SUBSCRIBED);
-        }
-      }
 
-      if($subscriber->save()) {
+      // signup confirmation
-        // link subscriber to segments
+      $subscriber->sendConfirmationEmail();
-        SubscriberSegment::subscribeToSegments($subscriber, $segment_ids);
 
-        // signup confirmation
+      // welcome email
-        if($subscriber->status !== self::STATUS_SUBSCRIBED) {
+      Scheduler::scheduleSubscriberWelcomeNotification(
-          $subscriber->sendConfirmationEmail();
+        $subscriber->id,
-        }
+        $segment_ids
-
+      );
-        // welcome email
-        Scheduler::scheduleSubscriberWelcomeNotification(
-          $subscriber->id,
-          $segment_ids
-        );
-      }
     }
 
     return $subscriber;

lib/Newsletter/Scheduler/Scheduler.php

@@ -19,81 +19,22 @@ class Scheduler {
   const INTERVAL_MONTHLY = 'monthly';
   const INTERVAL_NTHWEEKDAY = 'nthWeekDay';
 
-  static function processPostNotificationSchedule($newsletter_id) {
-    $newsletter = Newsletter::filter('filterWithOptions')
-      ->findOne($newsletter_id);
-    if(!$newsletter) return;
-    $newsletter = $newsletter->asArray();
-    $interval_type = $newsletter['intervalType'];
-    $hour = (int)$newsletter['timeOfDay'] / self::SECONDS_IN_HOUR;
-    $week_day = $newsletter['weekDay'];
-    $month_day = $newsletter['monthDay'];
-    $nth_week_day = ($newsletter['nthWeekDay'] === self::LAST_WEEKDAY_FORMAT) ?
-      $newsletter['nthWeekDay'] :
-      '#' . $newsletter['nthWeekDay'];
-    switch($interval_type) {
-      case self::INTERVAL_IMMEDIATELY:
-        $schedule = '* * * * *';
-        break;
-      case self::INTERVAL_IMMEDIATE:
-      case self::INTERVAL_DAILY:
-        $schedule = sprintf('0 %s * * *', $hour);
-        break;
-      case self::INTERVAL_WEEKLY:
-        $schedule = sprintf('0 %s * * %s', $hour, $week_day);
-        break;
-      case self::INTERVAL_NTHWEEKDAY:
-        $schedule = sprintf('0 %s ? * %s%s', $hour, $week_day, $nth_week_day);
-        break;
-      case self::INTERVAL_MONTHLY:
-        $schedule = sprintf('0 %s %s * *', $hour, $month_day);
-        break;
-    }
-    $option_field = NewsletterOptionField::where('name', 'schedule')
-      ->findOne()
-      ->asArray();
-    $relation = NewsletterOption::where('newsletter_id', $newsletter_id)
-      ->where('option_field_id', $option_field['id'])
-      ->findOne();
-    if(!$relation) {
-      $relation = NewsletterOption::create();
-      $relation->newsletter_id = $newsletter['id'];
-      $relation->option_field_id = $option_field['id'];
-    }
-    $relation->value = $schedule;
-    $relation->save();
-    return Newsletter::filter('filterWithOptions')
-      ->findOne($newsletter_id);
-  }
-
   static function schedulePostNotification($post_id) {
     $newsletters = self::getNewsletters(Newsletter::TYPE_NOTIFICATION);
-    if(!count($newsletters)) return;
+    if(!count($newsletters)) return false;
     foreach($newsletters as $newsletter) {
       $post = NewsletterPost::where('newsletter_id', $newsletter->id)
         ->where('post_id', $post_id)
         ->findOne();
       if($post === false) {
-        $scheduled_notification = self::createPostNotificationQueue($newsletter);
+        self::createPostNotificationQueue($newsletter);
       }
     }
   }
 
-  /**
+  static function scheduleSubscriberWelcomeNotification($subscriber_id, $segments) {
-   * Create a properly formatted timestamp for use in Scheduler from
-   * arbitrarily formatted timestamp strings.
-   */
-  static function scheduleFromTimestamp($timestamp) {
-    return Carbon::parse($timestamp)->format('Y-m-d H:i:s');
-  }
-
-  static function scheduleSubscriberWelcomeNotification(
-    $subscriber_id,
-    array $segments
-  ) {
     $newsletters = self::getNewsletters(Newsletter::TYPE_WELCOME);
-    if(empty($newsletters)) return;
+    if(empty($newsletters)) return false;
-
     foreach($newsletters as $newsletter) {
       if($newsletter->event === 'segment' &&
         in_array($newsletter->segment, $segments)
@@ -105,19 +46,17 @@ class Scheduler {
 
   static function scheduleWPUserWelcomeNotification(
     $subscriber_id,
-    array $wp_user,
+    $wp_user,
-    $old_user_data
+    $old_user_data = false
   ) {
     $newsletters = self::getNewsletters(Newsletter::TYPE_WELCOME);
-    if(empty($newsletters)) return;
+    if(empty($newsletters)) return false;
-
     foreach($newsletters as $newsletter) {
       if($newsletter->event === 'user') {
         if($old_user_data) {
           // do not schedule welcome newsletter if roles have not changed
           $old_role = (array)$old_user_data->roles;
           $new_role = (array)$wp_user->roles;
-
           if($newsletter->role === self::WORDPRESS_ALL_ROLES ||
             !array_diff($old_role, $new_role)
           ) {
@@ -125,7 +64,7 @@ class Scheduler {
           }
         }
         if($newsletter->role === self::WORDPRESS_ALL_ROLES ||
-          in_array($newsletter->role, $wp_user['roles'])
+          in_array($newsletter->role, (array)$wp_user->roles)
         ) {
           self::createWelcomeNotificationQueue($newsletter, $subscriber_id);
         }
@@ -133,14 +72,6 @@ class Scheduler {
     }
   }
 
-  static function getNewsletters($type) {
-    return Newsletter::getPublished()
-      ->filter('filterType', $type)
-      ->filter('filterStatus', Newsletter::STATUS_ACTIVE)
-      ->filter('filterWithOptions')
-      ->findMany();
-  }
-
   static function createWelcomeNotificationQueue($newsletter, $subscriber_id) {
     $queue = SendingQueue::create();
     $queue->newsletter_id = $newsletter->id;
@@ -169,7 +100,7 @@ class Scheduler {
     }
     $queue->status = SendingQueue::STATUS_SCHEDULED;
     $queue->scheduled_at = $scheduled_at;
-    $queue->save();
+    return $queue->save();
   }
 
   static function createPostNotificationQueue($newsletter) {
@@ -187,9 +118,60 @@ class Scheduler {
     return $queue;
   }
 
+  static function processPostNotificationSchedule($newsletter) {
+    $interval_type = $newsletter->intervalType;
+    $hour = (int)$newsletter->timeOfDay / self::SECONDS_IN_HOUR;
+    $week_day = $newsletter->weekDay;
+    $month_day = $newsletter->monthDay;
+    $nth_week_day = ($newsletter->nthWeekDay === self::LAST_WEEKDAY_FORMAT) ?
+      $newsletter->nthWeekDay :
+      '#' . $newsletter->nthWeekDay;
+    switch($interval_type) {
+      case self::INTERVAL_IMMEDIATELY:
+        $schedule = '* * * * *';
+        break;
+      case self::INTERVAL_IMMEDIATE:
+      case self::INTERVAL_DAILY:
+        $schedule = sprintf('0 %s * * *', $hour);
+        break;
+      case self::INTERVAL_WEEKLY:
+        $schedule = sprintf('0 %s * * %s', $hour, $week_day);
+        break;
+      case self::INTERVAL_NTHWEEKDAY:
+        $schedule = sprintf('0 %s ? * %s%s', $hour, $week_day, $nth_week_day);
+        break;
+      case self::INTERVAL_MONTHLY:
+        $schedule = sprintf('0 %s %s * *', $hour, $month_day);
+        break;
+    }
+    $option_field = NewsletterOptionField::where('name', 'schedule')->findOne();
+    $relation = NewsletterOption::where('newsletter_id', $newsletter->id)
+      ->where('option_field_id', $option_field->id)
+      ->findOne();
+    if(!$relation) {
+      $relation = NewsletterOption::create();
+      $relation->newsletter_id = $newsletter->id;
+      $relation->option_field_id = $option_field->id;
+    }
+    $relation->value = $schedule;
+    $relation->save();
+  }
+
   static function getNextRunDate($schedule) {
     $schedule = \Cron\CronExpression::factory($schedule);
-    return $schedule->getNextRunDate(current_time('mysql'))
+    return $schedule->getNextRunDate(Carbon::createFromTimestamp(current_time('timestamp')))
       ->format('Y-m-d H:i:s');
   }
-}
+
+  static function getNewsletters($type) {
+    return Newsletter::getPublished()
+      ->filter('filterType', $type)
+      ->filter('filterStatus', Newsletter::STATUS_ACTIVE)
+      ->filter('filterWithOptions')
+      ->findMany();
+  }
+
+  static function formatDatetimeString($datetime_string) {
+    return Carbon::parse($datetime_string)->format('Y-m-d H:i:s');
+  }
+}

lib/Newsletter/ViewInBrowser.php

@@ -19,7 +19,7 @@ class ViewInBrowser {
 
   function renderNewsletter($newsletter, $subscriber, $queue, $wp_user_preview) {
     if($queue && $queue->newsletter_rendered_body) {
-      $newsletter_body = $queue->getRenderedNewsletterBody();
+      $newsletter_body = $queue->getNewsletterRenderedBody();
     } else {
       $renderer = new Renderer($newsletter, $wp_user_preview);
       $newsletter_body = $renderer->render();

lib/Subscription/Form.php

@@ -0,0 +1,42 @@
+<?php
+namespace MailPoet\Subscription;
+use \MailPoet\API\Endpoints\Subscribers;
+use \MailPoet\API\Response as APIResponse;
+use \MailPoet\Models\Subscriber;
+use \MailPoet\Models\StatisticsForms;
+use \MailPoet\Models\Form as FormModel;
+use \MailPoet\Util\Url;
+
+class Form {
+  static function onSubmit() {
+    $reserved_keywords = array(
+      'token',
+      'endpoint',
+      'method',
+      'mailpoet_redirect'
+    );
+
+    $data = array_diff_key($_POST, array_flip($reserved_keywords));
+    $form_id = isset($data['form_id']) ? $data['form_id'] : 0;
+
+    $endpoint = new Subscribers();
+
+    $response = $endpoint->subscribe($data);
+
+    if($response->status !== APIResponse::STATUS_OK) {
+      Url::redirectBack(array(
+        'mailpoet_error' => isset($data['form_id']) ? $data['form_id'] : true,
+        'mailpoet_success' => null
+      ));
+    } else {
+      if(isset($response->meta['redirect_url'])) {
+        Url::redirectTo($response->meta['redirect_url']);
+      } else {
+        Url::redirectBack(array(
+          'mailpoet_success' => $form_id,
+          'mailpoet_error' => null
+        ));
+      }
+    }
+  }
+}

mailpoet.php

@@ -4,7 +4,7 @@ if(!defined('ABSPATH')) exit;
 use \MailPoet\Config\Initializer;
 /*
  * Plugin Name: MailPoet
- * Version: 0.0.45
+ * Version: 0.0.46
  * Plugin URI: http://www.mailpoet.com
  * Description: MailPoet Newsletters.
  * Author: MailPoet
@@ -22,7 +22,7 @@ use \MailPoet\Config\Initializer;
 
 require 'vendor/autoload.php';
 
-define('MAILPOET_VERSION', '0.0.45');
+define('MAILPOET_VERSION', '0.0.46');
 
 $initializer = new Initializer(array(
   'file' => __FILE__,

tests/_bootstrap.php

@@ -1,16 +1,18 @@
 <?php
 
-$wp_load_file = getenv('WP_TEST_PATH').'/wp-load.php';
+$wp_load_file = getenv('WP_TEST_PATH') . '/wp-load.php';
 require_once($wp_load_file);
 
 $console = new \Codeception\Lib\Console\Output([]);
-$console->writeln('Loading WP core... ('.$wp_load_file.')');
+$console->writeln('Loading WP core... (' . $wp_load_file . ')');
 
 $console->writeln('Cleaning up database...');
 $models = array(
   'CustomField',
   'Form',
   'Newsletter',
+  'NewsletterLink',
+  'NewsletterPost',
   'NewsletterSegment',
   'NewsletterTemplate',
   'NewsletterOption',
@@ -26,12 +28,12 @@ $models = array(
   'StatisticsNewsletters',
   'StatisticsUnsubscribes'
 );
-$destroy = function ($model) {
+$destroy = function($model) {
   $class = new \ReflectionClass('\MailPoet\Models\\' . $model);
   $table = $class->getStaticPropertyValue('_table');
   $db = ORM::getDb();
   $db->beginTransaction();
-  $db->exec('TRUNCATE '.$table);
+  $db->exec('TRUNCATE ' . $table);
   $db->commit();
 };
 array_map($destroy, $models);

tests/unit/Cron/Workers/SchedulerTest.php

@@ -307,7 +307,7 @@ class SchedulerTest extends MailPoetTest {
     // update the time queue is scheduled to run at
     $updated_queue = SendingQueue::findOne($queue->id);
     expect(Carbon::parse($updated_queue->scheduled_at))->equals(
-      Carbon::now()
+      Carbon::createFromTimestamp(current_time('timestamp'))
         ->addMinutes(Scheduler::UNCONFIRMED_SUBSCRIBER_RESCHEDULE_TIMEOUT)
     );
   }

tests/unit/Cron/Workers/SendingQueue/SendingQueueTest.php

@@ -0,0 +1,309 @@
+<?php
+
+use Codeception\Util\Fixtures;
+use Codeception\Util\Stub;
+use MailPoet\API\Endpoints\Cron;
+use MailPoet\Config\Populator;
+use MailPoet\Cron\CronHelper;
+use MailPoet\Cron\Workers\SendingQueue\SendingQueue as SendingQueueWorker;
+use MailPoet\Cron\Workers\SendingQueue\Tasks\Mailer as MailerTask;
+use MailPoet\Cron\Workers\SendingQueue\Tasks\Newsletter as NewsletterTask;
+use MailPoet\Models\Newsletter;
+use MailPoet\Models\NewsletterLink;
+use MailPoet\Models\NewsletterPost;
+use MailPoet\Models\SendingQueue;
+use MailPoet\Models\StatisticsNewsletters;
+use MailPoet\Models\Subscriber;
+
+class SendingQueueTest extends MailPoetTest {
+  function _before() {
+    $wp_users = get_users();
+    wp_set_current_user($wp_users[0]->ID);
+    $populator = new Populator();
+    $populator->up();
+    $this->subscriber = Subscriber::create();
+    $this->subscriber->email = 'john@doe.com';
+    $this->subscriber->first_name = 'John';
+    $this->subscriber->last_name = 'Doe';
+    $this->subscriber->save();
+    $this->newsletter = Newsletter::create();
+    $this->newsletter->type = Newsletter::TYPE_STANDARD;
+    $this->newsletter->subject = Fixtures::get('newsletter_subject_template');
+    $this->newsletter->body = Fixtures::get('newsletter_body_template');
+    $this->newsletter->save();
+    $this->queue = SendingQueue::create();
+    $this->queue->newsletter_id = $this->newsletter->id;
+    $this->queue->subscribers = serialize(
+      array(
+        'to_process' => array($this->subscriber->id),
+        'processed' => array(),
+        'failed' => array()
+      )
+    );
+    $this->queue->count_total = 1;
+    $this->queue->save();
+    $this->sending_queue_worker = new SendingQueueWorker();
+  }
+
+  function testItConstructs() {
+    expect($this->sending_queue_worker->mailer_task instanceof MailerTask);
+    expect($this->sending_queue_worker->newsletter_task instanceof NewsletterTask);
+    expect(strlen($this->sending_queue_worker->timer))->greaterOrEquals(5);
+
+    // constructor accepts timer argument
+    $timer = microtime(true) - 5;
+    $sending_queue_worker = new SendingQueueWorker($timer);
+    expect($sending_queue_worker->timer)->equals($timer);
+  }
+
+  function testItEnforcesExecutionLimitBeforeStart() {
+    $timer = microtime(true) - CronHelper::DAEMON_EXECUTION_LIMIT;
+    try {
+      $sending_queue_worker = new SendingQueueWorker($timer);
+      self::fail('Maximum execution time limit exception was not thrown.');
+    } catch(\Exception $e) {
+      expect($e->getMessage())->equals('Maximum execution time has been reached.');
+    }
+  }
+
+  function testItEnforcesExecutionLimitDuringProcessing() {
+    try {
+      $sending_queue_worker = $this->sending_queue_worker;
+      $sending_queue_worker->timer = microtime(true) - CronHelper::DAEMON_EXECUTION_LIMIT;
+      $sending_queue_worker->process();
+      self::fail('Maximum execution time limit exception was not thrown.');
+    } catch(\Exception $e) {
+      expect($e->getMessage())->equals('Maximum execution time has been reached.');
+    }
+  }
+
+  function testItDeletesQueueWhenNewsletterIsNotFound() {
+    // queue exists
+    $queue = SendingQueue::findOne($this->queue->id);
+    expect($queue)->notEquals(false);
+
+    // delete newsletter
+    Newsletter::findOne($this->newsletter->id)
+      ->delete();
+
+    // queue no longer exists
+    $this->sending_queue_worker->process();
+    $queue = SendingQueue::findOne($this->queue->id);
+    expect($queue)->false(false);
+  }
+
+  function testItCanProcessSubscribersOneByOne() {
+    $sending_queue_worker = new SendingQueueWorker(
+      $timer = false,
+      Stub::make(
+        new MailerTask(),
+        array(
+          'send' => Stub::exactly(1, function($newsletter, $subscriber) {
+            // newsletter body should not be empty
+            expect(!empty($newsletter['body']['html']))->true();
+            expect(!empty($newsletter['body']['text']))->true();
+            return true;
+          })
+        )
+      )
+    );
+    $sending_queue_worker->process();
+
+    // newsletter status is set to sent
+    $updated_newsletter = Newsletter::findOne($this->newsletter->id);
+    expect($updated_newsletter->status)->equals(Newsletter::STATUS_SENT);
+
+    // queue status is set to completed
+    $updated_queue = SendingQueue::findOne($this->queue->id);
+    expect($updated_queue->status)->equals(SendingQueue::STATUS_COMPLETED);
+
+    // queue subscriber processed/failed/to process count is updated
+    $updated_queue->subscribers = $updated_queue->getSubscribers();
+    expect($updated_queue->subscribers)->equals(
+      array(
+        'to_process' => array(),
+        'failed' => array(),
+        'processed' => array($this->subscriber->id)
+      )
+    );
+    expect($updated_queue->count_total)->equals(1);
+    expect($updated_queue->count_processed)->equals(1);
+    expect($updated_queue->count_failed)->equals(0);
+    expect($updated_queue->count_to_process)->equals(0);
+
+    // statistics entry should be created
+    $statistics = StatisticsNewsletters::where('newsletter_id', $this->newsletter->id)
+      ->where('subscriber_id', $this->subscriber->id)
+      ->where('queue_id', $this->queue->id)
+      ->findOne();
+    expect($statistics)->notEquals(false);
+  }
+
+  function testItCanProcessSubscribersInBulk() {
+    $sending_queue_worker = new SendingQueueWorker(
+      $timer = false,
+      Stub::make(
+        new MailerTask(),
+        array(
+          'send' => Stub::exactly(1, function($newsletter, $subscriber) {
+            // newsletter body should not be empty
+            expect(!empty($newsletter[0]['body']['html']))->true();
+            expect(!empty($newsletter[0]['body']['text']))->true();
+            return true;
+          }),
+          'getProcessingMethod' => Stub::exactly(1, function() { return 'bulk'; })
+        )
+      )
+    );
+    $sending_queue_worker->process();
+
+    // newsletter status is set to sent
+    $updated_newsletter = Newsletter::findOne($this->newsletter->id);
+    expect($updated_newsletter->status)->equals(Newsletter::STATUS_SENT);
+
+    // queue status is set to completed
+    $updated_queue = SendingQueue::findOne($this->queue->id);
+    expect($updated_queue->status)->equals(SendingQueue::STATUS_COMPLETED);
+
+    // queue subscriber processed/failed/to process count is updated
+    $updated_queue->subscribers = $updated_queue->getSubscribers();
+    expect($updated_queue->subscribers)->equals(
+      array(
+        'to_process' => array(),
+        'failed' => array(),
+        'processed' => array($this->subscriber->id)
+      )
+    );
+    expect($updated_queue->count_total)->equals(1);
+    expect($updated_queue->count_processed)->equals(1);
+    expect($updated_queue->count_failed)->equals(0);
+    expect($updated_queue->count_to_process)->equals(0);
+
+    // statistics entry should be created
+    $statistics = StatisticsNewsletters::where('newsletter_id', $this->newsletter->id)
+      ->where('subscriber_id', $this->subscriber->id)
+      ->where('queue_id', $this->queue->id)
+      ->findOne();
+    expect($statistics)->notEquals(false);
+  }
+
+  function testItRemovesNonexistentSubscribersFromProcessingList() {
+    $queue = $this->queue;
+    $queue->subscribers = serialize(
+      array(
+        'to_process' => array(
+          $this->subscriber->id(),
+          123
+        ),
+        'processed' => array(),
+        'failed' => array()
+      )
+    );
+    $queue->count_total = 2;
+    $queue->save();
+    $sending_queue_worker = $this->sending_queue_worker;
+    $sending_queue_worker->mailer_task = Stub::make(
+      new MailerTask(),
+      array('send' => Stub::exactly(1, function($newsletter, $subscriber) { return true; }))
+    );
+    $sending_queue_worker->process();
+
+    $updated_queue = SendingQueue::findOne($queue->id);
+    // queue subscriber processed/failed/to process count is updated
+    $updated_queue->subscribers = $updated_queue->getSubscribers();
+    expect($updated_queue->subscribers)->equals(
+      array(
+        'to_process' => array(),
+        'failed' => array(),
+        'processed' => array($this->subscriber->id)
+      )
+    );
+    expect($updated_queue->count_total)->equals(1);
+    expect($updated_queue->count_processed)->equals(1);
+    expect($updated_queue->count_failed)->equals(0);
+    expect($updated_queue->count_to_process)->equals(0);
+
+    // statistics entry should be created only for 1 subscriber
+    $statistics = StatisticsNewsletters::findMany();
+    expect(count($statistics))->equals(1);
+  }
+
+  function testItUpdatesQueueSubscriberCountWhenNoneOfSubscribersExist() {
+    $queue = $this->queue;
+    $queue->subscribers = serialize(
+      array(
+        'to_process' => array(
+          123,
+          456
+        ),
+        'processed' => array(),
+        'failed' => array()
+      )
+    );
+    $queue->count_total = 2;
+    $queue->save();
+    $sending_queue_worker = $this->sending_queue_worker;
+    $sending_queue_worker->mailer_task = Stub::make(
+      new MailerTask(),
+      array('send' => Stub::exactly(1, function($newsletter, $subscriber) { return true; }))
+    );
+    $sending_queue_worker->process();
+
+    $updated_queue = SendingQueue::findOne($queue->id);
+    // queue subscriber processed/failed/to process count is updated
+    $updated_queue->subscribers = $updated_queue->getSubscribers();
+    expect($updated_queue->subscribers)->equals(
+      array(
+        'to_process' => array(),
+        'failed' => array(),
+        'processed' => array()
+      )
+    );
+    expect($updated_queue->count_total)->equals(0);
+    expect($updated_queue->count_processed)->equals(0);
+    expect($updated_queue->count_failed)->equals(0);
+    expect($updated_queue->count_to_process)->equals(0);
+  }
+
+  function testItUpdatesFailedListWhenSendingFailed() {
+    $sending_queue_worker = new SendingQueueWorker(
+      $timer = false,
+      Stub::make(
+        new MailerTask(),
+        array('send' => Stub::exactly(1, function($newsletter, $subscriber) { return false; }))
+      )
+    );
+    $sending_queue_worker->process();
+
+    // queue subscriber processed/failed/to process count is updated
+    $updated_queue = SendingQueue::findOne($this->queue->id);
+    $updated_queue->subscribers = $updated_queue->getSubscribers();
+    expect($updated_queue->subscribers)->equals(
+      array(
+        'to_process' => array(),
+        'failed' => array($this->subscriber->id),
+        'processed' => array()
+      )
+    );
+    expect($updated_queue->count_total)->equals(1);
+    expect($updated_queue->count_processed)->equals(1);
+    expect($updated_queue->count_failed)->equals(1);
+    expect($updated_queue->count_to_process)->equals(0);
+
+    // statistics entry should not be created
+    $statistics = StatisticsNewsletters::where('newsletter_id', $this->newsletter->id)
+      ->where('subscriber_id', $this->subscriber->id)
+      ->where('queue_id', $this->queue->id)
+      ->findOne();
+    expect($statistics)->false();
+  }
+
+  function _after() {
+    ORM::raw_execute('TRUNCATE ' . Subscriber::$_table);
+    ORM::raw_execute('TRUNCATE ' . SendingQueue::$_table);
+    ORM::raw_execute('TRUNCATE ' . Newsletter::$_table);
+    ORM::raw_execute('TRUNCATE ' . NewsletterLink::$_table);
+    ORM::raw_execute('TRUNCATE ' . NewsletterPost::$_table);
+    ORM::raw_execute('TRUNCATE ' . StatisticsNewsletters::$_table);
+  }
+}

tests/unit/Cron/Workers/SendingQueue/Tasks/LinksTest.php

@@ -0,0 +1,60 @@
+<?php
+use MailPoet\Cron\Workers\SendingQueue\Tasks\Links;
+use MailPoet\Models\Newsletter;
+use MailPoet\Models\NewsletterLink;
+
+if(!defined('ABSPATH')) exit;
+
+class LinkTaskTest extends MailPoetTest {
+  function testItCanSaveLinks() {
+    $links = array(
+      array(
+        'url' => 'http://example.com',
+        'hash' => 'some_hash'
+      )
+    );
+    $newsletter = (object)array('id' => 1);
+    $queue = (object)array('id' => 2);
+    $result = Links::saveLinks($links, $newsletter, $queue);
+    $newsletter_link = NewsletterLink::where('hash', $links[0]['hash'])
+      ->findOne();
+    expect($newsletter_link->newsletter_id)->equals($newsletter->id);
+    expect($newsletter_link->queue_id)->equals($queue->id);
+    expect($newsletter_link->url)->equals($links[0]['url']);
+  }
+
+  function testItCanHashAndReplaceLinks() {
+    $rendered_newsletter = array(
+      'html' => '<a href="http://example.com">Example Link</a>',
+      'text' => '<a href="http://example.com">Example Link</a>'
+    );
+    $result = Links::hashAndReplaceLinks($rendered_newsletter);
+    $processed_rendered_newsletter_body = $result[0];
+    $processed_and_hashed_links = $result[1];
+    expect($processed_rendered_newsletter_body['html'])
+      ->contains($processed_and_hashed_links[0]['hash']);
+    expect($processed_rendered_newsletter_body['text'])
+      ->contains($processed_and_hashed_links[0]['hash']);
+    expect($processed_and_hashed_links[0]['url'])->equals('http://example.com');
+  }
+
+  function testItCanProcessRenderedBody() {
+    $newsletter = Newsletter::create();
+    $newsletter->type = Newsletter::TYPE_STANDARD;
+    $newsletter->save();
+    $rendered_newsletter = array(
+      'html' => '<a href="http://example.com">Example Link</a>',
+      'text' => '<a href="http://example.com">Example Link</a>'
+    );
+    $queue = (object)array('id' => 2);
+    $result = Links::process($rendered_newsletter, $newsletter, $queue);
+    $newsletter_link = NewsletterLink::where('newsletter_id', $newsletter->id)
+      ->findOne();
+    expect($result['html'])->contains($newsletter_link->hash);
+  }
+
+  function _after() {
+    ORM::raw_execute('TRUNCATE ' . Newsletter::$_table);
+    ORM::raw_execute('TRUNCATE ' . NewsletterLink::$_table);
+  }
+}

tests/unit/Cron/Workers/SendingQueue/Tasks/MailerTest.php

@@ -0,0 +1,126 @@
+<?php
+use Codeception\Util\Stub;
+use MailPoet\Config\Populator;
+use MailPoet\Cron\Workers\SendingQueue\Tasks\Mailer as MailerTask;
+use MailPoet\Mailer\Mailer;
+use MailPoet\Models\Setting;
+use MailPoet\Models\Subscriber;
+
+if(!defined('ABSPATH')) exit;
+
+class MailerTaskTest extends MailPoetTest {
+  public $mailer_task;
+  public $sender;
+
+  function _before() {
+    $wp_users = get_users();
+    wp_set_current_user($wp_users[0]->ID);
+    $populator = new Populator();
+    $populator->up();
+    $this->mailer_task = new MailerTask();
+    $this->sender = Setting::getValue('sender');
+  }
+
+  function testConfiguresMailerWhenItConstructs() {
+    expect($this->mailer_task->mailer instanceof MailPoet\Mailer\Mailer)->true();
+  }
+
+  function testItCanConfigureMailerWithSenderAndReplyToAddresses() {
+    $newsletter = new stdClass();
+
+    // when no sender/reply-to information is set, use the sender information
+    // from Settings
+    $mailer = $this->mailer_task->configureMailer($newsletter);
+    expect($mailer->sender['from_name'])->equals($this->sender['name']);
+    expect($mailer->sender['from_email'])->equals($this->sender['address']);
+    expect($mailer->reply_to['reply_to_name'])->equals($this->sender['name']);
+    expect($mailer->reply_to['reply_to_email'])->equals($this->sender['address']);
+    $newsletter->sender_name = 'Sender';
+    $newsletter->sender_address = 'from@example.com';
+    $newsletter->reply_to_name = 'Reply-to';
+    $newsletter->reply_to_address = 'reply-to@example.com';
+
+    // when newsletter's sender/reply-to information is available, use that
+    // to configure mailer
+    $mailer = $this->mailer_task->configureMailer($newsletter);
+    expect($mailer->sender['from_name'])->equals($newsletter->sender_name);
+    expect($mailer->sender['from_email'])->equals($newsletter->sender_address);
+    expect($mailer->reply_to['reply_to_name'])->equals($newsletter->reply_to_name);
+    expect($mailer->reply_to['reply_to_email'])->equals($newsletter->reply_to_address);
+  }
+
+  function testItGetsMailerLog() {
+    $mailer_log = $this->mailer_task->getMailerLog();
+    expect(isset($mailer_log['sent']))->true();
+    expect(isset($mailer_log['started']))->true();
+  }
+
+  function testItUpdatesMailerLogSentCount() {
+    $mailer_log = $this->mailer_task->getMailerLog();
+    expect($mailer_log['sent'])->equals(0);
+    $mailer_log = $this->mailer_task->updateSentCount();
+    expect($mailer_log['sent'])->equals(1);
+  }
+
+  function testItGetsProcessingMethod() {
+    // when using MailPoet method, newsletters should be processed in bulk
+    Setting::setValue(
+      Mailer::MAILER_CONFIG_SETTING_NAME,
+      array(
+        'method' => 'MailPoet',
+        'mailpoet_api_key' => 'some_key',
+      )
+    );
+    $mailer_task = new MailerTask();
+    expect($mailer_task->getProcessingMethod())->equals('bulk');
+
+    // when using other methods, newsletters should be processed individually
+    Setting::setValue(
+      Mailer::MAILER_CONFIG_SETTING_NAME,
+      array(
+        'method' => 'PHPMail'
+      )
+    );
+    $mailer_task = new MailerTask();
+    expect($mailer_task->getProcessingMethod())->equals('individual');
+  }
+
+  function testItCanPrepareSubscriberForSending() {
+    $subscriber = Subscriber::create();
+    $subscriber->email = 'test@example.com';
+    $subscriber->first_name = 'John';
+    $subscriber->last_name = 'Doe';
+    $subscriber->save();
+    $prepared_subscriber = $this->mailer_task->prepareSubscriberForSending($subscriber);
+    expect($prepared_subscriber)->equals('John Doe <test@example.com>');
+  }
+
+  function testItCanSend() {
+    $php_mail_class = 'MailPoet\Mailer\Methods\PHPMail';
+    Setting::setValue(
+      Mailer::MAILER_CONFIG_SETTING_NAME,
+      array(
+        'method' => 'PHPMail'
+      )
+    );
+    // mock mailer instance and ensure that send method is invoked
+    $mailer_task = new MailerTask(
+      (object)array(
+        'mailer_instance' => Stub::make(
+          $php_mail_class,
+          array('send' => Stub::exactly(1, function($newsletter, $subscriber) { return true; }))
+        )
+      )
+    );
+    // mailer instance should be properly configured
+    expect($mailer_task->mailer->mailer_instance instanceof $php_mail_class)
+      ->true();
+    // send method should return true
+    expect($mailer_task->send('Newsletter', 'Subscriber'))->true();
+  }
+
+  function _after() {
+    ORM::raw_execute('TRUNCATE ' . Setting::$_table);
+    ORM::raw_execute('TRUNCATE ' . Subscriber::$_table);
+  }
+}

tests/unit/Cron/Workers/SendingQueue/Tasks/NewsletterTest.php

@@ -0,0 +1,149 @@
+<?php
+use Codeception\Util\Fixtures;
+use MailPoet\Cron\Workers\SendingQueue\Tasks\Newsletter as NewsletterTask;
+use MailPoet\Models\Newsletter;
+use MailPoet\Models\NewsletterLink;
+use MailPoet\Models\NewsletterPost;
+use MailPoet\Models\SendingQueue;
+use MailPoet\Models\Subscriber;
+use MailPoet\Router\Router;
+
+if(!defined('ABSPATH')) exit;
+
+class NewsletterTaskTest extends MailPoetTest {
+  function _before() {
+    $this->newsletter_task = new NewsletterTask();
+    $this->subscriber = Subscriber::create();
+    $this->subscriber->email = 'test@example.com';
+    $this->subscriber->first_name = 'John';
+    $this->subscriber->last_name = 'Doe';
+    $this->subscriber->save();
+    $this->newsletter = Newsletter::create();
+    $this->newsletter->type = Newsletter::TYPE_STANDARD;
+    $this->newsletter->subject = Fixtures::get('newsletter_subject_template');
+    $this->newsletter->body = Fixtures::get('newsletter_body_template');
+    $this->newsletter->save();
+    $this->queue = SendingQueue::create();
+    $this->queue->newsletter_id = $this->newsletter->id;
+    $this->queue->save();
+  }
+
+  function testItConstructs() {
+    expect($this->newsletter_task->tracking_enabled)->true();
+  }
+
+  function testItFailsToGetAndProcessNewsletterWhenNewsletterDoesNotExist() {
+    $queue = $this->queue;
+    $queue->newsletter_id = 0;
+    expect($this->newsletter_task->getAndPreProcess($queue))->false();
+  }
+
+  function testItReturnsNewsletterObjectWhenRenderedNewssletterBodyExistsInTheQueue() {
+    $queue = $this->queue;
+    $queue->newsletter_rendered_body = true;
+    $result = $this->newsletter_task->getAndPreProcess($queue);
+    expect($result instanceof \MailPoet\Models\Newsletter)->true();
+  }
+
+  function testItHashesLinksAndInsertsTrackingImageWhenTrackingIsEnabled() {
+    $newsletter_task = $this->newsletter_task;
+    $newsletter_task->tracking_enabled = true;
+    $newsletter_task->getAndPreProcess($this->queue);
+    $link = NewsletterLink::where('newsletter_id', $this->newsletter->id)
+      ->findOne();
+    $updated_queue = SendingQueue::findOne($this->queue->id);
+    $rendered_newsletter = $updated_queue->getNewsletterRenderedBody();
+    expect($rendered_newsletter['html'])
+      ->contains('[mailpoet_click_data]-' . $link->hash);
+    expect($rendered_newsletter['html'])
+      ->contains('[mailpoet_open_data]');
+  }
+
+  function testItDoesNotHashLinksAndInsertTrackingCodeWhenTrackingIsDisabled() {
+    $newsletter_task = $this->newsletter_task;
+    $newsletter_task->tracking_enabled = false;
+    $newsletter_task->getAndPreProcess($this->queue);
+    $link = NewsletterLink::where('newsletter_id', $this->newsletter->id)
+      ->findOne();
+    expect($link)->false();
+    $updated_queue = SendingQueue::findOne($this->queue->id);
+    $rendered_newsletter = $updated_queue->getNewsletterRenderedBody();
+    expect($rendered_newsletter['html'])
+      ->notContains('[mailpoet_click_data]');
+    expect($rendered_newsletter['html'])
+      ->notContains('[mailpoet_open_data]');
+  }
+
+  function testReturnsFalseWhenNewsletterIsANotificationWithoutPosts() {
+    $newsletter = $this->newsletter;
+    $newsletter->type = Newsletter::TYPE_NOTIFICATION;
+    // replace post id data tag with something else
+    $newsletter->body = str_replace('data-post-id', 'id', $newsletter->body);
+    $newsletter->save();
+    $result = $this->newsletter_task->getAndPreProcess($this->queue);
+    expect($result)->false();
+  }
+
+  function testItSavesNewsletterPosts() {
+    $result = $this->newsletter_task->getAndPreProcess($this->queue);
+    $newsletter_post = NewsletterPost::where('newsletter_id', $this->newsletter->id)
+      ->findOne();
+    expect($result)->notEquals(false);
+    expect($newsletter_post->post_id)->equals('10');
+  }
+
+  function testItUpdatesStatusToSentOnlyForStandardNewsletters() {
+    // newsletter type is 'standard'
+    $newsletter = $this->newsletter;
+    expect($newsletter->type)->equals(Newsletter::TYPE_STANDARD);
+    expect($newsletter->status)->notEquals(Newsletter::STATUS_SENT);
+    $this->newsletter_task->markNewsletterAsSent($newsletter);
+    $updated_newsletter = Newsletter::findOne($newsletter->id);
+    expect($updated_newsletter->status)->equals(Newsletter::STATUS_SENT);
+
+    // newsletter type is NOT 'standard'
+    $newsletter->type = Newsletter::TYPE_NOTIFICATION;
+    $newsletter->status = 'not_sent';
+    $newsletter->save();
+    $this->newsletter_task->markNewsletterAsSent($newsletter);
+    $updated_newsletter = Newsletter::findOne($newsletter->id);
+    expect($updated_newsletter->status)->notEquals(Newsletter::STATUS_SENT);
+  }
+
+  function testItRendersShortcodesAndReplacesSubscriberDataInLinks() {
+    $newsletter = $this->newsletter_task->getAndPreProcess($this->queue);
+    $result = $this->newsletter_task->prepareNewsletterForSending(
+      $newsletter,
+      $this->subscriber,
+      $this->queue
+    );
+    expect($result['subject'])->contains($this->subscriber->first_name);
+    expect($result['body']['html'])
+      ->contains(Router::NAME . '&endpoint=track&action=click&data=');
+    expect($result['body']['text'])
+      ->contains(Router::NAME . '&endpoint=track&action=click&data=');
+  }
+
+  function testItDoesNotReplaceSubscriberDataInLinksWhenTrackingIsNotEnabled() {
+    $newsletter_task = $this->newsletter_task;
+    $newsletter_task->tracking_enabled = false;
+    $newsletter = $newsletter_task->getAndPreProcess($this->queue);
+    $result = $newsletter_task->prepareNewsletterForSending(
+      $newsletter,
+      $this->subscriber,
+      $this->queue
+    );
+    expect($result['body']['html'])
+      ->notContains(Router::NAME . '&endpoint=track&action=click&data=');
+    expect($result['body']['text'])
+      ->notContains(Router::NAME . '&endpoint=track&action=click&data=');
+  }
+
+  function _after() {
+    ORM::raw_execute('TRUNCATE ' . Subscriber::$_table);
+    ORM::raw_execute('TRUNCATE ' . Newsletter::$_table);
+    ORM::raw_execute('TRUNCATE ' . SendingQueue::$_table);
+    ORM::raw_execute('TRUNCATE ' . NewsletterLink::$_table);
+    ORM::raw_execute('TRUNCATE ' . NewsletterPost::$_table);
+  }
+}

tests/unit/Cron/Workers/SendingQueue/Tasks/PostsTest.php

@@ -0,0 +1,54 @@
+<?php
+
+use MailPoet\Cron\Workers\SendingQueue\Tasks\Posts as PostsTask;
+use MailPoet\Models\Newsletter;
+use MailPoet\Models\NewsletterPost;
+
+if(!defined('ABSPATH')) exit;
+
+class PostsTaskTest extends MailPoetTest {
+  function testItFailsWhenNoPostsArePresent() {
+    $newsletter = (object)array(
+      'id' => 1,
+    );
+    $rendered_newsletter = array(
+      'html' => 'Sample newsletter'
+    );
+    expect(PostsTask::extractAndSave($rendered_newsletter, $newsletter))->equals(false);
+  }
+
+  function testItCanExtractAndSavePosts() {
+    $post_id = 10;
+    $newsletter = (object)array(
+      'id' => 1,
+      'type' => Newsletter::TYPE_STANDARD
+    );
+    $rendered_newsletter = array(
+      'html' => '<a data-post-id="' . $post_id . '" href="#">sample post</a>'
+    );
+    expect(PostsTask::extractAndSave($rendered_newsletter, $newsletter))->equals(true);
+    $newsletter_post = NewsletterPost::where('newsletter_id', $newsletter->id)
+      ->findOne();
+    expect($newsletter_post->post_id)->equals($post_id);
+  }
+
+  function testItSetsNewsletterIdToParentIdWhenNewsletterIsANotificationHistory() {
+    $post_id = 10;
+    $newsletter = (object)array(
+      'id' => 2,
+      'parent_id' => 1,
+      'type' => Newsletter::TYPE_NOTIFICATION_HISTORY
+    );
+    $rendered_newsletter = array(
+      'html' => '<a data-post-id="' . $post_id . '" href="#">sample post</a>'
+    );
+    expect(PostsTask::extractAndSave($rendered_newsletter, $newsletter))->equals(true);
+    $newsletter_post = NewsletterPost::where('newsletter_id', $newsletter->parent_id)
+      ->findOne();
+    expect($newsletter_post->post_id)->equals($post_id);
+  }
+
+  function _after() {
+    ORM::raw_execute('TRUNCATE ' . NewsletterPost::$_table);
+  }
+}

tests/unit/Cron/Workers/SendingQueue/Tasks/ShortcodesTest.php

@@ -0,0 +1,28 @@
+<?php
+use MailPoet\Cron\Workers\SendingQueue\Tasks\Shortcodes;
+use MailPoet\Models\Newsletter;
+use MailPoet\Models\SendingQueue;
+
+if(!defined('ABSPATH')) exit;
+
+class ShortcodesTaskTest extends MailPoetTest {
+  function testItCanReplaceShortcodes() {
+    $queue = $newsletter = array(
+      'id' => 1
+
+    );
+    $subscriber = array(
+      'email' => 'test@xample. com',
+      'first_name' => 'John',
+      'last_name' => 'Doe'
+    );
+    $rendered_body = '[subscriber:firstname] [subscriber:lastname]';
+    $result = Shortcodes::process($rendered_body, $newsletter, $subscriber, $queue);
+    expect($result)->equals('John Doe');
+  }
+
+  function _after() {
+    ORM::raw_execute('TRUNCATE ' . SendingQueue::$_table);
+    ORM::raw_execute('TRUNCATE ' . Newsletter::$_table);
+  }
+}

tests/unit/Mailer/MailerLogTest.php

@@ -0,0 +1,136 @@
+<?php
+
+use MailPoet\Mailer\Mailer;
+use MailPoet\Mailer\MailerLog;
+use MailPoet\Models\Setting;
+
+class MailerLogTest extends MailPoetTest {
+  function testItGetsMailerLogWhenOneExists() {
+    $mailer_log = array(
+      'sent' => 0,
+      'started' => time()
+    );
+    Setting::setValue(MailerLog::SETTING_NAME, $mailer_log);
+    expect(MailerLog::getMailerLog())->equals($mailer_log);
+  }
+
+  function testItGetsMailerLogWhenOneDoesNotExist() {
+    $mailer_log = MailerLog::getMailerLog();
+    expect($mailer_log['sent'])->equals(0);
+    expect(strlen($mailer_log['started']))->greaterThan(5);
+  }
+
+  function testItCreatesMailer() {
+    $mailer_log = MailerLog::createMailerLog();
+    expect($mailer_log['sent'])->equals(0);
+    expect(strlen($mailer_log['started']))->greaterThan(5);
+  }
+
+  function testItResetsMailerLog() {
+    $mailer_log = array(
+      'sent' => 1,
+      'started' => time() - 10
+    );
+    Setting::setValue(MailerLog::SETTING_NAME, $mailer_log);
+    MailerLog::resetMailerLog();
+    $updated_mailer_log = Setting::getValue(MailerLog::SETTING_NAME);
+    expect($updated_mailer_log['sent'])->equals(0);
+    expect($updated_mailer_log['started'])->greaterThan($mailer_log['started']);
+  }
+
+  function testItUpdatesMailerLog() {
+    $mailer_log = array(
+      'sent' => 1,
+      'started' => time() - 10
+    );
+    MailerLog::updateMailerLog($mailer_log);
+    $updated_mailer_log = Setting::getValue(MailerLog::SETTING_NAME);
+    expect($updated_mailer_log)->equals($mailer_log);
+  }
+
+  function testItIncrementsSentCount() {
+    $mailer_log = array(
+      'sent' => 1,
+      'started' => time()
+    );
+    Setting::setValue(MailerLog::SETTING_NAME, $mailer_log);
+    MailerLog::incrementSentCount();
+    $updated_mailer_log = Setting::getValue(MailerLog::SETTING_NAME);
+    expect($updated_mailer_log['sent'])->equals(2);
+  }
+
+  function testItChecksWhenSendingLimitIsReached() {
+    $mailer_config = array(
+      'frequency' => array(
+        'emails' => 2,
+        'interval' => 1
+      )
+    );
+    Setting::setValue(Mailer::MAILER_CONFIG_SETTING_NAME, $mailer_config);
+
+    // limit is not reached
+    $mailer_log = array(
+      'sent' => 1,
+      'started' => time()
+    );
+    Setting::setValue(MailerLog::SETTING_NAME, $mailer_log);
+    expect(MailerLog::isSendingLimitReached())->false();
+
+    // limit is reached
+    $mailer_log = array(
+      'sent' => 2,
+      'started' => time()
+    );
+    Setting::setValue(MailerLog::SETTING_NAME, $mailer_log);
+    expect(MailerLog::isSendingLimitReached())->true();
+  }
+
+  function testItResetsMailerAfterSendingLimitWaitPeriodIsOver() {
+    $mailer_config = array(
+      'frequency' => array(
+        'emails' => 2,
+        'interval' => 1
+      )
+    );
+    $mailer_log = array(
+      'sent' => 2,
+      // (mailer config's interval * 60 seconds) + 1 second
+      'started' => time() - 61
+    );
+    Setting::setValue(MailerLog::SETTING_NAME, $mailer_log);
+    Setting::setValue(Mailer::MAILER_CONFIG_SETTING_NAME, $mailer_config);
+
+    // limit is not reached
+    expect(MailerLog::isSendingLimitReached())->false();
+    // mailer log is reset
+    $updated_mailer_log = Setting::getValue(MailerLog::SETTING_NAME);
+    expect($updated_mailer_log['sent'])->equals(0);
+  }
+
+  function testItCanEnforceSendingLimit() {
+    $mailer_config = array(
+      'frequency' => array(
+        'emails' => 2,
+        'interval' => 1
+      )
+    );
+    $mailer_log = array(
+      'sent' => 2,
+      'started' => time()
+    );
+    Setting::setValue(MailerLog::SETTING_NAME, $mailer_log);
+    Setting::setValue(Mailer::MAILER_CONFIG_SETTING_NAME, $mailer_config);
+
+    // exception is thrown when sending limit is reached
+    try {
+      MailerLog::enforceSendingLimit();
+      self::fail('Sending frequency exception was not thrown.');
+    } catch(\Exception $e) {
+      expect($e->getMessage())->equals('Sending frequency limit has been reached.');
+    }
+  }
+
+  function _after() {
+    ORM::raw_execute('TRUNCATE ' . Setting::$_table);
+  }
+}

tests/unit/Mailer/MailerTest.php

@@ -116,32 +116,32 @@ class MailerTest extends MailPoetTest {
   function testItSetsReplyToAddressWhenOnlyNameIsAvailable() {
     $reply_to = array('name' => 'test');
     $mailer = new Mailer($this->mailer, $this->sender, $reply_to);
-    $reply_to = $mailer->getReplyTo();
+    $reply_to = $mailer->getReplyToNameAndAddress();
     expect($reply_to['reply_to_email'])->equals($this->sender['address']);
   }
 
   function testItCanTransformSubscriber() {
     $mailer = new Mailer($this->mailer, $this->sender, $this->reply_to);
-    expect($mailer->transformSubscriber('test@email.com'))
+    expect($mailer->formatSubscriberNameAndEmailAddress('test@email.com'))
       ->equals('test@email.com');
-    expect($mailer->transformSubscriber(
+    expect($mailer->formatSubscriberNameAndEmailAddress(
       array(
         'email' => 'test@email.com'
       ))
     )->equals('test@email.com');
-    expect($mailer->transformSubscriber(
+    expect($mailer->formatSubscriberNameAndEmailAddress(
       array(
         'first_name' => 'First',
         'email' => 'test@email.com'
       ))
     )->equals('First <test@email.com>');
-    expect($mailer->transformSubscriber(
+    expect($mailer->formatSubscriberNameAndEmailAddress(
       array(
         'last_name' => 'Last',
         'email' => 'test@email.com'
       ))
     )->equals('Last <test@email.com>');
-    expect($mailer->transformSubscriber(
+    expect($mailer->formatSubscriberNameAndEmailAddress(
       array(
         'first_name' => 'First',
         'last_name' => 'Last',

tests/unit/Models/NewsletterPostTest.php

@@ -0,0 +1,25 @@
+<?php
+
+use Carbon\Carbon;
+use MailPoet\Models\NewsletterPost as NewsletterPost;
+
+class NewsletterPostTest extends MailPoetTest {
+  function testItCanGetLatestNewsletterPost() {
+    foreach(range(1, 5) as $index) {
+      $newsletter_post = NewsletterPost::create();
+      $newsletter_post->newsletter_id = 1;
+      $newsletter_post->post_id = $index;
+      $newsletter_post->save();
+      $newsletter_post->created_at = Carbon::now()
+        ->addMinutes($index);
+      $newsletter_post->save();
+    }
+    $latest_newsletter_post = NewsletterPost::getNewestNewsletterPost(1);
+    expect($latest_newsletter_post->post_id)->equals(5);
+  }
+
+  function _after() {
+    ORM::for_table(NewsletterPost::$_table)
+      ->deleteMany();
+  }
+}

tests/unit/Models/StatisticsUnsubscribesTest.php

@@ -0,0 +1,30 @@
+<?php
+
+use MailPoet\Models\StatisticsUnsubscribes;
+
+class StatisticsUnsubscribesTest extends MailPoetTest {
+  function testItCanGetExistingStatisticsRecord() {
+    $unsubscribe_statistics = StatisticsUnsubscribes::create();
+    $unsubscribe_statistics->newsletter_id = 123;
+    $unsubscribe_statistics->subscriber_id = 456;
+    $unsubscribe_statistics->queue_id = 789;
+    $unsubscribe_statistics->save();
+    $unsubscribe_statistics = StatisticsUnsubscribes::getOrCreate(456, 123, 789);
+    expect($unsubscribe_statistics->newsletter_id)->equals(123);
+    expect($unsubscribe_statistics->subscriber_id)->equals(456);
+    expect($unsubscribe_statistics->queue_id)->equals(789);
+  }
+
+  function testItCanCreateNewStatisticsRecord() {
+    expect(count(StatisticsUnsubscribes::findMany()))->equals(0);
+    $unsubscribe_statistics = StatisticsUnsubscribes::getOrCreate(456, 123, 789);
+    expect($unsubscribe_statistics->newsletter_id)->equals(123);
+    expect($unsubscribe_statistics->subscriber_id)->equals(456);
+    expect($unsubscribe_statistics->queue_id)->equals(789);
+  }
+
+  function _after() {
+    ORM::for_table(StatisticsUnsubscribes::$_table)
+      ->deleteMany();
+  }
+}

tests/unit/Newsletter/Links/LinksTest.php

@@ -0,0 +1,105 @@
+<?php
+
+use Codeception\Util\Fixtures;
+use MailPoet\Models\NewsletterLink;
+use MailPoet\Models\SendingQueue;
+use MailPoet\Models\Subscriber;
+use MailPoet\Newsletter\Links\Links;
+use MailPoet\Router\Router;
+
+class LinksTest extends MailPoetTest {
+  function testItOnlyExtractsLinksFromHrefs() {
+    $template = '<a href="http://link1.com">some site</a> http://link2.com <img src="http://link3.com">';
+    $result = Links::extract($template);
+
+    expect($result[0])->equals(
+      array(
+        'html' => 'href="http://link1.com"',
+        'link' => 'http://link1.com'
+      )
+    );
+  }
+
+  function testItCanExtactLinkShortcodes() {
+    $template = '[notlink:shortcode] [link:some_link_shortcode]';
+    $result = Links::extract($template);
+
+    expect($result[0])->equals(
+      array(
+        'html' => '[link:some_link_shortcode]',
+        'link' => '[link:some_link_shortcode]'
+      )
+    );
+  }
+
+  function testItHashesAndReplacesLinks() {
+    $template = '<a href="http://link1.com">some site</a> [link:some_link_shortcode]';
+    list($updated_content, $hashed_links) = Links::process($template);
+
+    // 2 links were hashed
+    expect(count($hashed_links))->equals(2);
+    // links in returned content were replaced with hashes
+    expect($updated_content)
+      ->contains(Links::DATA_TAG_CLICK . '-' . $hashed_links[0]['hash']);
+    expect($updated_content)
+      ->contains(Links::DATA_TAG_CLICK . '-' . $hashed_links[1]['hash']);
+    expect($updated_content)->notContains('link');
+  }
+
+  function testItReplacesHashedLinksWithSubscriberData() {
+    $subscriber = Subscriber::create();
+    $subscriber->hydrate(Fixtures::get('subscriber_template'));
+    $subscriber->save();
+    $queue = SendingQueue::create();
+    $queue->newsletter_id = 1;
+    $queue->save();
+    $template = '<a href="[mailpoet_click_data]-1234">some site</a> <img src="[mailpoet_open_data]"/>';
+    $result = Links::replaceSubscriberData($subscriber->id, $queue->id, $template);
+
+    // there are no click/open data tags
+    expect($result)->notContains(Links::DATA_TAG_CLICK);
+    expect($result)->notContains(Links::DATA_TAG_OPEN);
+
+    // data tags were converted to URLs
+    expect($result)
+      ->regExp('/<a href="http.*?' . Router::NAME . '&endpoint=track&action=click&data=.*?>/');
+    expect($result)
+      ->regExp('/<img src="http.*?' . Router::NAME . '&endpoint=track&action=open&data=.*?>/');
+
+    // data was base64encoded, serialized and contains an array of variables
+    preg_match_all('/data=(?P<data>.*?)"/', $result, $result);
+    foreach($result['data'] as $data) {
+      $data = unserialize(base64_decode($data));
+      expect($data['subscriber_id'])->equals($subscriber->id);
+      expect($data['queue_id'])->equals($queue->id);
+      expect(isset($data['subscriber_token']))->true();
+    }
+  }
+
+  function testItCanSaveLinks() {
+    $links = array(
+      array(
+        'url' => 'http://example.com',
+        'hash' => 123
+      )
+    );
+    Links::save(
+      $links,
+      $newletter_id = 1,
+      $queue_id = 1
+    );
+
+    // 1 database record was created
+    $newsltter_link = NewsletterLink::where('newsletter_id', 1)
+      ->where('queue_id', 1)
+      ->findOne();
+    expect($newsltter_link->hash)->equals(123);
+    expect($newsltter_link->url)->equals('http://example.com');
+  }
+
+  function _after() {
+    ORM::raw_execute('TRUNCATE ' . Subscriber::$_table);
+    ORM::raw_execute('TRUNCATE ' . SendingQueue::$_table);
+    ORM::raw_execute('TRUNCATE ' . NewsletterLink::$_table);
+  }
+}

tests/unit/Newsletter/ViewInBrowserTest.php

@@ -1,6 +1,5 @@
 <?php
 
-use Codeception\Util\Stub;
 use MailPoet\Models\Newsletter;
 use MailPoet\Models\SendingQueue;
 use MailPoet\Models\Setting;
@@ -57,17 +56,13 @@ class ViewInBrowserTest extends MailPoetTest {
       'type' => 'standard',
       'status' => 'active'
     );
-    $this->queue_rendered_newsletter_without_tracking = json_encode(
+    $this->queue_rendered_newsletter_without_tracking = array(
-      array(
+      'html' => 'Newsletter from queue. Hello, [subscriber:firstname] & 
-        'html' => 'Newsletter from queue. Hello, [subscriber:firstname] & 
         [link:newsletter_view_in_browser_url]'
-      )
     );
-    $this->queue_rendered_newsletter_with_tracking = json_encode(
+    $this->queue_rendered_newsletter_with_tracking = array(
-      array(
+      'html' => 'Newsletter from queue. Hello, [subscriber:firstname] & 
-        'html' => 'Newsletter from queue. Hello, [subscriber:firstname] & 
         [mailpoet_click_data]-90e56'
-      )
     );
     // instantiate class
     $this->view_in_browser = new ViewInBrowser();

tests/unit/_bootstrap.php

@@ -1 +1,46 @@
 <?php
+use Codeception\Util\Fixtures;
+
+Fixtures::add(
+  'newsletter_body_template',
+  '{
+     "content": {
+       "type": "container",
+       "orientation": "vertical",
+       "blocks": [
+         {
+           "type": "container",
+           "styles": { "block": {} },
+           "orientation": "horizontal",
+           "blocks": [
+             {
+               "type": "container",
+               "orientation": "vertical",
+               "styles": { "block": {} },
+               "blocks": [
+                 {
+                   "type": "text",
+                   "text": "<a data-post-id=\"10\" href=\"http://example.com\">Link</a>Hello [subscriber:firstname]"
+                 }
+               ]
+             }
+           ]
+         }
+       ]
+     }
+   }'
+);
+
+Fixtures::add(
+  'newsletter_subject_template',
+  'Newsletter for [subscriber:firstname]'
+);
+
+Fixtures::add(
+  'subscriber_template',
+  array(
+    'first_name' => 'John',
+    'last_name' => 'John',
+    'email' => 'john.doe@example.com'
+  )
+);

views/form/editor.html

@@ -274,18 +274,17 @@
         // form editor: default fields
         var template = Handlebars.compile($('#form_template_fields').html());
 
-        var data = {
-          fields: mailpoet_default_fields
-        };
-
         return MailPoet.Ajax.post({
           endpoint: 'customFields',
           action: 'getAll',
         }).done(function(response) {
-          data.fields  = $.merge(response.data, data.fields);
-
           // render toolbar
-          jQuery('#mailpoet_toolbar_fields').html(template(data));
+          jQuery('#mailpoet_toolbar_fields').html(template({
+            fields: $.merge(
+              $.merge([], mailpoet_default_fields),
+              response.data
+            )
+          }));
 
           setTimeout(function() {
             WysijaForm.init();

views/form/iframe.html

@@ -20,25 +20,6 @@
     <%= form | raw %>
     <script type="text/javascript">
       var MailPoetForm = <%= json_encode(mailpoet_form) %>;
-      function autoSize() {
-        var iframe = window.frameElement;
-        var height = document.body.scrollHeight;
-        parent.MailPoet.Iframe.setSize(iframe, height);
-      }
-
-      jQuery(function($) {
-        $(function() {
-          autoSize();
-        });
-      });
-
-      jQuery('form').on('submit', function() {
-        setTimeout(function() {
-          // make sure we resize the iframe
-          autoSize();
-        }.bind(this), 1);
-        return true;
-      }.bind(this));
     </script>
   </body>
 </html>

views/form/widget.html

@@ -9,7 +9,7 @@
     <%= styles | raw %>
     <form
       method="post"
-      action="<%= admin_url('admin-post.php?action=mailpoet') | raw %>"
+      action="<%= admin_url('admin-post.php?action=mailpoet_subscription_form') | raw %>"
       class="mailpoet_form mailpoet_form_<%= form_type %>"
       novalidate
     >
@@ -30,11 +30,14 @@
           <% if not(success) %>
           style="display:none;"
           <% endif %>
-        >
+        ><%= form.settings.success_message %></p>
-          <%= form.settings.success_message %>
+        <p class="mailpoet_validate_error"
-        </p>
+          <% if not(error) %>
-        <p class="mailpoet_validate_error" style="display:none;">
+          style="display:none;"
-          <!-- errors will be displayed here -->
+          <% endif %>
+        ><% if (error) %>
+           <%= __("An error occurred, make sure you have filled all the required fields.") %>
+          <% endif %>
         </p>
       </div>
     </form>

views/forms.html

@@ -41,6 +41,7 @@
 
     'formName': __('Name'),
     'segments': __('Lists'),
+    'userChoice': __('User choice:'),
     'signups': __('Signups'),
     'createdOn': __('Created On'),
     'oneFormTrashed': __('1 form was moved to the trash'),

views/newsletter/templates/blocks/footer/block.hbs

@@ -16,5 +16,5 @@
         text-decoration: {{ model.styles.link.textDecoration }};
     }
 </style>
-<div class="mailpoet_content mailpoet_text_content mailpoet_ignore_drag">{{{ model.text }}}</div>
+<div class="mailpoet_content mailpoet_text_content">{{{ model.text }}}</div>
 <div class="mailpoet_block_highlight"></div>

views/newsletter/templates/blocks/header/block.hbs

@@ -16,5 +16,5 @@
         text-decoration: {{ model.styles.link.textDecoration }};
     }
 </style>
-<div class="mailpoet_content mailpoet_text_content mailpoet_ignore_drag">{{{ model.text }}}</div>
+<div class="mailpoet_content mailpoet_text_content">{{{ model.text }}}</div>
 <div class="mailpoet_block_highlight"></div>

views/newsletter/templates/blocks/text/block.hbs

@@ -1,3 +1,3 @@
 <div class="mailpoet_tools"></div>
-<div class="mailpoet_content mailpoet_text_content mailpoet_ignore_drag">{{{ model.text }}}</div>
+<div class="mailpoet_content mailpoet_text_content">{{{ model.text }}}</div>
 <div class="mailpoet_block_highlight"></div>

views/update.html

@@ -23,19 +23,28 @@
 
   <div id="mailpoet-changelog" clas="feature-section one-col">
     <h2><%= __("List of Changes") %></h2>
+    <h3>0.0.46 - 2016-09-27</h3>
+    <ul>
+      <li>Fixed subscription forms.</li>
+      <li>Enabled dragging of text blocks in visual editor.</li>
+      <li>Added more unit tests.</li>
+    </ul>
+    <br>
+
     <h3>0.0.45 - 2016-09-20</h3>
     <ul>
-      <li>Refactored Cron Scheduler worker and added unit tests;</li>
+      <li>Refactored Cron Scheduler worker and added unit tests.</li>
       <li>Fixed some language strings.</li>
     </ul>
     <br>
+
     <h3>0.0.44 - 2016-09-13</h3>
     <ul>
-      <li>Updated API response formats for Forms, Newsletters, Segments, Subscribers;</li>
+      <li>Updated API response formats for Forms, Newsletters, Segments, Subscribers.</li>
-      <li>Fixed "Subject" and "Email preview" text in newsletter editor;</li>
+      <li>Fixed "Subject" and "Email preview" text in newsletter editor.</li>
-      <li>Added unit tests for Cron;</li>
+      <li>Added unit tests for Cron.</li>
-      <li>Fixed class instantiation issues for PHP 5.3;</li>
+      <li>Fixed class instantiation issues for PHP 5.3.</li>
-      <li>Updated links to KB articles;</li>
+      <li>Updated links to KB articles.</li>
       <li>Added a subscribers limit of 2000 subscribers.</li>
     </ul>
     <br>

views/welcome.html

@@ -32,7 +32,7 @@
 
   <div class="headline-feature feature-video">
     <div class="videoWrapper">
-      <iframe width="1050" height="591" src="https://player.vimeo.com/video/130151897?title=0&byline=0&portrait=0" frameborder="0" webkitallowfullscreen="" mozallowfullscreen="" allowfullscreen=""></iframe>
+      <iframe width="1050" height="591" src="https://player.vimeo.com/video/184501111?title=0&byline=0&portrait=0" frameborder="0" webkitallowfullscreen="" mozallowfullscreen="" allowfullscreen=""></iframe>
     </div>
   </div>