Bump version up to 0.0.14

Enables conditional bypassing of unit tests

.env.sample

@@ -1,2 +1,16 @@
 WP_TEST_PATH="/var/www/wordpress"
-
+WP_TEST_ENABLE_NETWORK_TESTS="true"
+WP_TEST_IMPORT_MAILCHIMP_API=""
+WP_TEST_IMPORT_MAILCHIMP_LISTS="" // (separated with comma)
+WP_TEST_MAILER_ENABLE_SENDING="true"
+WP_TEST_MAILER_AMAZON_ACCESS=""
+WP_TEST_MAILER_AMAZON_SECRET=""
+WP_TEST_MAILER_AMAZON_REGION=""
+WP_TEST_MAILER_ELASTICEMAIL_API=""
+WP_TEST_MAILER_MAILGUN_API=""
+WP_TEST_MAILER_MAILGUN_DOMAIN=""
+WP_TEST_MAILER_MAILPOET_API=""
+WP_TEST_MAILER_SENDGRID_API=""
+WP_TEST_MAILER_SMTP_HOST=""
+WP_TEST_MAILER_SMTP_LOGIN=""
+WP_TEST_MAILER_SMTP_PASSWORD=""

.gitignore

@@ -1,7 +1,7 @@
 .DS_Store
 TODO
 composer.phar
-vendor
+/vendor
 tests/_output/*
 tests/acceptance.suite.yml
 tests/_support/_generated/*

README.md

@@ -8,7 +8,6 @@ MailPoet done the right way.
 ```
 php
 nodejs
-phantomjs
 wordpress
 ```
 
@@ -47,16 +46,6 @@ $ ./do compile:all
 $ ./do test:unit
 ```
 
-- Acceptance tests:
-```sh
-$ ./do test:acceptance
-```
-
-- Run all tests:
-```sh
-$ ./do test:all
-```
-
 - Debug tests:
 ```sh
 $ ./do test:debug

RoboFile.php

@@ -105,7 +105,17 @@ class RoboFile extends \Robo\Tasks {
   function testUnit($file = null) {
     $this->loadEnv();
     $this->_exec('vendor/bin/codecept build');
-    $this->_exec('vendor/bin/codecept run unit '.(($file) ? $file : ''));
+    $this->_exec('vendor/bin/codecept run unit -f '.(($file) ? $file : ''));
+  }
+
+  function testCoverage() {
+    $this->loadEnv();
+    $this->_exec('vendor/bin/codecept build');
+    $this->_exec(join(' ', array(
+      'vendor/bin/codecept run',
+      '--coverage',
+      '--coverage-html'
+    )));
   }
 
   function testJavascript() {

assets/css/src/box.styl

@@ -43,7 +43,7 @@
     bottom: 0
     background-color: rgba(255, 255, 255, 0.0)
     opacity: 0
-    transition: all 200ms cubic-bezier(0.420, 0.000, 0.580, 1.000) /* ease-in-out */
+    transition: all 250ms cubic-bezier(0.420, 0.000, 0.580, 1.000) /* ease-in-out */
 
     &:hover
       background-color: rgba(255, 255, 255, 0.7)
@@ -101,3 +101,6 @@
 [data-type="standard"] .mailpoet_thumbnail
   background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20viewBox%3D%220%200%2070%2070%22%20enable-background%3D%22new%200%200%2070%2070%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20fill%3D%22%23ffffff%22%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M62.751%2C65.368L43.923%2C50.955l18.832-14.377l-5.395-4.118v-3.479l5.983%2C4.568%20v3.479l0.166%2C26.269C63.51%2C64.089%2C63.198%2C64.783%2C62.751%2C65.368z%20M31.433%2C49.5l-15.955-12v-30c0-1.657%2C1.339-3%2C2.992-3h33.905%20c1.652%2C0%2C2.992%2C1.343%2C2.992%2C3v30l-15.955%2C12H31.433z%20M18.469%2C35.5H33.5v-2H18.469V35.5z%20M18.469%2C31.5H33.5v-2H18.469V31.5z%20M18.469%2C27.5H33.5v-2H18.469V27.5z%20M38.406%2C7.5H18.469v14h19.937V7.5z%20M52.375%2C7.5H40.408v2h11.967V7.5z%20M52.375%2C11.5H40.408v2%20h11.967V11.5z%20M52.375%2C15.5H40.408v2h11.967V15.5z%20M52.375%2C19.5H40.408v2h11.967V19.5z%20M52.375%2C25.5H37.5v2h14.875V25.5z%20M52.375%2C29.5H37.5v2h14.875V29.5z%20M52.375%2C33.5H37.5v2h14.875V33.5z%20M26.14%2C17.192L28.442%2C9.5l3.277%2C6.571l1.71-2.571l2.992%2C6%20h-2.992h-3.989h-0.997H25.45h-4.986l3.989-4L26.14%2C17.192z%20M22.469%2C12.5h-1c-0.552%2C0-1-0.448-1-1v-1c0-0.552%2C0.448-1%2C1-1h1%20c0.552%2C0%2C1%2C0.448%2C1%2C1v1C23.469%2C12.052%2C23.021%2C12.5%2C22.469%2C12.5z%20M26.795%2C50.955L8.05%2C65.305c-0.419-0.574-0.55-1.41-0.55-2.174%20V37.015l-0.015%2C0.011v-3.479l5.998-4.579v3.479L8.017%2C36.62L26.795%2C50.955z%20M29.137%2C52.659v-0.157h12.462v0.144l0.047-0.036%20L59.73%2C66.5H10.989l18.084-13.889L29.137%2C52.659z%22%2F%3E%3C%2Fsvg%3E%0A")
 
+.mailpoet_boxes_preview
+  margin: -10px
+  padding: 10px 20px

assets/css/src/common.styl

@@ -19,6 +19,8 @@ a:focus
 
 // select 2
 .select2-container
+  width: 25em !important
+
 // textareas
 textarea.regular-text
   width: 25em !important

assets/css/src/form_editor.styl

@@ -125,6 +125,7 @@ handle_icon = '../img/handle.png'
   float: none
 
 #mailpoet_form_toolbar
+  z-index: 999
   position: absolute
   width: 400px
 

assets/css/src/modal.styl

@@ -90,7 +90,7 @@ body.mailpoet_modal_opened
   padding: 0
   margin: 0
   width: 100%
-  transition: margin 0.3s ease-out
+  transition: margin 350ms ease-out
 
 .mailpoet_panel_wrapper
   background-color: #f1f1f1
@@ -200,4 +200,4 @@ body.mailpoet_modal_opened
   0%
   50%
     background-color: #064E6D
-  100%
+  100%

assets/css/src/newsletter_editor/components/blockTools.styl

@@ -7,7 +7,6 @@ $tool-active-secondary-color = #ffffff
 
 $tool-width = 20px
 $master-column-tool-width = 24px
-$layer-selector-width = 30px
 
 .mailpoet_tools
   position: absolute
@@ -33,10 +32,35 @@ $layer-selector-width = 30px
         width: $master-column-tool-width
         height: $master-column-tool-width
 
+
+    .mailpoet_delete_block_activate
+      max-width: 100%
+      max-height: $master-column-tool-width
+      opacity: 1
+      display: block
+
+    .mailpoet_delete_block_confirm,
+    .mailpoet_delete_block_cancel
+      max-width: 100%
+      max-height: 0
+      opacity: 0
+      overflow: hidden
+      display: block
+
     .mailpoet_delete_block_activated
       width: auto
       height: auto
 
+      .mailpoet_delete_block_activate
+        overflow: hidden
+        max-height: 0
+        opacity: 0
+
+      .mailpoet_delete_block_confirm,
+      .mailpoet_delete_block_cancel
+        max-height: $master-column-tool-width*2
+        opacity: 1
+
 .mailpoet_tool
   display: inline-block
   width: $tool-width
@@ -82,7 +106,7 @@ $layer-selector-width = 30px
     padding: 0
 
   .mailpoet_delete_block_activate
-    max-width: 100%
+    max-width: $tool-width
     display: inline-block
     opacity: 1
     animation-fade-in-and-scale-horizontally()
@@ -96,12 +120,12 @@ $layer-selector-width = 30px
     animation-fade-in-and-scale-horizontally()
 
 .mailpoet_delete_block_activated
+  height: auto
   width: auto
   border-radius(3px)
   background-color: $warning-background-color
   padding: 3px 5px
   line-height: 1.2em
-  height: auto
 
   .mailpoet_delete_block_activate
     overflow: hidden
@@ -113,6 +137,9 @@ $layer-selector-width = 30px
     max-width: 100%
     opacity: 1
 
+  .mailpoet_delete_block_cancel
+    margin-left: 3px
+
 .mailpoet_delete_block_confirm
   color: $warning-text-color
 

assets/css/src/newsletter_editor/components/dragAndDrop.styl

@@ -52,7 +52,7 @@ $draggable-widget-z-index = 2
   padding: 0
   margin: 0
   z-index: $draggable-widget-z-index
-  animation-fade-in-and-scale-up()
+  animation-fade-in()
 
   .mailpoet_widget_icon
     padding: 0

assets/css/src/newsletter_editor/components/sidebar.styl

@@ -26,13 +26,9 @@ $widget-icon-width = 30px
     border-right: 0
 
     &.closed .mailpoet_region_content
-      max-height: 0px
-      overflow: hidden
-      margin-top: 0
+      display: none
 
   .mailpoet_region_content
-    max-height: 2000px
-    transition: max-height 300ms ease
     padding: 0 20px
     margin-top: 12px
 

assets/css/src/newsletter_editor/contentBlocks/base.styl

@@ -30,8 +30,3 @@ $block-hover-highlight-color = $primary-active-color
 
 .mailpoet_content
   position: relative
-
-.mailpoet_block_transition_in
-  animation-fade-in-and-scale-up()
-.mailpoet_block_transition_out
-  animation-fade-out-and-scale-down()

assets/css/src/newsletter_editor/libraryOverrides.styl

@@ -129,3 +129,7 @@ body
 
 #mailpoet_modal_close
   display: none
+
+.wrap > .mailpoet_notice,
+.update-nag
+  margin-left: 2px + 15px !important

assets/css/src/newsletter_editor/mixins/transitions.styl

@@ -1,5 +1,5 @@
 animation-slide-open-downwards()
-  transition: all 300ms cubic-bezier(0.420, 0.000, 0.580, 1.000) /* ease-in-out */
+  transition: all 250ms cubic-bezier(0.420, 0.000, 0.580, 1.000) /* ease-in-out */
   max-height: 2000px
   opacity: 1
 
@@ -9,45 +9,23 @@ animation-slide-open-downwards()
     overflow-y: hidden
 
 animation-background-color()
-  transition: background 300ms cubic-bezier(0.420, 0.000, 0.580, 1.000) /* ease-in-out */
+  transition: background 250ms cubic-bezier(0.420, 0.000, 0.580, 1.000) /* ease-in-out */
 
-animation-fade-in-and-scale-up()
-  animation-name: fadeInAndScaleUp
-  animation-duration: 500ms
-  animation-fill-mode: forwards
-
-animation-fade-out-and-scale-down()
-  animation-name: fadeOutAndScaleDown
-  animation-duration: 500ms
+animation-fade-in()
+  animation-name: fadeIn
+  animation-duration: 300ms
   animation-fill-mode: forwards
+  animation-timing-function: ease-in
 
 animation-fade-in-and-scale-horizontally()
-  transition: all 300ms cubic-bezier(0.420, 0.000, 0.580, 1.000) /* ease-in-out */
+  transition: all 250ms cubic-bezier(0.420, 0.000, 0.580, 1.000) /* ease-in-out */
 
-@keyframes fadeInAndScaleUp {
+@keyframes fadeIn {
   0% {
     opacity: 0.3
-    max-height: 0
-    overflow: hidden
   }
 
   100% {
     opacity: 1
-    max-height: 5000px
-    overflow: hidden
-  }
-}
-
-@keyframes fadeOutAndScaleDown {
-  0% {
-    opacity: 1
-    max-height: 5000px
-    overflow: hidden
-  }
-
-  100% {
-    opacity: 0.3
-    max-height: 0
-    overflow: hidden
   }
 }

assets/js/src/cron.jsx

@@ -15,10 +15,10 @@ define(
         status: 'loading'
       };
     },
-    getDaemonData: function() {
+    getCronData: function() {
       MailPoet.Ajax.post({
           endpoint: 'cron',
-          action: 'getDaemonStatus'
+          action: 'getStatus'
         })
         .done(function(response) {
           jQuery('.button-primary')
@@ -32,25 +32,23 @@ define(
     },
     componentDidMount: function() {
       if(this.isMounted()) {
-        this.getDaemonData();
-        setInterval(this.getDaemonData, 5000);
+        this.getCronData();
+        setInterval(this.getCronData, 5000);
       }
     },
-    controlDaemon: function(action) {
+    controlCron: function(action) {
+      if(jQuery('.button-primary').hasClass('disabled')) {
+        return;
+      }
       jQuery('.button-primary')
         .addClass('disabled');
       MailPoet.Ajax.post({
         endpoint: 'cron',
-        action: 'controlDaemon',
-        data: {
-          'action': action
-        }
+        action: action,
       })
       .done(function(response) {
         if(!response.result) {
-          //this.replaceState();
-        } else {
-          //this.setState(response);
+          MailPoet.Notice.error(MailPoetI18n.daemonControlError);
         }
       }.bind(this));
     },
@@ -71,19 +69,25 @@ define(
               <strong> {this.state.counter} </strong> times (once every 30 seconds, unless it was interrupted and restarted).
               <br />
               <br />
-              <a href="#" className="button-primary" onClick={this.controlDaemon.bind(null, 'stop')}>Stop</a>&nbsp;&nbsp;
-              <a href="#" className="button-primary" onClick={this.controlDaemon.bind(null, 'pause')}>Pause</a>
+              <a href="#" className="button-primary" onClick={this.controlCron.bind(null, 'stop')}>Stop</a>
+            </div>
+          );
+        break;
+        case 'starting':
+        case 'stopping':
+          return(
+            <div>
+              Daemon is {this.state.status}
             </div>
           );
         break;
-        case 'paused':
         case 'stopped':
           return(
             <div>
               Daemon is {this.state.status}
               <br />
               <br />
-              <a href="#" className="button-primary" onClick={this.controlDaemon.bind(null, 'start')}>Start</a>
+              <a href="#" className="button-primary" onClick={this.controlCron.bind(null, 'start')}>Start</a>
             </div>
           );
         break;

assets/js/src/form/fields/checkbox.jsx

@@ -1,31 +1,31 @@
 define([
-  'react',
-  'react-checkbox-group'
+  'react'
 ],
 function(
-  React,
-  CheckboxGroup
+  React
 ) {
-  var FormFieldCheckbox = React.createClass({
+  const FormFieldCheckbox = React.createClass({
+    onValueChange: function(e) {
+      e.target.value = this.refs.checkbox.checked ? '1' : '';
+      return this.props.onValueChange(e);
+    },
     render: function() {
-      var selected_values = this.props.item[this.props.field.name] || '';
-      if(
-        selected_values !== undefined
-        && selected_values.constructor !== Array
-      ) {
-        selected_values = selected_values.split(';').map(function(value) {
-          return value.trim();
-        });
-      }
-      var count = Object.keys(this.props.field.values).length;
+      const isChecked = !!(this.props.item[this.props.field.name]);
 
-      var options = Object.keys(this.props.field.values).map(
+      const options = Object.keys(this.props.field.values).map(
         function(value, index) {
           return (
             <p key={ 'checkbox-' + index }>
               <label>
-                <input type="checkbox" value={ value } />
-                &nbsp;{ this.props.field.values[value] }
+                <input
+                  ref="checkbox"
+                  type="checkbox"
+                  value="1"
+                  checked={ isChecked }
+                  onChange={ this.onValueChange }
+                  name={ this.props.field.name }
+                />
+                { this.props.field.values[value] }
               </label>
             </p>
           );
@@ -33,30 +33,10 @@ function(
       );
 
       return (
-        <CheckboxGroup
-          name={ this.props.field.name }
-          value={ selected_values }
-          ref={ this.props.field.name }
-          onChange={ this.handleValueChange }>
+        <div>
           { options }
-        </CheckboxGroup>
+        </div>
       );
-    },
-    handleValueChange: function() {
-      var field = this.props.field.name;
-      var group = this.refs[field];
-      var selected_values = [];
-
-      if(group !== undefined) {
-        selected_values = group.getCheckedValues();
-      }
-
-      return this.props.onValueChange({
-        target: {
-          name: field,
-          value: selected_values.join(';')
-        }
-      });
     }
   });
 

assets/js/src/form/fields/date.jsx

@@ -0,0 +1,196 @@
+define([
+  'react',
+  'moment',
+], function(
+  React,
+  Moment
+) {
+  class FormFieldDateYear extends React.Component {
+    render() {
+      const yearsRange = 100;
+      const years = [];
+      const currentYear = Moment().year();
+      for (let i = currentYear; i >= currentYear - yearsRange; i--) {
+        years.push((
+          <option
+            key={ i }
+            value={ i }
+         >{ i }</option>
+        ));
+      }
+      return (
+        <select
+          name={ this.props.name + '[year]' }
+          value={ this.props.year }
+          onChange={ this.props.onValueChange }
+        >
+          { years }
+        </select>
+      );
+    }
+  }
+
+  class FormFieldDateMonth extends React.Component {
+    render() {
+      const months = [];
+      for (let i = 1; i <= 12; i++) {
+        months.push((
+          <option
+            key={ i }
+            value={ i }
+         >{ this.props.monthNames[i - 1] }</option>
+        ));
+      }
+      return (
+        <select
+          name={ this.props.name + '[month]' }
+          value={ this.props.month }
+          onChange={ this.props.onValueChange }
+        >
+          { months }
+        </select>
+      );
+    }
+  }
+
+  class FormFieldDateDay extends React.Component {
+    render() {
+      const days = [];
+      for (let i = 1; i <= 31; i++) {
+        days.push((
+          <option
+            key={ i }
+            value={ i }
+          >{ i }</option>
+        ));
+      }
+
+      return (
+        <select
+          name={ this.props.name + '[day]' }
+          value={ this.props.day }
+          onChange={ this.props.onValueChange }
+        >
+          { days }
+        </select>
+      );
+    }
+  }
+
+  class FormFieldDate extends React.Component {
+    constructor(props) {
+      super(props);
+      this.state = {
+        year: Moment().year(),
+        month: 1,
+        day: 1
+      }
+    }
+    componentDidMount() {
+    }
+    componentDidUpdate(prevProps, prevState) {
+      if (
+        (this.props.item !== undefined && prevProps.item !== undefined)
+        && (this.props.item.id !== prevProps.item.id)
+      ) {
+        this.extractTimeStamp();
+      }
+    }
+    extractTimeStamp() {
+      const timeStamp = parseInt(this.props.item[this.props.field.name], 10);
+
+      this.setState({
+        year: Moment.unix(timeStamp).year(),
+        // Moment returns the month as [0..11]
+        // We increment it to match PHP's mktime() which expects [1..12]
+        month: Moment.unix(timeStamp).month() + 1,
+        day: Moment.unix(timeStamp).date()
+      });
+    }
+    updateTimeStamp(field) {
+      let newTimeStamp = Moment(
+        `${this.state.month}/${this.state.day}/${this.state.year}`,
+        'M/D/YYYY'
+      ).valueOf();
+      if (!isNaN(newTimeStamp) && parseInt(newTimeStamp, 10) > 0) {
+        // convert milliseconds to seconds
+        newTimeStamp /= 1000;
+        return this.props.onValueChange({
+          target: {
+            name: field,
+            value: newTimeStamp
+          }
+        });
+      }
+    }
+    onValueChange(e) {
+      // extract property from name
+      const matches = e.target.name.match(/(.*?)\[(.*?)\]/);
+      let field = null;
+      let property = null;
+
+      if (matches !== null && matches.length === 3) {
+        field = matches[1];
+        property = matches[2];
+
+        let value = parseInt(e.target.value, 10);
+
+        this.setState({
+          [`${property}`]: value
+        }, () => {
+          this.updateTimeStamp(field);
+        });
+      }
+    }
+    render() {
+      const monthNames = window.mailpoet_month_names || [];
+
+      const dateType = this.props.field.params.date_type;
+
+      const dateSelects = dateType.split('_');
+
+      const fields = dateSelects.map(type => {
+        switch(type) {
+          case 'year':
+            return (<FormFieldDateYear
+              onValueChange={ this.onValueChange.bind(this) }
+              ref={ 'year' }
+              key={ 'year' }
+              name={ this.props.field.name }
+              year={ this.state.year }
+            />);
+          break;
+
+          case 'month':
+            return (<FormFieldDateMonth
+              onValueChange={ this.onValueChange.bind(this) }
+              ref={ 'month' }
+              key={ 'month' }
+              name={ this.props.field.name }
+              month={ this.state.month }
+              monthNames={ monthNames }
+            />);
+          break;
+
+          case 'day':
+            return (<FormFieldDateDay
+              onValueChange={ this.onValueChange.bind(this) }
+              ref={ 'day' }
+              key={ 'day' }
+              name={ this.props.field.name }
+              day={ this.state.day }
+            />);
+          break;
+        }
+       });
+
+      return (
+        <div>
+          {fields}
+        </div>
+      );
+    }
+  };
+
+  return FormFieldDate;
+});

assets/js/src/form/fields/field.jsx

@@ -5,7 +5,8 @@ define([
   'form/fields/select.jsx',
   'form/fields/radio.jsx',
   'form/fields/checkbox.jsx',
-  'form/fields/selection.jsx'
+  'form/fields/selection.jsx',
+  'form/fields/date.jsx',
 ],
 function(
   React,
@@ -14,7 +15,8 @@ function(
   FormFieldSelect,
   FormFieldRadio,
   FormFieldCheckbox,
-  FormFieldSelection
+  FormFieldSelection,
+  FormFieldDate
 ) {
   var FormField = React.createClass({
     renderField: function(data, inline = false) {
@@ -55,6 +57,10 @@ function(
         case 'selection':
           field = (<FormFieldSelection {...data} />);
         break;
+
+        case 'date':
+          field = (<FormFieldDate {...data} />);
+        break;
       }
 
       if(inline === true) {
@@ -66,10 +72,10 @@ function(
         );
       } else {
         return (
-          <p key={ 'field-' + (data.index || 0) }>
+          <div key={ 'field-' + (data.index || 0) }>
             { field }
             { description }
-          </p>
+          </div>
         );
       }
     },

assets/js/src/form/fields/radio.jsx

@@ -7,7 +7,6 @@ function(
   var FormFieldRadio = React.createClass({
     render: function() {
       var selected_value = this.props.item[this.props.field.name];
-      var count = Object.keys(this.props.field.values).length;
 
       var options = Object.keys(this.props.field.values).map(
         function(value, index) {
@@ -20,7 +19,7 @@ function(
                   value={ value }
                   onChange={ this.props.onValueChange }
                   name={ this.props.field.name } />
-                 { this.props.field.values[value] }
+                { this.props.field.values[value] }
               </label>
             </p>
           );

assets/js/src/form/fields/selection.jsx

@@ -120,7 +120,7 @@ function(
         <select
           id={ this.props.field.id || this.props.field.name }
           ref="select"
-          placeholder={ this.props.field.placeholder }
+          data-placeholder={ this.props.field.placeholder }
           multiple={ this.props.field.multiple }
           defaultValue={ default_value }
           {...this.props.field.validation}

assets/js/src/form/form.jsx

@@ -48,7 +48,7 @@ define(
         MailPoet.Ajax.post({
           endpoint: this.props.endpoint,
           action: 'get',
-          data: { id: id }
+          data: id
         }).done(function(response) {
           if(response === false) {
             this.setState({

assets/js/src/form_editor/form_editor.js

@@ -617,6 +617,28 @@ var WysijaForm = {
       // this is a url, so do not encode the protocol
       return encodeURI(str).replace(/[!'()*]/g, escape);
     }
+  },
+  updateBlock: function(field) {
+    var hasUpdated = false;
+    WysijaForm.getBlocks().each(function(b) {
+      if(b.block.getData().id === field.id) {
+        hasUpdated = true;
+        b.block.redraw(field);
+      }
+    });
+
+    return hasUpdated;
+  },
+  removeBlock: function(field, callback) {
+    var hasRemoved = false;
+    WysijaForm.getBlocks().each(function(b) {
+      if(b.block.getData().id === field.id) {
+        hasRemoved = true;
+        b.block.removeBlock(callback);
+      }
+    });
+
+    return hasRemoved;
   }
 };
 
@@ -825,10 +847,6 @@ WysijaForm.Block = Class.create({
     Effect.Fade(this.element.identify(), {
       duration: 0.2,
       afterFinish: function(effect) {
-        if(effect.element.next('.mailpoet_form_block') !== undefined && callback !== false) {
-          // show controls of next block to allow mass delete
-          WysijaForm.get(effect.element.next('.mailpoet_form_block')).block.showControls();
-        }
         // remove placeholder
         if(effect.element.previous('.block_placeholder') !== undefined) {
           effect.element.previous('.block_placeholder').remove();

assets/js/src/forms/list.jsx

@@ -125,8 +125,8 @@ const FormList = React.createClass({
       endpoint: 'forms',
       action: 'create'
     }).done(function(response) {
-      if(response !== false) {
-        window.location = response;
+      if(response.result && response.form_id) {
+        window.location = mailpoet_form_edit_url + response.form_id;
       }
     });
   },

assets/js/src/newsletter_editor/behaviors/DraggableBehavior.js

@@ -47,7 +47,6 @@ define([
         autoScroll: true,
 
         onstart: function(event) {
-          console.log('Drag start', event, this);
 
           if (that.options.cloneOriginal === true) {
             // Use substitution instead of a clone

assets/js/src/newsletter_editor/blocks/automatedLatestContent.js

@@ -11,10 +11,10 @@ define([
     'newsletter_editor/blocks/base',
     'newsletter_editor/blocks/button',
     'newsletter_editor/blocks/divider',
-    'newsletter_editor/components/wordpress',
+    'newsletter_editor/components/communication',
     'underscore',
     'jquery'
-  ], function(App, BaseBlock, ButtonBlock, DividerBlock, WordpressComponent, _, jQuery) {
+  ], function(App, BaseBlock, ButtonBlock, DividerBlock, CommunicationComponent, _, jQuery) {
 
   "use strict";
 
@@ -69,9 +69,9 @@ define([
     },
     fetchPosts: function() {
       var that = this;
-      WordpressComponent.getTransformedPosts(this.toJSON()).done(function(content) {
-        console.log('ALC fetched', arguments);
+      CommunicationComponent.getTransformedPosts(this.toJSON()).done(function(content) {
         that.get('_container').get('blocks').reset(content, {parse: true});
+        that.trigger('postsChanged');
       }).fail(function(error) {
         console.log('ALC fetchPosts error', arguments);
       });
@@ -100,6 +100,11 @@ define([
       toolsRegion: '.mailpoet_tools',
       postsRegion: '.mailpoet_automated_latest_content_block_posts',
     },
+    modelEvents: _.extend(
+      _.omit(base.BlockView.prototype.modelEvents, 'change'),
+      {
+        'postsChanged': 'render',
+      }),
     events: _.extend(base.BlockView.prototype.events, {
       'click .mailpoet_automated_latest_content_block_overlay': 'showSettings',
     }),
@@ -161,7 +166,7 @@ define([
       var that = this;
 
       // Dynamically update available post types
-      WordpressComponent.getPostTypes().done(_.bind(this._updateContentTypes, this));
+      CommunicationComponent.getPostTypes().done(_.bind(this._updateContentTypes, this));
 
       this.$('.mailpoet_automated_latest_content_categories_and_tags').select2({
         multiple: true,
@@ -174,10 +179,10 @@ define([
           },
           transport: function(options, success, failure) {
             var taxonomies,
-                promise = WordpressComponent.getTaxonomies(that.model.get('contentType')).then(function(tax) {
+                promise = CommunicationComponent.getTaxonomies(that.model.get('contentType')).then(function(tax) {
               taxonomies = tax;
               // Fetch available terms based on the list of taxonomies already fetched
-              var promise = WordpressComponent.getTerms({
+              var promise = CommunicationComponent.getTerms({
                 search: options.data.term,
                 taxonomies: _.keys(taxonomies)
               }).then(function(terms) {

assets/js/src/newsletter_editor/blocks/base.js

@@ -117,12 +117,9 @@ define([
      * Defines drop behavior of BlockView instance
      */
     getDropFunc: function() {
-      var that = this;
       return function() {
-        var newModel = that.model.clone();
-        //that.model.destroy();
-        return newModel;
-      };
+        return this.model.clone();
+      }.bind(this);
     },
     showBlock: function() {
       if (this._isFirstRender) {
@@ -131,25 +128,37 @@ define([
       }
     },
     deleteBlock: function() {
-      this.transitionOut().done(function() {
+      this.transitionOut().then(function() {
         this.model.destroy();
       }.bind(this));
     },
     transitionIn: function() {
-      return this._transition('mailpoet_block_transition_in');
+      return this._transition('slideDown', 'fadeIn', 'easeOut');
     },
     transitionOut: function() {
-      return this._transition('mailpoet_block_transition_out');
+      return this._transition('slideUp', 'fadeOut', 'easeIn');
     },
-    _transition: function(className) {
-      var that = this,
-          promise = jQuery.Deferred();
+    _transition: function(slideDirection, fadeDirection, easing) {
+      var promise = jQuery.Deferred();
+
+      this.$el.velocity(
+        slideDirection,
+        {
+          duration: 250,
+          easing: easing,
+          complete: function() {
+            promise.resolve();
+          }.bind(this),
+        }
+      ).velocity(
+        fadeDirection,
+        {
+          duration: 250,
+          easing: easing,
+          queue: false, // Do not enqueue, trigger animation in parallel
+        }
+      );
 
-      this.$el.addClass(className);
-      this.$el.one('webkitAnimationEnd mozAnimationEnd MSAnimationEnd animationend', function() {
-        that.$el.removeClass(className);
-        promise.resolve();
-      });
       return promise;
     },
   });
@@ -207,16 +216,14 @@ define([
   Module.BlockSettingsView = Marionette.LayoutView.extend({
     className: 'mailpoet_editor_settings',
     initialize: function() {
-      var that = this;
-
       MailPoet.Modal.panel({
         element: this.$el,
         template: '',
         position: 'right',
         width: App.getConfig().get('sidepanelWidth'),
         onCancel: function() {
-          that.destroy();
-        },
+          this.destroy();
+        }.bind(this),
       });
     },
     close: function(event) {

assets/js/src/newsletter_editor/blocks/container.js

@@ -232,12 +232,9 @@ define([
       _.extend(this, this._buildRegions(this.regions));
     },
     getDropFunc: function() {
-      var that = this;
       return function() {
-        var newModel = that.model.clone();
-        that.model.destroy();
-        return newModel;
-      };
+        return this.model.clone();
+      }.bind(this);
     },
     showBlock: function() {
       if (this._isFirstRender) {
@@ -251,20 +248,32 @@ define([
       }.bind(this));
     },
     transitionIn: function() {
-      return this._transition('mailpoet_block_transition_in');
+      return this._transition('slideDown', 'fadeIn', 'easeIn');
     },
     transitionOut: function() {
-      return this._transition('mailpoet_block_transition_out');
+      return this._transition('slideUp', 'fadeOut', 'easeOut');
     },
-    _transition: function(className) {
-      var that = this,
-          promise = jQuery.Deferred();
+    _transition: function(slideDirection, fadeDirection, easing) {
+      var promise = jQuery.Deferred();
+
+      this.$el.velocity(
+        slideDirection,
+        {
+          duration: 250,
+          easing: easing,
+          complete: function() {
+            promise.resolve();
+          }.bind(this),
+        }
+      ).velocity(
+        fadeDirection,
+        {
+          duration: 250,
+          easing: easing,
+          queue: false, // Do not enqueue, trigger animation in parallel
+        }
+      );
 
-      this.$el.addClass(className);
-      this.$el.one('webkitAnimationEnd mozAnimationEnd MSAnimationEnd animationend', function() {
-        that.$el.removeClass(className);
-        promise.resolve();
-      });
       return promise;
     },
   });

assets/js/src/newsletter_editor/blocks/divider.js

@@ -57,11 +57,9 @@ define([
       this.listenTo(this.model, 'change:styles.block.padding', this.changePadding);
     },
     templateHelpers: function() {
-      return {
-        model: this.model.toJSON(),
-        viewCid: this.cid,
+      return _.extend({
         totalHeight: parseInt(this.model.get('styles.block.padding'), 10)*2 + parseInt(this.model.get('styles.block.borderWidth')) + 'px',
-      };
+      }, base.BlockView.prototype.templateHelpers.apply(this));
     },
     onRender: function() {
       this.toolsView = new Module.DividerBlockToolsView({ model: this.model });

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

@@ -39,9 +39,9 @@ define([
   Module.FooterBlockView = base.BlockView.extend({
     className: "mailpoet_block mailpoet_footer_block mailpoet_droppable_block",
     getTemplate: function() { return templates.footerBlock; },
-    modelEvents: {
+    modelEvents: _.extend({
       'change:styles.block.backgroundColor change:styles.text.fontColor change:styles.text.fontFamily change:styles.text.fontSize change:styles.text.textAlign change:styles.link.fontColor change:styles.link.textDecoration': 'render',
-    },
+    }, base.BlockView.prototype.modelEvents),
     onDragSubstituteBy: function() { return Module.FooterWidgetView; },
     onRender: function() {
       this.toolsView = new Module.FooterBlockToolsView({ model: this.model });

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

@@ -39,9 +39,9 @@ define([
   Module.HeaderBlockView = base.BlockView.extend({
     className: "mailpoet_block mailpoet_header_block mailpoet_droppable_block",
     getTemplate: function() { return templates.headerBlock; },
-    modelEvents: {
+    modelEvents: _.extend({
       'change:styles.block.backgroundColor change:styles.text.fontColor change:styles.text.fontFamily change:styles.text.fontSize change:styles.text.textAlign change:styles.link.fontColor change:styles.link.textDecoration': 'render',
-    },
+    }, base.BlockView.prototype.modelEvents),
     onDragSubstituteBy: function() { return Module.HeaderWidgetView; },
     onRender: function() {
       this.toolsView = new Module.HeaderBlockToolsView({ model: this.model });

assets/js/src/newsletter_editor/blocks/image.js

@@ -37,11 +37,9 @@ define([
     getTemplate: function() { return templates.imageBlock; },
     onDragSubstituteBy: function() { return Module.ImageWidgetView; },
     templateHelpers: function() {
-      return {
-        model: this.model.toJSON(),
-        viewCid: this.cid,
+      return _.extend({
         imageMissingSrc: App.getConfig().get('urls.imageMissing'),
-      };
+      }, base.BlockView.prototype.templateHelpers.apply(this));
     },
     onRender: function() {
       this.toolsView = new Module.ImageBlockToolsView({ model: this.model });

assets/js/src/newsletter_editor/blocks/posts.js

@@ -18,12 +18,12 @@ define([
     'jquery',
     'mailpoet',
     'newsletter_editor/App',
-    'newsletter_editor/components/wordpress',
+    'newsletter_editor/components/communication',
     'newsletter_editor/blocks/base',
     'newsletter_editor/blocks/button',
     'newsletter_editor/blocks/divider',
     'select2'
-  ], function(Backbone, Marionette, Radio, _, jQuery, MailPoet, App, WordpressComponent, BaseBlock, ButtonBlock, DividerBlock) {
+  ], function(Backbone, Marionette, Radio, _, jQuery, MailPoet, App, CommunicationComponent, BaseBlock, ButtonBlock, DividerBlock) {
 
   "use strict";
 
@@ -96,8 +96,7 @@ define([
     },
     fetchAvailablePosts: function() {
       var that = this;
-      WordpressComponent.getPosts(this.toJSON()).done(function(posts) {
-        console.log('Posts fetched', arguments);
+      CommunicationComponent.getPosts(this.toJSON()).done(function(posts) {
         that.get('_availablePosts').reset(posts);
         that.get('_selectedPosts').reset(); // Empty out the collection
         that.trigger('change:_availablePosts');
@@ -116,8 +115,7 @@ define([
         return;
       }
 
-      WordpressComponent.getTransformedPosts(data).done(function(posts) {
-        console.log('Transformed posts fetched', arguments);
+      CommunicationComponent.getTransformedPosts(data).done(function(posts) {
         that.get('_transformedPosts').get('blocks').reset(posts, {parse: true});
       }).fail(function() {
         console.log('Posts _refreshTransformedPosts error', arguments);
@@ -133,8 +131,7 @@ define([
 
       if (data.posts.length === 0) return;
 
-      WordpressComponent.getTransformedPosts(data).done(function(posts) {
-        console.log('Available posts fetched', arguments);
+      CommunicationComponent.getTransformedPosts(data).done(function(posts) {
         collection.add(posts, { at: index });
       }).fail(function() {
         console.log('Posts fetchPosts error', arguments);
@@ -145,13 +142,14 @@ define([
   Module.PostsBlockView = base.BlockView.extend({
     className: "mailpoet_block mailpoet_posts_block mailpoet_droppable_block",
     getTemplate: function() { return templates.postsBlock; },
-    modelEvents: {},
+    modelEvents: {}, // Forcefully disable all events
     regions: _.extend({
       postsRegion: '.mailpoet_posts_block_posts',
     }, base.BlockView.prototype.regions),
     onDragSubstituteBy: function() { return Module.PostsWidgetView; },
     initialize: function() {
       base.BlockView.prototype.initialize.apply(this, arguments);
+
       this.toolsView = new Module.PostsBlockToolsView({ model: this.model });
       this.model.reply('blockView', this.notifyAboutSelf, this);
     },
@@ -271,7 +269,7 @@ define([
       var that = this;
 
       // Dynamically update available post types
-      WordpressComponent.getPostTypes().done(_.bind(this._updateContentTypes, this));
+      CommunicationComponent.getPostTypes().done(_.bind(this._updateContentTypes, this));
 
       this.$('.mailpoet_posts_categories_and_tags').select2({
         multiple: true,
@@ -284,10 +282,10 @@ define([
           },
           transport: function(options, success, failure) {
             var taxonomies,
-                promise = WordpressComponent.getTaxonomies(that.model.get('contentType')).then(function(tax) {
+                promise = CommunicationComponent.getTaxonomies(that.model.get('contentType')).then(function(tax) {
               taxonomies = tax;
               // Fetch available terms based on the list of taxonomies already fetched
-              var promise = WordpressComponent.getTerms({
+              var promise = CommunicationComponent.getTerms({
                 search: options.data.term,
                 taxonomies: _.keys(taxonomies)
               }).then(function(terms) {

assets/js/src/newsletter_editor/blocks/social.js

@@ -175,12 +175,9 @@ define([
       _event.stopPropagation();
     },
     getDropFunc: function() {
-      var that = this;
       return function() {
-        var newModel = that.model.clone();
-        //that.model.destroy();
-        return newModel;
-      };
+        return this.model.clone();
+      }.bind(this);
     },
     _buildRegions: function(regions) {
       var that = this;
@@ -211,20 +208,32 @@ define([
       }.bind(this));
     },
     transitionIn: function() {
-      return this._transition('mailpoet_block_transition_in');
+      return this._transition('slideDown', 'fadeIn', 'easeIn');
     },
     transitionOut: function() {
-      return this._transition('mailpoet_block_transition_out');
+      return this._transition('slideUp', 'fadeOut', 'easeOut');
     },
-    _transition: function(className) {
-      var that = this,
-          promise = jQuery.Deferred();
+    _transition: function(slideDirection, fadeDirection, easing) {
+      var promise = jQuery.Deferred();
+
+      this.$el.velocity(
+        slideDirection,
+        {
+          duration: 250,
+          easing: easing,
+          complete: function() {
+            promise.resolve();
+          }.bind(this),
+        }
+      ).velocity(
+        fadeDirection,
+        {
+          duration: 250,
+          easing: easing,
+          queue: false, // Do not enqueue, trigger animation in parallel
+        }
+      );
 
-      this.$el.addClass(className);
-      this.$el.one('webkitAnimationEnd mozAnimationEnd MSAnimationEnd animationend', function() {
-        that.$el.removeClass(className);
-        promise.resolve();
-      });
       return promise;
     },
   });

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

@@ -26,6 +26,8 @@ define([
     getTemplate: function() { return templates.textBlock; },
     modelEvents: _.omit(base.BlockView.prototype.modelEvents, 'change'), // Prevent rerendering on model change due to text editor redrawing
     initialize: function(options) {
+      base.BlockView.prototype.initialize.apply(this, arguments);
+
       this.renderOptions = _.defaults(options.renderOptions || {}, {
         disableTextEditor: false,
       });

assets/js/src/newsletter_editor/components/communication.js

@@ -9,7 +9,7 @@ define([
 
   Module._query = function(args) {
     return MailPoet.Ajax.post({
-      endpoint: 'wordpress',
+      endpoint: 'automatedLatestContent',
       action: args.action,
       data: args.options || {},
     });
@@ -63,16 +63,18 @@ define([
   };
 
   Module.saveNewsletter = function(options) {
-    return Module._query({
+    return MailPoet.Ajax.post({
+      endpoint: 'newsletters',
       action: 'save',
-      options: options,
+      data: options || {},
     });
   };
 
   Module.previewNewsletter = function(options) {
-    return Module._query({
-      action: 'preview',
-      options: options,
+    return MailPoet.Ajax.post({
+      endpoint: 'newsletters',
+      action: 'sendPreview',
+      data: options || {},
     });
   };
 

assets/js/src/newsletter_editor/components/content.js

@@ -11,7 +11,7 @@ define([
   // Does not hold newsletter content nor newsletter styles, those are
   // handled by other components.
   Module.NewsletterModel = SuperModel.extend({
-    stale: ['body'],
+    stale: ['body', 'created_at', 'deleted_at', 'updated_at'],
     initialize: function(options) {
       this.on('change', function() {
           App.getChannel().trigger('autoSave');
@@ -44,10 +44,10 @@ define([
   };
 
   Module.getBody = function() {
-    return JSON.stringify({
+    return {
       content: App._contentContainer.toJSON(),
       globalStyles: App.getGlobalStyles().toJSON(),
-    });
+    };
   };
 
   Module.toJSON = function() {
@@ -73,8 +73,7 @@ define([
   });
 
   App.on('start', function(options) {
-    // TODO: Other newsletter information will be needed as well.
-    var body = JSON.parse(options.newsletter.body);
+    var body = options.newsletter.body;
     App._contentContainer = new (App.getBlockTypeModel('container'))(body.content, {parse: true});
     App._contentContainerView = new (App.getBlockTypeView('container'))({
       model: App._contentContainer,

assets/js/src/newsletter_editor/components/save.js

@@ -1,5 +1,6 @@
 define([
     'newsletter_editor/App',
+    'newsletter_editor/components/communication',
     'mailpoet',
     'notice',
     'backbone',
@@ -8,7 +9,18 @@ define([
     'blob',
     'filesaver',
     'html2canvas'
-  ], function(App, MailPoet, Notice, Backbone, Marionette, jQuery, Blob, FileSaver, html2canvas) {
+  ], function(
+    App,
+    CommunicationComponent,
+    MailPoet,
+    Notice,
+    Backbone,
+    Marionette,
+    jQuery,
+    Blob,
+    FileSaver,
+    html2canvas
+  ) {
 
   "use strict";
 
@@ -17,26 +29,33 @@ define([
 
   // Save editor contents to server
   Module.save = function() {
-    App.getChannel().trigger('beforeEditorSave');
 
     var json = App.toJSON();
 
+    // Stringify to enable transmission of primitive non-string value types
+    if (!_.isUndefined(json.body)) {
+      json.body = JSON.stringify(json.body);
+    }
+
+    App.getChannel().trigger('beforeEditorSave', json);
+
     // save newsletter
-    MailPoet.Ajax.post({
-      endpoint: 'newsletters',
-      action: 'save',
-      data: json,
-    }).done(function(response) {
+    CommunicationComponent.saveNewsletter(json).done(function(response) {
       if(response.success !== undefined && response.success === true) {
         // TODO: Handle translations
         //MailPoet.Notice.success("<?php _e('Newsletter has been saved.'); ?>");
       } else if(response.error !== undefined) {
         if(response.error.length === 0) {
           // TODO: Handle translations
-          MailPoet.Notice.error("<?php _e('An unknown error occurred, please check your settings.'); ?>");
+          MailPoet.Notice.error(
+            "An unknown error occurred, please check your settings.",
+            {
+              scroll: true,
+            }
+          );
         } else {
           $(response.error).each(function(i, error) {
-            MailPoet.Notice.error(error);
+            MailPoet.Notice.error(error, { scroll: true });
           });
         }
       }
@@ -58,7 +77,7 @@ define([
     promise.then(function(thumbnail) {
       var data = _.extend(options || {}, {
         thumbnail: thumbnail.toDataURL('image/jpeg'),
-        body: App.getBody(),
+        body: JSON.stringify(App.getBody()),
       });
 
       return MailPoet.Ajax.post({
@@ -154,6 +173,7 @@ define([
           App.getConfig().get('translations.templateNameMissing'),
           {
             positionAfter: that.$el,
+            scroll: true,
           }
         );
       } else if (templateDescription === '') {
@@ -161,6 +181,7 @@ define([
           App.getConfig().get('translations.templateDescriptionMissing'),
           {
             positionAfter: that.$el,
+            scroll: true,
           }
         );
       } else {
@@ -174,6 +195,7 @@ define([
             App.getConfig().get('translations.templateSaved'),
             {
               positionAfter: that.$el,
+              scroll: true,
             }
           );
         }).fail(function() {
@@ -182,6 +204,7 @@ define([
             App.getConfig().get('translations.templateSaveFailed'),
             {
               positionAfter: that.$el,
+              scroll: true,
             }
           );
         });
@@ -206,6 +229,7 @@ define([
           App.getConfig().get('translations.templateNameMissing'),
           {
             positionAfter: that.$el,
+            scroll: true,
           }
         );
       } else if (templateDescription === '') {
@@ -213,6 +237,7 @@ define([
           App.getConfig().get('translations.templateDescriptionMissing'),
           {
             positionAfter: that.$el,
+            scroll: true,
           }
         );
       } else {

assets/js/src/newsletter_editor/components/sidebar.js

@@ -1,12 +1,13 @@
 define([
     'newsletter_editor/App',
+    'newsletter_editor/components/communication',
     'backbone',
     'backbone.marionette',
     'backbone.supermodel',
     'underscore',
     'jquery',
     'sticky-kit'
-  ], function(App, Backbone, Marionette, SuperModel, _, jQuery, StickyKit) {
+  ], function(App, CommunicationComponent, Backbone, Marionette, SuperModel, _, jQuery, StickyKit) {
 
   "use strict";
 
@@ -50,8 +51,33 @@ define([
     },
     events: {
       'click .mailpoet_sidebar_region h3, .mailpoet_sidebar_region .handlediv': function(event) {
-        this.$el.find('.mailpoet_sidebar_region').addClass('closed');
-        this.$el.find(event.target).parent().parent().removeClass('closed');
+        var $openRegion = this.$el.find('.mailpoet_sidebar_region:not(.closed)'),
+          $targetRegion = this.$el.find(event.target).closest('.mailpoet_sidebar_region');
+
+        if ($openRegion.get(0) === $targetRegion.get(0)) {
+          return;
+        }
+
+        $openRegion.find('.mailpoet_region_content').velocity(
+          'slideUp',
+          {
+            duration: 250,
+            easing: "easeOut",
+            complete: function() {
+              $openRegion.addClass('closed');
+            }.bind(this)
+          }
+        );
+        $targetRegion.find('.mailpoet_region_content').velocity(
+          'slideDown',
+          {
+            duration: 250,
+            easing: "easeIn",
+            complete: function() {
+              $targetRegion.removeClass('closed');
+            },
+          }
+        );
       },
     },
     initialize: function(options) {
@@ -90,7 +116,6 @@ define([
       });
     },
     onDomRefresh: function() {
-      var that = this;
       this.$el.parent().stick_in_parent({
         offset_top: 32,
       });
@@ -169,10 +194,8 @@ define([
     },
     initialize: function(options) {
       this.availableStyles = options.availableStyles;
-      var that = this;
     },
     onRender: function() {
-      var that = this;
       this.$('.mailpoet_color').spectrum({
         clickoutFiresChange: true,
         showInput: true,
@@ -219,26 +242,29 @@ define([
       console.log('trying to send a preview');
       // get form data
       var data = {
-        from_name: this.$('#mailpoet_preview_from_name').val(),
-        from_email: this.$('#mailpoet_preview_from_email').val(),
-        to_email: this.$('#mailpoet_preview_to_email').val(),
-        newsletter: App.newsletterId,
+        subscriber: this.$('#mailpoet_preview_to_email').val(),
+        id: App.getNewsletter().get('id'),
       };
 
       // send test email
       MailPoet.Modal.loading(true);
 
-      // TODO: Migrate logic to new AJAX format
-      Wordpress.previewNewsletter(data).done(function(response) {
-        if(response.success !== undefined && response.success === true) {
-          MailPoet.Notice.success(App.getConfig().get('translations.testEmailSent'));
-        } else if(response.error !== undefined) {
-          if(response.error.length === 0) {
-            MailPoet.Notice.error(App.getConfig().get('translations.unknownErrorOccurred'));
-          } else {
-            $(response.error).each(function(i, error) {
-              MailPoet.Notice.error(error);
+      CommunicationComponent.previewNewsletter(data).done(function(response) {
+        if(response.result !== undefined && response.result === true) {
+          MailPoet.Notice.success(App.getConfig().get('translations.newsletterPreviewSent'), { scroll: true });
+        } else {
+          if (_.isArray(response.errors)) {
+            response.errors.map(function(error) {
+              MailPoet.Notice.error(error, { scroll: true });
             });
+          } else {
+            MailPoet.Notice.error(
+              App.getConfig().get('translations.newsletterPreviewFailedToSend'),
+              {
+                scroll: true,
+                static: true,
+              }
+            );
           }
         }
         MailPoet.Modal.loading(false);

assets/js/src/newsletter_editor/components/styles.js

@@ -17,7 +17,7 @@ define([
       },
       h1: {
         fontColor: '#111111',
-        fontFamily: 'Arial Black',
+        fontFamily: 'Arial',
         fontSize: '40px'
       },
       h2: {
@@ -72,7 +72,7 @@ define([
 
     App.getAvailableStyles = Module.getAvailableStyles;
 
-    var body = JSON.parse(options.newsletter.body);
+    var body = options.newsletter.body;
     this.setGlobalStyles(body.globalStyles);
   });
 

assets/js/src/newsletters/send.jsx

@@ -16,7 +16,7 @@ define(
     Breadcrumb
   ) {
 
-    var settings = window.mailpoet_settings || {};
+    var settings = window.mailpoet_settings || {};
 
     var fields = [
       {
@@ -24,14 +24,17 @@ define(
         label: 'Subject line',
         tip: "Be creative! It's the first thing your subscribers see."+
              "Tempt them to open your email.",
-        type: 'text'
+        type: 'text',
+        validation: {
+          'data-parsley-required': true
+        }
       },
       {
         name: 'segments',
-        label: 'Lists',
-        tip: "The subscriber list that will be used for this campaign.",
+        label: 'Segments',
+        tip: "The subscriber segment that will be used for this campaign.",
         type: 'selection',
-        placeholder: "Select a list",
+        placeholder: "Select a segment",
         id: "mailpoet_segments",
         endpoint: "segments",
         multiple: true,
@@ -111,12 +114,19 @@ define(
             action: 'add',
             data: {
               newsletter_id: this.props.params.id,
-              segments: jQuery('#mailpoet_segments').val()
+              segments: jQuery('#mailpoet_segments').val(),
+              sender: {
+                'name': jQuery('#mailpoet_newsletter [name="sender_name"]').val(),
+                'address': jQuery('#mailpoet_newsletter [name="sender_address"]').val()
+              },
+              reply_to: {
+                'name': jQuery('#mailpoet_newsletter [name="reply_to_name"]').val(),
+                'address': jQuery('#mailpoet_newsletter [name="reply_to_address"]').val()
+              }
             }
           }).done(function(response) {
             if(response.result === true) {
               this.history.pushState(null, '/');
-
               MailPoet.Notice.success(
                 'The newsletter is being sent...'
               );
@@ -135,14 +145,6 @@ define(
           }.bind(this));
         }
       },
-      componentDidMount: function() {
-        if(this.isMounted()) {
-          jQuery('#mailpoet_newsletter').parsley();
-        }
-      },
-      isValid: function() {
-        return (jQuery('#mailpoet_newsletter').parsley().validate());
-      },
       render: function() {
         return (
           <div>
@@ -156,8 +158,7 @@ define(
               fields={ fields }
               params={ this.props.params }
               messages={ messages }
-              isValid={ this.isValid }>
-
+            >
               <p className="submit">
                 <input
                   className="button button-primary"

assets/js/src/newsletters/templates.jsx

@@ -18,12 +18,18 @@ define(
 
     var ImportTemplate = React.createClass({
       saveTemplate: function(template) {
+
+        // Stringify to enable transmission of primitive non-string value types
+        if (!_.isUndefined(template.body)) {
+          template.body = JSON.stringify(template.body);
+        }
+
         MailPoet.Ajax.post({
           endpoint: 'newsletterTemplates',
           action: 'save',
           data: template
         }).done(function(response) {
-          if(response === true) {
+          if(response.result === true) {
             this.props.onImport(template);
           } else {
             response.map(function(error) {
@@ -111,12 +117,19 @@ define(
         }.bind(this));
       },
       handleSelectTemplate: function(template) {
+        var body = template.body;
+
+        // Stringify to enable transmission of primitive non-string value types
+        if (!_.isUndefined(body)) {
+          body = JSON.stringify(body);
+        }
+
         MailPoet.Ajax.post({
           endpoint: 'newsletters',
           action: 'save',
           data: {
             id: this.props.params.id,
-            body: template.body
+            body: body
           }
         }).done(function(response) {
           if(response.result === true) {
@@ -153,7 +166,7 @@ define(
       handleShowTemplate: function(template) {
         MailPoet.Modal.popup({
           title: template.name,
-          template: '<img src="{{ thumbnail }}" />',
+          template: '<div class="mailpoet_boxes_preview" style="background-color: {{ body.globalStyles.body.backgroundColor }}"><img src="{{ thumbnail }}" /></div>',
           data: template,
         });
       },

assets/js/src/newsletters/types.jsx

@@ -29,12 +29,14 @@ define(
             subject: 'Draft newsletter',
           }
         }).done(function(response) {
-          if(response.id !== undefined) {
-            this.history.pushState(null, `/template/${response.id}`);
+          if(response.result && response.newsletter.id) {
+            this.history.pushState(null, `/template/${response.newsletter.id}`);
           } else {
-            response.map(function(error) {
-              MailPoet.Notice.error(error);
-            });
+            if(response.errors.length > 0) {
+              response.errors.map(function(error) {
+                MailPoet.Notice.error(error);
+              });
+            }
           }
         }.bind(this));
       },

assets/js/src/newsletters/types/notification.jsx

@@ -138,12 +138,14 @@ define(
             options: this.state,
           },
         }).done(function(response) {
-          if(response.id !== undefined) {
-            this.showTemplateSelection(response.id);
+          if(response.result && response.newsletter.id) {
+            this.showTemplateSelection(response.newsletter.id);
           } else {
-            response.map(function(error) {
-              MailPoet.Notice.error(error);
-            });
+            if(response.errors.length > 0) {
+              response.errors.map(function(error) {
+                MailPoet.Notice.error(error);
+              });
+            }
           }
         }.bind(this));
       },

assets/js/src/newsletters/types/standard.jsx

@@ -32,12 +32,15 @@ define(
             type: 'standard',
           }
         }).done(function(response) {
-          if(response.id !== undefined) {
-            this.showTemplateSelection(response.id);
+          console.log(response);
+          if(response.result && response.newsletter.id) {
+            this.showTemplateSelection(response.newsletter.id);
           } else {
-            response.map(function(error) {
-              MailPoet.Notice.error(error);
-            });
+            if(response.errors.length > 0) {
+              response.errors.map(function(error) {
+                MailPoet.Notice.error(error);
+              });
+            }
           }
         }.bind(this));
       },

assets/js/src/newsletters/types/welcome.jsx

@@ -111,12 +111,14 @@ define(
             options: this.state,
           },
         }).done(function(response) {
-          if(response.id !== undefined) {
-            this.showTemplateSelection(response.id);
+          if(response.result && response.newsletter.id) {
+            this.showTemplateSelection(response.newsletter.id);
           } else {
-            response.map(function(error) {
-              MailPoet.Notice.error(error);
-            });
+            if(response.errors.length > 0) {
+              response.errors.map(function(error) {
+                MailPoet.Notice.error(error);
+              });
+            }
           }
         }.bind(this));
       },

assets/js/src/notice.js

@@ -1,75 +1,75 @@
-define('notice', ['mailpoet', 'jquery'], function(MailPoet, jQuery) {
-  "use strict";
-  /*==================================================================================================
-
-      MailPoet Notice:
-
-          description: Handles notices
-          version: 0.2
-          author: Jonathan Labreuille
-          company: Wysija
-          dependencies: jQuery
-
-      Usage:
-
-      // success message (static: false)
-          MailPoet.Notice.success('Yatta!');
-
-          // error message (static: false)
-          MailPoet.Notice.error('Boo!');
-
-          // system message (static: true)
-          MailPoet.Notice.system('You need to updated ASAP!');
-
-      Examples:
-
-          MailPoet.Notice.success('-  success #1 -');
-          setTimeout(function() {
-              MailPoet.Notice.success('-  success #2 -');
-              setTimeout(function() {
-                  MailPoet.Notice.error('-  error -');
-                  setTimeout(function() {
-                      MailPoet.Notice.system('- system -');
-
-                      setTimeout(function() {
-                          MailPoet.Notice.hide();
-                      }, 2500);
-                  }, 300);
-              }, 400);
-          }, 500);
-
-  ==================================================================================================*/
-
-  MailPoet.Notice = {
-      version: 0.2,
-      // default options
-      defaults: {
-          type: 'success',
-          message: '',
-          static: false,
-          hideClose: false,
-          id: null,
+define('notice', ['mailpoet', 'jquery'], function(MailPoet, jQuery) {
+  "use strict";
+  /*==================================================================================================
+
+      MailPoet Notice:
+
+          description: Handles notices
+          version: 0.2
+          author: Jonathan Labreuille
+          company: Wysija
+          dependencies: jQuery
+
+      Usage:
+
+      // success message (static: false)
+          MailPoet.Notice.success('Yatta!');
+
+          // error message (static: false)
+          MailPoet.Notice.error('Boo!');
+
+          // system message (static: true)
+          MailPoet.Notice.system('You need to updated ASAP!');
+
+      Examples:
+
+          MailPoet.Notice.success('-  success #1 -');
+          setTimeout(function() {
+              MailPoet.Notice.success('-  success #2 -');
+              setTimeout(function() {
+                  MailPoet.Notice.error('-  error -');
+                  setTimeout(function() {
+                      MailPoet.Notice.system('- system -');
+
+                      setTimeout(function() {
+                          MailPoet.Notice.hide();
+                      }, 2500);
+                  }, 300);
+              }, 400);
+          }, 500);
+
+  ==================================================================================================*/
+
+  MailPoet.Notice = {
+      version: 0.2,
+      // default options
+      defaults: {
+          type: 'success',
+          message: '',
+          static: false,
+          hideClose: false,
+          id: null,
           positionAfter: false,
-          scroll: false,
-          timeout: 2000,
-          onOpen: null,
-          onClose: null
-      },
-      options: {},
-      init: function(options) {
-          // set options
-          this.options = jQuery.extend({}, this.defaults, options);
-
-          // clone element
-          this.element = jQuery('#mailpoet_notice_'+this.options.type).clone();
-
-          // add data-id to the element
-          if (this.options.id) this.element.attr('data-id', 'notice_' + this.options.id);
-
-          // remove id from clone
-          this.element.removeAttr('id');
-
-          // insert notice after its parent
+          scroll: false,
+          timeout: 2000,
+          onOpen: null,
+          onClose: null
+      },
+      options: {},
+      init: function(options) {
+          // set options
+          this.options = jQuery.extend({}, this.defaults, options);
+
+          // clone element
+          this.element = jQuery('#mailpoet_notice_'+this.options.type).clone();
+
+          // add data-id to the element
+          if (this.options.id) this.element.attr('data-id', 'notice_' + this.options.id);
+
+          // remove id from clone
+          this.element.removeAttr('id');
+
+          // insert notice after its parent
           var positionAfter;
           if (typeof this.options.positionAfter === 'object') {
             positionAfter = this.options.positionAfter;
@@ -78,136 +78,135 @@ define('notice', ['mailpoet', 'jquery'], function(MailPoet, jQuery) {
           } else {
             positionAfter = jQuery('#mailpoet_notice_'+this.options.type);
           }
-          console.log('positionAfter', typeof this.options.positionAfter);
-          positionAfter.after(this.element);
-
-          // setup onClose callback
-          var onClose = null;
-          if(this.options.onClose !== null) {
-              onClose = this.options.onClose;
-          }
-
-          // listen to remove event
-          jQuery(this.element).on('close', function() {
-              jQuery(this).fadeOut(200, function() {
-                  // on close callback
-                  if(onClose !== null) {
-                      onClose();
-                  }
-                  // remove notice
-                  jQuery(this).remove();
-              });
-          }.bind(this.element));
-
-          // listen to message event
-          jQuery(this.element).on('message', function(e, message) {
-              MailPoet.Notice.setMessage(message);
-          }.bind(this.element));
-
-          return this;
-      },
-      isHTML: function(str) {
-          var a = document.createElement('div');
-          a.innerHTML = str;
-          for(var c = a.childNodes, i = c.length; i--;) {
-              if(c[i].nodeType == 1) return true;
-          }
-          return false;
-      },
-      setMessage: function(message) {
-          // if it's not an html message, let's sugar coat the message with a fancy <p>
-          if(this.isHTML(message) === false) {
-              message = '<p>'+message+'</p>';
-          }
-          // set message
-          return this.element.html(message);
-      },
-      show: function(options) {
-        // initialize
-        this.init(options);
-
-          // show notice
-          this.showNotice();
-
-          // return this;
-      },
-      showNotice: function() {
-          // set message
-          this.setMessage(this.options.message);
-
-          // position notice
-          this.element.insertAfter(jQuery('h2.title'));
-
-          // set class name
-          switch(this.options.type) {
-            case 'success':
-              this.element.addClass('updated');
-            break;
-            case 'system':
-              this.element.addClass('update-nag');
-            break;
-            case 'error':
-              this.element.addClass('error');
-            break;
-          }
-
-          // make the notice appear
-          this.element.fadeIn(200);
-
-          // if scroll option is enabled, scroll to the notice
-          if(this.options.scroll === true) {
-              this.element.get(0).scrollIntoView(false);
-          }
-
-          // if the notice is not static, it has to disappear after a timeout
-          if(this.options.static === false) {
-              this.element.delay(this.options.timeout).trigger('close');
-          } else if (this.options.hideClose === false) {
-              this.element.append('<a href="javascript:;" class="mailpoet_notice_close"><span class="dashicons dashicons-dismiss"></span></a>');
-              this.element.find('.mailpoet_notice_close').on('click', function() {
-                  jQuery(this).trigger('close');
-              });
-          }
-
-          // call onOpen callback
-          if(this.options.onOpen !== null) {
-              this.options.onOpen(this.element);
-          }
-      },
-      hide: function(all) {
-          if(all !== undefined && all === true) {
-              jQuery('.mailpoet_notice:not([id])').trigger('close');
-          } else if (all !== undefined && jQuery.isArray(all)) {
-              for (var id in all) {
-                  jQuery('[data-id="notice_' + all[id] + '"]')
-                   .trigger('close');
-              }
-          } if (all !== undefined) {
-              jQuery('[data-id="notice_' + all + '"]')
-               .trigger('close');
-          } else {
-              jQuery('.mailpoet_notice.updated:not([id]), .mailpoet_notice.error:not([id])')
-              .trigger('close');
-          }
-      },
-      error: function(message, options) {
-        this.show(jQuery.extend({}, {
-              type: 'error',
-              message: '<p>'+message+'</p>'
-          }, options));
-      },
-      success: function(message, options) {
-          this.show(jQuery.extend({}, {
-              type: 'success',
-              message: '<p>'+message+'</p>'
-          }, options));
-      },
-      system: function(message, options) {
-          this.show(jQuery.extend({}, {
-              type: 'system',
-              static: true,
-              message: message
-          }, options));
-      }
-  };
+          positionAfter.after(this.element);
+
+          // setup onClose callback
+          var onClose = null;
+          if(this.options.onClose !== null) {
+              onClose = this.options.onClose;
+          }
+
+          // listen to remove event
+          jQuery(this.element).on('close', function() {
+              jQuery(this).fadeOut(200, function() {
+                  // on close callback
+                  if(onClose !== null) {
+                      onClose();
+                  }
+                  // remove notice
+                  jQuery(this).remove();
+              });
+          }.bind(this.element));
+
+          // listen to message event
+          jQuery(this.element).on('message', function(e, message) {
+              MailPoet.Notice.setMessage(message);
+          }.bind(this.element));
+
+          return this;
+      },
+      isHTML: function(str) {
+          var a = document.createElement('div');
+          a.innerHTML = str;
+          for(var c = a.childNodes, i = c.length; i--;) {
+              if(c[i].nodeType == 1) return true;
+          }
+          return false;
+      },
+      setMessage: function(message) {
+          // if it's not an html message, let's sugar coat the message with a fancy <p>
+          if(this.isHTML(message) === false) {
+              message = '<p>'+message+'</p>';
+          }
+          // set message
+          return this.element.html(message);
+      },
+      show: function(options) {
+        // initialize
+        this.init(options);
+
+          // show notice
+          this.showNotice();
+
+          // return this;
+      },
+      showNotice: function() {
+          // set message
+          this.setMessage(this.options.message);
+
+          // position notice
+          this.element.insertAfter(jQuery('h2.title'));
+
+          // set class name
+          switch(this.options.type) {
+            case 'success':
+              this.element.addClass('updated');
+            break;
+            case 'system':
+              this.element.addClass('update-nag');
+            break;
+            case 'error':
+              this.element.addClass('error');
+            break;
+          }
+
+          // make the notice appear
+          this.element.fadeIn(200);
+
+          // if scroll option is enabled, scroll to the notice
+          if(this.options.scroll === true) {
+              this.element.get(0).scrollIntoView(false);
+          }
+
+          // if the notice is not static, it has to disappear after a timeout
+          if(this.options.static === false) {
+              this.element.delay(this.options.timeout).trigger('close');
+          } else if (this.options.hideClose === false) {
+              this.element.append('<a href="javascript:;" class="mailpoet_notice_close"><span class="dashicons dashicons-dismiss"></span></a>');
+              this.element.find('.mailpoet_notice_close').on('click', function() {
+                  jQuery(this).trigger('close');
+              });
+          }
+
+          // call onOpen callback
+          if(this.options.onOpen !== null) {
+              this.options.onOpen(this.element);
+          }
+      },
+      hide: function(all) {
+          if(all !== undefined && all === true) {
+              jQuery('.mailpoet_notice:not([id])').trigger('close');
+          } else if (all !== undefined && jQuery.isArray(all)) {
+              for (var id in all) {
+                  jQuery('[data-id="notice_' + all[id] + '"]')
+                   .trigger('close');
+              }
+          } if (all !== undefined) {
+              jQuery('[data-id="notice_' + all + '"]')
+               .trigger('close');
+          } else {
+              jQuery('.mailpoet_notice.updated:not([id]), .mailpoet_notice.error:not([id])')
+              .trigger('close');
+          }
+      },
+      error: function(message, options) {
+        this.show(jQuery.extend({}, {
+              type: 'error',
+              message: '<p>'+message+'</p>'
+          }, options));
+      },
+      success: function(message, options) {
+          this.show(jQuery.extend({}, {
+              type: 'success',
+              message: '<p>'+message+'</p>'
+          }, options));
+      },
+      system: function(message, options) {
+          this.show(jQuery.extend({}, {
+              type: 'system',
+              static: true,
+              message: message
+          }, options));
+      }
+  };
 });

assets/js/src/public.js

@@ -20,10 +20,7 @@ function(
       $('form.mailpoet_form').each(function() {
         var form = $(this);
 
-        form.parsley({
-          errorsWrapper: '<p></p>',
-          errorTemplate: '<span></span>'
-        }).on('form:submit', function(parsley) {
+        form.parsley().on('form:submit', function(parsley) {
 
           var data = form.serializeObject() || {};
 

assets/js/src/subscribers/form.jsx

@@ -51,6 +51,24 @@ define(
       }
     ];
 
+    var custom_fields = window.mailpoet_custom_fields || [];
+    custom_fields.map(custom_field => {
+      let field = {
+        name: 'cf_' + custom_field.id,
+        label: custom_field.name,
+        type: custom_field.type
+      };
+      if(custom_field.params) {
+        field.params = custom_field.params;
+      }
+
+      if(custom_field.params.values) {
+        field.values = custom_field.params.values;
+      }
+
+      fields.push(field);
+    });
+
     var messages = {
       onUpdate: function() {
         MailPoet.Notice.success('Subscriber successfully updated!');

assets/js/src/subscribers/importExport/export.js

@@ -62,7 +62,7 @@ define(
            if (_.contains(fieldsToExclude, selectedOptionId)) {
              selectEvent.preventDefault();
              if (selectedOptionId === 'deselect') {
-               jQuery(selectElement).select2('val', '');
+               jQuery(selectElement).val('').trigger('change');
              } else {
                var allOptions = [];
                _.each(container.find('option'), function (field) {
@@ -70,7 +70,7 @@ define(
                    allOptions.push(field.value);
                  }
                });
-               jQuery(selectElement).select2('val', allOptions);
+               jQuery(selectElement).val(allOptions).trigger('change');
              }
              jQuery(selectElement).select2('close');
            }
@@ -138,11 +138,11 @@ define(
           endpoint: 'ImportExport',
           action: 'processExport',
           data: JSON.stringify({
-            'exportConfirmedOption': exportData.exportConfirmedOption,
-            'exportFormatOption': jQuery(':radio[name="option_format"]:checked').val(),
-            'groupBySegmentOption': (groupBySegmentOptionElement.is(":visible")) ? groupBySegmentOptionElement.prop('checked') : false,
+            'export_confirmed_option': exportData.exportConfirmedOption,
+            'export_format_option': jQuery(':radio[name="option_format"]:checked').val(),
+            'group_by_segment_option': (groupBySegmentOptionElement.is(":visible")) ? groupBySegmentOptionElement.prop('checked') : false,
             'segments': (exportData.segments) ? segmentsContainerElement.val() : false,
-            'subscriberFields': subscriberFieldsContainerElement.val()
+            'subscriber_fields': subscriberFieldsContainerElement.val()
           })
         })
         .done(function (response) {

codeception.yml

@@ -19,3 +19,12 @@ modules:
             user: ''
             password: ''
             dump: tests/_data/dump.sql
+coverage:
+    enabled: true
+    whitelist:
+        include:
+            - lib/*
+        exclude:
+    blacklist:
+        include:
+        exclude:

composer.json

@@ -10,7 +10,8 @@
     "swiftmailer/swiftmailer": "^5.4",
     "phpseclib/phpseclib": "*",
     "mtdowling/cron-expression": "^1.0",
-    "nesbot/carbon": "^1.21"
+    "nesbot/carbon": "^1.21",
+    "soundasleep/html2text": "^0.3.0"
   },
   "require-dev": {
     "codeception/codeception": "*",

lib/Config/Activator.php

@@ -9,13 +9,6 @@ class Activator {
   function __construct() {
   }
 
-  function init() {
-    register_activation_hook(
-      Env::$file,
-      array($this, 'activate')
-    );
-  }
-
   function activate() {
     $migrator = new Migrator();
     $migrator->up();
@@ -23,4 +16,9 @@ class Activator {
     $populator = new Populator();
     $populator->up();
   }
+
+  function deactivate() {
+    $migrator = new Migrator();
+    $migrator->down();
+  }
 }

lib/Config/Analytics.php

@@ -10,7 +10,8 @@ class Analytics {
   }
 
   function init() {
-    add_action('admin_enqueue_scripts', array($this, 'setupAdminDependencies'));
+    // review: this creates a fatal error when mailpoet tables are dropped.
+    //add_action('admin_enqueue_scripts', array($this, 'setupAdminDependencies'));
   }
 
   function setupAdminDependencies() {

lib/Config/Env.php

@@ -6,15 +6,14 @@ if(!defined('ABSPATH')) exit;
 class Env {
   static $version;
   static $plugin_name;
-  static $plugin_url;
   static $plugin_path;
   static $file;
   static $path;
   static $views_path;
   static $assets_path;
   static $assets_url;
-  static $temp_name;
   static $temp_path;
+  static $temp_URL;
   static $languages_path;
   static $lib_path;
   static $plugin_prefix;
@@ -34,12 +33,12 @@ class Env {
     self::$file = $file;
     self::$path = dirname(self::$file);
     self::$plugin_name = 'mailpoet';
-    self::$plugin_url = plugin_dir_url(__FILE__);
     self::$views_path = self::$path . '/views';
     self::$assets_path = self::$path . '/assets';
     self::$assets_url = plugins_url('/assets', $file);
-    self::$temp_name = 'temp';
-    self::$temp_path = self::$path . '/' . self::$temp_name;
+    $wp_upload_dir = wp_upload_dir();
+    self::$temp_path = $wp_upload_dir['path'];
+    self::$temp_URL = $wp_upload_dir['url'];
     self::$languages_path = self::$path . '/lang';
     self::$lib_path = self::$path . '/lib';
     self::$plugin_prefix = 'mailpoet_';
@@ -74,19 +73,4 @@ class Env {
     );
     return implode('', $source_name);
   }
-
-  static function isPluginActivated() {
-    $activatesPlugins = get_option('active_plugins');
-    $isActivated = (
-      in_array(
-        sprintf('%s/%s.php', basename(self::$path), self::$plugin_name),
-        $activatesPlugins
-      ) ||
-      in_array(
-        sprintf('%s/%s.php', explode('/', plugin_basename(__FILE__))[0], self::$plugin_name),
-        $activatesPlugins
-      )
-    );
-    return ($isActivated) ? true : false;
-  }
 }

lib/Config/Hooks.php

@@ -1,11 +1,61 @@
 <?php
 namespace MailPoet\Config;
+use \MailPoet\Models\Setting;
 
 class Hooks {
   function __construct() {
   }
 
   function init() {
+    // Subscribe in comments
+    if((bool)Setting::getValue('subscribe.on_comment.enabled')) {
+      add_action(
+        'comment_form_after_fields',
+        '\MailPoet\Subscription\Comment::extendForm'
+      );
+
+      add_action(
+        'comment_post',
+        '\MailPoet\Subscription\Comment::onSubmit',
+        60,
+        2
+      );
+
+      add_action(
+        'wp_set_comment_status',
+        '\MailPoet\Subscription\Comment::onStatusUpdate',
+        60,
+        2
+      );
+    }
+
+    // Subscribe in registration form
+    if((bool)Setting::getValue('subscribe.on_register.enabled')) {
+      if(is_multisite()) {
+        add_action(
+          'signup_extra_fields',
+          '\MailPoet\Subscription\Registration::extendForm'
+        );
+        add_action(
+          'wpmu_validate_user_signup',
+          '\MailPoet\Subscription\Registration::onMultiSiteRegister',
+          60,
+          1
+        );
+      } else {
+        add_action(
+          'register_form',
+          '\MailPoet\Subscription\Registration::extendForm'
+        );
+        add_action(
+          'register_post',
+          '\MailPoet\Subscription\Registration::onRegister',
+          60,
+          3
+        );
+      }
+    }
+
     // WP Users synchronization
     add_action(
       'user_register',

lib/Config/Initializer.php

@@ -5,9 +5,12 @@ use MailPoet\Models;
 use MailPoet\Cron\Supervisor;
 use MailPoet\Router;
 use MailPoet\Models\Setting;
+use MailPoet\Settings\Pages;
 
 if(!defined('ABSPATH')) exit;
 
+require_once(ABSPATH . 'wp-admin/includes/plugin.php');
+
 class Initializer {
   function __construct($params = array(
     'file' => '',
@@ -18,20 +21,34 @@ class Initializer {
 
   function init() {
     $this->setupDB();
-    $this->setupActivator();
-    $this->setupRenderer();
-    $this->setupLocalizer();
-    $this->setupMenu();
-    $this->setupRouter();
-    $this->setupWidget();
-    $this->setupAnalytics();
-    $this->setupPermissions();
-    $this->setupChangelog();
-    $this->setupPublicAPI();
-    $this->runQueueSupervisor();
-    $this->setupShortcodes();
-    $this->setupHooks();
-    $this->setupImages();
+
+    register_activation_hook(Env::$file, array($this, 'runMigrator'));
+    register_activation_hook(Env::$file, array($this, 'runPopulator'));
+
+    add_action('init', array($this, 'setup'));
+    add_action('widgets_init', array($this, 'setupWidget'));
+  }
+
+  function setup() {
+    try {
+      $this->setupRenderer();
+      $this->setupLocalizer();
+      $this->setupMenu();
+      $this->setupRouter();
+      $this->setupPermissions();
+      $this->setupPublicAPI();
+      $this->setupAnalytics();
+      $this->setupChangelog();
+      $this->runQueueSupervisor();
+      $this->setupShortcodes();
+      $this->setupHooks();
+      $this->setupPages();
+      $this->setupImages();
+    } catch(\Exception $e) {
+      // if anything goes wrong during init
+      // automatically deactivate the plugin
+      deactivate_plugins(Env::$file);
+    }
   }
 
   function setupDB() {
@@ -75,13 +92,18 @@ class Initializer {
     define('MP_SUBSCRIBER_CUSTOM_FIELD_TABLE', $subscriber_custom_field);
     define('MP_NEWSLETTER_OPTION_FIELDS_TABLE', $newsletter_option_fields);
     define('MP_NEWSLETTER_OPTION_TABLE', $newsletter_option);
-    define('MP_SENDING_QUEUE_TABLE', $sending_queues);
+    define('MP_SENDING_QUEUES_TABLE', $sending_queues);
     define('MP_NEWSLETTER_STATISTICS_TABLE', $newsletter_statistics);
   }
 
-  function setupActivator() {
-    $activator = new Activator();
-    $activator->init();
+  function runMigrator() {
+    $migrator = new Migrator();
+    $migrator->up();
+  }
+
+  function runPopulator() {
+    $populator = new Populator();
+    $populator->up();
   }
 
   function setupRenderer() {
@@ -95,10 +117,7 @@ class Initializer {
   }
 
   function setupMenu() {
-    $menu = new Menu(
-      $this->renderer,
-      Env::$assets_url
-    );
+    $menu = new Menu($this->renderer, Env::$assets_url);
     $menu->init();
   }
 
@@ -127,10 +146,16 @@ class Initializer {
     $changelog->init();
   }
 
+  function setupPages() {
+    $pages = new Pages();
+    $pages->init();
+  }
+
   function setupShortcodes() {
     $shortcodes = new Shortcodes();
     $shortcodes->init();
   }
+
   function setupHooks() {
     $hooks = new Hooks();
     $hooks->init();
@@ -142,13 +167,15 @@ class Initializer {
   }
 
   function runQueueSupervisor() {
+    if(php_sapi_name() === 'cli') return;
     try {
       $supervisor = new Supervisor();
       $supervisor->checkDaemon();
-    } catch (\Exception $e) {}
+    } catch(\Exception $e) {
+    }
   }
 
   function setupImages() {
     add_image_size('mailpoet_newsletter_max', 1320);
   }
-}
+}

lib/Config/Menu.php

@@ -190,6 +190,8 @@ class Menu {
   }
 
   function welcome() {
+    if((bool)(defined('DOING_AJAX') && DOING_AJAX)) return;
+
     global $wp;
     $current_url = home_url(add_query_arg($wp->query_string, $wp->request));
     $redirect_url =
@@ -240,6 +242,7 @@ class Menu {
 
   function settings() {
     $settings = Setting::getAll();
+    $flags = $this->_getFlags();
 
     // dkim: check if public/private keys have been generated
     if(
@@ -258,10 +261,9 @@ class Menu {
 
     $data = array(
       'settings' => $settings,
-      'segments' => Segment::getPublished()
-        ->findArray(),
+      'segments' => Segment::getPublic()->findArray(),
       'pages' => Pages::getAll(),
-      'flags' => $this->_getFlags(),
+      'flags' => $flags,
       'charsets' => Charsets::getAll(),
       'current_user' => wp_get_current_user(),
       'permissions' => Permissions::getAll(),
@@ -294,7 +296,7 @@ class Menu {
     } else {
       // check if users can register
       $flags['registration_enabled'] =
-        (bool) get_option('users_can_register', false);
+        (bool)get_option('users_can_register', false);
     }
 
     return $flags;
@@ -305,6 +307,23 @@ class Menu {
 
     $data['segments'] = Segment::findArray();
 
+    $data['custom_fields'] = array_map(function($field) {
+      $field['params'] = unserialize($field['params']);
+
+      if(!empty($field['params']['values'])) {
+        $values = array();
+
+        foreach($field['params']['values'] as $value) {
+          $values[$value['value']] = $value['value'];
+        }
+        $field['params']['values'] = $values;
+      }
+      return $field;
+    }, CustomField::findArray());
+
+    $data['date_formats'] = Block\Date::getDateFormats();
+    $data['month_names'] = Block\Date::getMonthNames();
+
     echo $this->renderer->render('subscribers/subscribers.html', $data);
   }
 

lib/Config/Migrator.php

@@ -1,7 +1,7 @@
 <?php
 namespace MailPoet\Config;
 
-if (!defined('ABSPATH')) exit;
+if(!defined('ABSPATH')) exit;
 
 require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
 
@@ -41,7 +41,7 @@ class Migrator {
   function down() {
     global $wpdb;
 
-    $drop_table = function($model) {
+    $drop_table = function($model) use($wpdb) {
       $table = $this->prefix . $model;
       $wpdb->query("DROP TABLE {$table}");
     };

lib/Config/Populator.php

@@ -8,6 +8,7 @@ use MailPoet\Config\PopulatorData\Templates\PostNotificationsBlankTemplate;
 use \MailPoet\Models\Segment;
 use \MailPoet\Segments\WP;
 use \MailPoet\Models\Setting;
+use \MailPoet\Settings\Pages;
 
 if (!defined('ABSPATH')) exit;
 
@@ -48,6 +49,29 @@ class Populator {
 
     $this->createDefaultSegments();
     $this->createDefaultSettings();
+    $this->createMailPoetPage();
+  }
+
+  private function createMailPoetPage() {
+    $pages = get_posts(array(
+      'posts_per_page' => 1,
+      'orderby' => 'date',
+      'order' => 'DESC',
+      'post_type' => 'mailpoet_page'
+    ));
+
+    $page = null;
+    if(!empty($pages)) {
+      $page = array_shift($pages);
+      if(strpos($page->post_content, '[mailpoet_page]') === false) {
+        $page = null;
+      }
+    }
+
+    if($page === null) {
+      $mailpoet_page_id = Pages::createMailPoetPage();
+      Setting::setValue('subscription.page', $mailpoet_page_id);
+    }
   }
 
   private function createDefaultSettings() {
@@ -72,6 +96,9 @@ class Populator {
       'name' => $user_name,
       'address' => $current_user->user_email
     ));
+
+    // enable signup confirmation by default
+    Setting::setValue('signup_confirmation.enabled', true);
   }
 
   private function createDefaultSegments() {

lib/Config/PopulatorData/Templates/BlankTemplate.php

@@ -179,7 +179,7 @@ class BlankTemplate {
         ),
         "h1" => array(
           "fontColor" => "#111111",
-          "fontFamily" => "Arial Black",
+          "fontFamily" => "Arial",
           "fontSize" => "24px"
         ),
         "h2" => array(

lib/Config/PopulatorData/Templates/FranksRoastHouseTemplate.php

@@ -279,19 +279,19 @@ class FranksRoastHouseTemplate {
                 "blocks" => array(
                   array(
                     "type" => "footer",
-                    "text" => __("<p><span style=\"color: #000000;\"><a href=\"[unsubscribeUrl]\" style=\"color: #000000;\">Unsubscribe</a> | <a href=\"[manageSubscriptionUrl]\" style=\"color: #000000;\">Manage subscription</a></span><br /><span style=\"color: #000000;\">12345 MailPoet Drive, EmailVille, 76543</span></p>"),
+                    "text" => __("<p><a href=\"[unsubscribeUrl]\">Unsubscribe</a> | <a href=\"[manageSubscriptionUrl]\">Manage subscription</a><br />12345 MailPoet Drive, EmailVille, 76543</p>"),
                     "styles" => array(
                       "block" => array(
                         "backgroundColor" => "#a9a7a7"
                       ),
                       "text" => array(
-                        "fontColor" => "#ffffff",
+                        "fontColor" => "#000000",
                         "fontFamily" => "Arial",
                         "fontSize" => "12px",
                         "textAlign" => "center"
                       ),
                       "link" => array(
-                        "fontColor" => "#ffffff",
+                        "fontColor" => "#000000",
                         "textDecoration" => "underline"
                       )
                     )

lib/Config/PublicAPI.php

@@ -7,15 +7,20 @@ use MailPoet\Util\Helpers;
 if(!defined('ABSPATH')) exit;
 
 class PublicAPI {
+  public $api;
+  public $section;
+  public $action;
+  public $request_payload;
+
   function __construct() {
-    # http://example.com/?mailpoet-api&section=&action=&payload=
+    # http://example.com/?mailpoet-api&section=&action=&request_payload=
     $this->api = isset($_GET['mailpoet-api']) ? true : false;
     $this->section = isset($_GET['section']) ? $_GET['section'] : false;
     $this->action = isset($_GET['action']) ?
       Helpers::underscoreToCamelCase($_GET['action']) :
       false;
-    $this->payload = isset($_GET['payload']) ?
-      json_decode(urldecode($_GET['payload']), true) :
+    $this->request_payload = isset($_GET['request_payload']) ?
+      unserialize(base64_decode($_GET['request_payload'])) :
       false;
   }
 
@@ -26,10 +31,9 @@ class PublicAPI {
 
   function queue() {
     try {
-      $queue = new Daemon($this->payload);
+      $queue = new Daemon($this->request_payload);
       $this->_checkAndCallMethod($queue, $this->action);
     } catch(\Exception $e) {
-      // mailer configuration error
     }
   }
 

lib/Config/Shortcodes.php

@@ -1,5 +1,8 @@
 <?php
 namespace MailPoet\Config;
+use \MailPoet\Models\Newsletter;
+use \MailPoet\Models\Subscriber;
+use \MailPoet\Models\SubscriberSegment;
 
 class Shortcodes {
   function __construct() {
@@ -9,6 +12,26 @@ class Shortcodes {
     // form widget shortcode
     add_shortcode('mailpoet_form', array($this, 'formWidget'));
     add_shortcode('wysija_form', array($this, 'formWidget'));
+
+    // subscribers count shortcode
+    add_shortcode('mailpoet_subscribers_count', array(
+      $this, 'getSubscribersCount'
+    ));
+    add_shortcode('wysija_subscribers_count', array(
+      $this, 'getSubscribersCount'
+    ));
+
+    // archives page
+    add_shortcode('mailpoet_archive', array(
+      $this, 'getArchive'
+    ));
+
+    add_filter('mailpoet_archive_date', array(
+      $this, 'renderArchiveDate'
+    ), 2);
+    add_filter('mailpoet_archive_subject', array(
+      $this, 'renderArchiveSubject'
+    ), 2);
   }
 
   function formWidget($params = array()) {
@@ -23,4 +46,76 @@ class Shortcodes {
       ));
     }
   }
+
+  function getSubscribersCount($params) {
+    if(!empty($params['segments'])) {
+      $segment_ids = array_map(function($segment_id) {
+        return (int)trim($segment_id);
+      }, explode(',', $params['segments']));
+    }
+
+    if(empty($segment_ids)) {
+      return Subscriber::filter('subscribed')->count();
+    } else {
+      return SubscriberSegment::whereIn('segment_id', $segment_ids)
+        ->select('subscriber_id')->distinct()
+        ->filter('subscribed')
+        ->findResultSet()->count();
+    }
+  }
+
+  function getArchive($params) {
+    if(!empty($params['segments'])) {
+      $segment_ids = array_map(function($segment_id) {
+        return (int)trim($segment_id);
+      }, explode(',', $params['segments']));
+    }
+
+    $newsletters = array();
+    $html = '';
+
+    // TODO: needs more advanced newsletters in order to finish
+    $newsletters = Newsletter::limit(10)->orderByDesc('created_at')->findMany();
+
+    if(empty($newsletters)) {
+      return apply_filters(
+        'mailpoet_archive_no_newsletters',
+        __('Oops! There are no newsletters to display.')
+      );
+    } else {
+      $title = apply_filters('mailpoet_archive_title', '');
+      if(!empty($title)) {
+        $html .= '<h3 class="mailpoet_archive_title">'.$title.'</h3>';
+      }
+
+      $html .= '<ul class="mailpoet_archive">';
+      foreach($newsletters as $newsletter) {
+        $html .= '<li>'.
+          '<span class="mailpoet_archive_date">'.
+            apply_filters('mailpoet_archive_date', $newsletter).
+          '</span>
+          <span class="mailpoet_archive_subject">'.
+            apply_filters('mailpoet_archive_subject', $newsletter).
+          '</span>
+        </li>';
+      }
+      $html .= '</ul>';
+    }
+    return $html;
+  }
+
+  function renderArchiveDate($newsletter) {
+    return date_i18n(
+      get_option('date_format'),
+      strtotime($newsletter->created_at)
+    );
+  }
+
+  function renderArchiveSubject($newsletter) {
+    return '<a href="TODO" target="_blank" title="'
+      .esc_attr(__('Preview in new tab')).'">'
+      .esc_attr($newsletter->subject).
+    '</a>';
+  }
+
 }

lib/Config/Widget.php

@@ -1,6 +1,5 @@
 <?php
 namespace MailPoet\Config;
-use \MailPoet\Models\Subscriber;
 use \MailPoet\Util\Security;
 
 if(!defined('ABSPATH')) exit;
@@ -10,30 +9,17 @@ class Widget {
   }
 
   function init() {
-    add_action('widgets_init', array($this, 'registerWidget'));
+    $this->registerWidget();
 
     if(!is_admin()) {
-      //$this->setupActions();
-      add_action('widgets_init', array($this, 'setupDependencies'));
+      $this->setupDependencies();
     } else {
-      add_action('widgets_init', array($this, 'setupAdminDependencies'));
+      $this->setupAdminDependencies();
     }
   }
 
   function registerWidget() {
     register_widget('\MailPoet\Form\Widget');
-
-    // subscribers count shortcode
-    add_shortcode('mailpoet_subscribers_count', array(
-      $this, 'getSubscribersCount'
-    ));
-    add_shortcode('wysija_subscribers_count', array(
-      $this, 'getSubscribersCount'
-    ));
-  }
-
-  function getSubscribersCount($params) {
-    return Subscriber::filter('subscribed')->count();
   }
 
   function setupDependencies() {
@@ -82,6 +68,9 @@ class Widget {
     }
   }
 
+  // TODO: extract this method into an Initializer
+  // - the "ajax" part might probably be useless
+  // - the "post" (non-ajax) part needs to be redone properly
   function setupActions() {
     // ajax requests
     add_action(

lib/Cron/CronHelper.php

@@ -0,0 +1,70 @@
+<?php
+namespace MailPoet\Cron;
+
+use MailPoet\Models\Setting;
+use MailPoet\Util\Security;
+
+if(!defined('ABSPATH')) exit;
+
+class CronHelper {
+  static $daemon_execution_limit = 30;
+  static $daemon_timeout_limit = 30;
+
+  static function createDaemon($token) {
+    $daemon = array(
+      'status' => 'starting',
+      'counter' => 0,
+      'token' => $token
+    );
+    self::saveDaemon($daemon);
+    return $daemon;
+  }
+
+  static function getDaemon() {
+    return Setting::getValue('cron_daemon');
+  }
+
+  static function saveDaemon($daemon) {
+    $daemon['updated_at'] = time();
+    return Setting::setValue(
+      'cron_daemon',
+      $daemon
+    );
+  }
+
+  static function createToken() {
+    return Security::generateRandomString();
+  }
+
+  static function accessDaemon($token) {
+    $payload = serialize(array('token' => $token));
+    $url = '/?mailpoet-api&section=queue&action=run&request_payload=' .
+      base64_encode($payload);
+    $args = array(
+      'timeout' => 1,
+      'user-agent' => 'MailPoet (www.mailpoet.com) Cron'
+    );
+    $result = wp_remote_get(
+      self::getSiteUrl() . $url,
+      $args
+    );
+    return wp_remote_retrieve_body($result);
+  }
+
+  private static function getSiteUrl() {
+    // additional check for some sites running on a virtual machine or behind
+    // proxy where there could be different ports (e.g., host:8080 => guest:80)
+
+    // if the site URL does not contain a port, return the URL
+    if(!preg_match('!^https?://.*?:\d+!', site_url())) return site_url();
+    preg_match('!://(?P<host>.*?):(?P<port>\d+)!', site_url(), $server);
+    // connect to the URL with port
+    $fp = @fsockopen($server['host'], $server['port'], $errno, $errstr, 1);
+    if($fp) return site_url();
+    // connect to the URL without port
+    $fp = @fsockopen($server['host'], $server['port'], $errno, $errstr, 1);
+    if($fp) return preg_replace('!(?=:\d+):\d+!', '$1', site_url());
+    // throw an error if all connection attempts failed
+    throw new \Exception(__('Site URL is unreachable.'));
+  }
+}

lib/Cron/Daemon.php

@@ -2,131 +2,77 @@
 namespace MailPoet\Cron;
 
 use MailPoet\Cron\Workers\SendingQueue;
-use MailPoet\Models\Setting;
-use MailPoet\Util\Security;
 
 require_once(ABSPATH . 'wp-includes/pluggable.php');
 
 if(!defined('ABSPATH')) exit;
 
 class Daemon {
-  function __construct($payload = array()) {
+  public $daemon;
+  public $request_payload;
+  public $refreshed_token;
+  private $timer;
+
+  function __construct($request_payload = array()) {
     set_time_limit(0);
     ignore_user_abort();
-    list ($this->daemon, $this->daemonData) = $this->getDaemon();
-    $this->refreshedToken = $this->refreshToken();
-    $this->payload = $payload;
+    $this->daemon = CronHelper::getDaemon();
+    $this->token = CronHelper::createToken();
+    $this->request_payload = $request_payload;
     $this->timer = microtime(true);
   }
 
-  function start() {
-    if(!isset($this->payload['session'])) {
-      $this->abortWithError('missing session ID');
-    }
-    $this->manageSession('start');
-    $daemon = $this->daemon;
-    $daemonData = $this->daemonData;
-    if(!$daemon) {
-      $daemon = Setting::create();
-      $daemon->name = 'cron_daemon';
-      $daemonData = array(
-        'status' => null,
-        'counter' => 0
-      );
-      $daemon->value = json_encode($daemonData);
-      $daemon->save();
-    }
-    if($daemonData['status'] !== 'started') {
-      $_SESSION['cron_daemon'] = 'started';
-      $daemonData['status'] = 'started';
-      $daemonData['token'] = $this->refreshedToken;
-      $_SESSION['cron_daemon'] = array('result' => true);
-      $this->manageSession('end');
-      $daemon->value = json_encode($daemonData);
-      $daemon->save();
-      $this->callSelf();
-    } else {
-      $_SESSION['cron_daemon'] = array(
-        'result' => false,
-        'error' => 'already started'
-      );
-    }
-    $this->manageSession('end');
-  }
-
   function run() {
-    if(!$this->daemon || $this->daemonData['status'] !== 'started') {
-      $this->abortWithError('not running');
+    $daemon = $this->daemon;
+    if(!$daemon) {
+      $this->abortWithError(__('Daemon does not exist.'));
     }
-    if(!isset($this->payload['token']) ||
-      $this->payload['token'] !== $this->daemonData['token']
+    if(!isset($this->request_payload['token']) ||
+      $this->request_payload['token'] !== $daemon['token']
     ) {
-      $this->abortWithError('invalid token');
+      $this->abortWithError(__('Invalid or missing token.'));
     }
-
+    $this->abortIfStopped($daemon);
     try {
-      $sendingQueue = new SendingQueue($this->timer);
-      $sendingQueue->process();
+      $sending_queue = new SendingQueue($this->timer);
+      $sending_queue->process();
     } catch(Exception $e) {
     }
-
-    $elapsedTime = microtime(true) - $this->timer;
-    if($elapsedTime < 30) {
-      sleep(30 - $elapsedTime);
+    $elapsed_time = microtime(true) - $this->timer;
+    if($elapsed_time < CronHelper::$daemon_execution_limit) {
+      sleep(CronHelper::$daemon_execution_limit - $elapsed_time);
     }
-
-    // after each execution, read daemon in case it's status was modified
-    list($daemon, $daemonData) = $this->getDaemon();
-    $daemonData['counter']++;
-    $daemonData['token'] = $this->refreshedToken;
-    $daemon->value = json_encode($daemonData);
-    $daemon->save();
-    if($daemonData['status'] === 'strated') $this->callSelf();
-  }
-
-  function getDaemon() {
-    $daemon = Setting::where('name', 'cron_daemon')
-      ->findOne();
-    return array(
-      ($daemon) ? $daemon : null,
-      ($daemon) ? json_decode($daemon->value, true) : null
-    );
-  }
-
-  function refreshToken() {
-    return Security::generateRandomString();
-  }
-
-  function manageSession($action) {
-    switch($action) {
-      case 'start':
-        if(session_id()) {
-          session_write_close();
-        }
-        session_id($this->payload['session']);
-        session_start();
-        break;
-      case 'end':
-        session_write_close();
-        break;
+    // after each execution, re-read daemon data in case it was deleted or
+    // its status has changed
+    $daemon = CronHelper::getDaemon();
+    if(!$daemon || $daemon['token'] !== $this->request_payload['token']) {
+      exit;
     }
+    $daemon['counter']++;
+    $this->abortIfStopped($daemon);
+    if($daemon['status'] === 'starting') {
+      $daemon['status'] = 'started';
+    }
+    $daemon['token'] = $this->token;
+    CronHelper::saveDaemon($daemon);
+    $this->callSelf();
+  }
+
+  function abortIfStopped($daemon) {
+    if($daemon['status'] === 'stopped') exit;
+    if($daemon['status'] === 'stopping') {
+      $daemon['status'] = 'stopped';
+      CronHelper::saveDaemon($daemon);
+      exit;
+    }
+  }
+
+  function abortWithError($message) {
+    exit('[mailpoet_cron_error:' . base64_encode($message) . ']');
   }
 
   function callSelf() {
-    $payload = json_encode(array('token' => $this->refreshedToken));
-    Supervisor::getRemoteUrl(
-      '/?mailpoet-api&section=queue&action=run&payload=' . urlencode($payload)
-
-    );
-    exit;
-  }
-
-  function abortWithError($error) {
-    wp_send_json(
-      array(
-        'result' => false,
-        'error' => $error
-      ));
+    CronHelper::accessDaemon($this->token);
     exit;
   }
 }

lib/Cron/Supervisor.php

@@ -1,84 +1,94 @@
 <?php
 namespace MailPoet\Cron;
 
-use Carbon\Carbon;
-use MailPoet\Config\Env;
-use MailPoet\Models\Setting;
-
 if(!defined('ABSPATH')) exit;
 
 class Supervisor {
-  function __construct($forceStart = false) {
-    $this->forceStart = $forceStart;
-    if(!Env::isPluginActivated()) {
-      throw new \Exception('Database has not been configured.');
-    }
-    list ($this->daemon, $this->daemonData) = $this->getDaemon();
+  public $daemon;
+  public $token;
+  public $force_run;
+
+  function __construct($force_run = false) {
+    $this->daemon = CronHelper::getDaemon();
+    $this->token = CronHelper::createToken();
+    $this->force_run = $force_run;
   }
 
   function checkDaemon() {
-    if(!$this->daemon) {
-      return $this->startDaemon();
+    $daemon = $this->daemon;
+    if(!$daemon) {
+      $daemon = CronHelper::createDaemon($this->token);
+      return $this->runDaemon($daemon);
     }
-    if(!$this->forceStart && $this->daemonData['status'] === 'stopped') {
-      return;
+    // if the daemon is stopped, return its status and do nothing
+    if(!$this->force_run &&
+      isset($daemon['status']) &&
+      $daemon['status'] === 'stopped'
+    ) {
+      return $this->formatDaemonStatusMessage($daemon['status']);
+
     }
-    $currentTime = Carbon::now('UTC');
-    $lastUpdateTime = Carbon::createFromFormat(
-      'Y-m-d H:i:s',
-      $this->daemon->updated_at, 'UTC'
-    );
-    $timeSinceLastStart = $currentTime->diffInSeconds($lastUpdateTime);
-    if($timeSinceLastStart < 40) return;
-    $this->daemonData['status'] = null;
-    $this->daemon->value = json_encode($this->daemonData);
-    $this->daemon->save();
-    return $this->startDaemon();
+    $elapsed_time = time() - (int) $daemon['updated_at'];
+    // if it's been less than 40 seconds since last execution and we're not
+    // force-running the daemon, return its status and do nothing
+    if($elapsed_time < CronHelper::$daemon_timeout_limit && !$this->force_run) {
+      return $this->formatDaemonStatusMessage($daemon['status']);
+    }
+    // if it's been less than 40 seconds since last execution, we are
+    // force-running the daemon and it's either being started or stopped,
+    // return its status and do nothing
+    elseif($elapsed_time < CronHelper::$daemon_timeout_limit &&
+      $this->force_run &&
+      in_array($daemon['status'], array(
+        'stopping',
+        'starting'
+      ))
+    ) {
+      return $this->formatDaemonStatusMessage($daemon['status']);
+    }
+    // re-create (restart) daemon
+    CronHelper::createDaemon($this->token);
+    return $this->runDaemon();
   }
 
-  function startDaemon() {
-    if(!session_id()) session_start();
-    $sessionId = session_id();
-    session_write_close();
-    $_SESSION['cron_daemon'] = null;
-    $payload = json_encode(array('session' => $sessionId));
-    self::getRemoteUrl(
-      '/?mailpoet-api&section=queue&action=start&payload=' . urlencode($payload)
-    );
-    session_start();
-    $daemonStatus = $_SESSION['cron_daemon'];
-    unset($_SESSION['daemon']);
-    session_write_close();
-    return $daemonStatus;
+  function runDaemon() {
+    $request = CronHelper::accessDaemon($this->token);
+    preg_match('/\[(mailpoet_cron_error:.*?)\]/i', $request, $status);
+    $daemon = CronHelper::getDaemon();
+    if(!empty($status) || !$daemon) {
+      if(!$daemon) {
+        $message = __('Daemon failed to run.');
+      } else {
+        list(, $message) = explode(':', $status[0]);
+        $message = base64_decode($message);
+      }
+      return $this->formatResultMessage(
+        false,
+        $message
+      );
+    }
+    return $this->formatDaemonStatusMessage($daemon['status']);
   }
 
-  function getDaemon() {
-    $daemon = Setting::where('name', 'cron_daemon')
-      ->findOne();
-    $daemonData = ($daemon) ? json_decode($daemon->value, true) : false;
-    return array(
-      $daemon,
-      $daemonData
+  private function formatDaemonStatusMessage($status) {
+    return $this->formatResultMessage(
+      true,
+      sprintf(
+        __('Daemon is currently %s.'),
+        __($status)
+      )
     );
   }
 
-  static function getRemoteUrl($url) {
-    $args = array(
-      'timeout' => 1,
-      'user-agent' => 'MailPoet (www.mailpoet.com)'
+  private function formatResultMessage($result, $message) {
+    $formattedResult = array(
+      'result' => $result
     );
-    wp_remote_get(
-      self::getSiteUrl() . $url,
-      $args
-    );
-  }
-
-  static function getSiteUrl() {
-    if(preg_match('!:\d+/!', site_url())) return site_url();
-    preg_match('!http://(?P<host>.*?):(?P<port>\d+)!', site_url(), $server);
-    $fp = @fsockopen($server['host'], $server['port'], $errno, $errstr, 1);
-    return ($fp) ?
-      site_url() :
-      preg_replace('/(?=:\d+):\d+/', '$1', site_url());
+    if(!$result) {
+      $formattedResult['errors'] = array($message);
+    } else {
+      $formattedResult['message'] = $message;
+    }
+    return $formattedResult;
   }
 }

lib/Cron/Workers/SendingQueue.php

@@ -1,114 +1,139 @@
 <?php
 namespace MailPoet\Cron\Workers;
 
+use MailPoet\Cron\CronHelper;
+use MailPoet\Mailer\Mailer;
 use MailPoet\Models\Newsletter;
 use MailPoet\Models\NewsletterStatistics;
 use MailPoet\Models\Subscriber;
 use MailPoet\Newsletter\Renderer\Renderer;
-use MailPoet\Router\Mailer;
+use MailPoet\Newsletter\Shortcodes\Shortcodes;
 
 if(!defined('ABSPATH')) exit;
 
 class SendingQueue {
+  private $timer;
+
   function __construct($timer = false) {
     $this->timer = ($timer) ? $timer : microtime(true);
   }
 
   function process() {
-    $queues =
-      \MailPoet\Models\SendingQueue::orderByDesc('priority')
-        ->whereNull('deleted_at')
-        ->whereNull('status')
-        ->findResultSet();
-    foreach($queues as $queue) {
+    // TODO: implement mailer sending frequency limits
+    foreach($this->getQueues() as $queue) {
       $newsletter = Newsletter::findOne($queue->newsletter_id);
       if(!$newsletter) {
         continue;
       };
       $newsletter = $newsletter->asArray();
-      $mailer = new Mailer($httpRequest = false);
-      if(!empty($newsletter['sender_address']) &&
-        !empty($newsletter['sender_name'])
-      ) {
-        $mailer->fromName = $newsletter['sender_name'];
-        $mailer->fromEmail = $newsletter['sender_address'];
-        $mailer->fromNameEmail = sprintf(
-          '%s <%s>',
-          $mailer->fromName,
-          $mailer->fromEmail
-        );
-      }
-      if(!empty($newsletter['reply_to_address']) &&
-        !empty($newsletter['reply_to_name'])
-      ) {
-        $mailer->replyToName = $newsletter['reply_to_name'];
-        $mailer->replyToEmail = $newsletter['reply_to_address'];
-        $mailer->replyToNameEmail = sprintf(
-          '%s <%s>',
-          $mailer->replyToName,
-          $mailer->replyToEmail
-        );
-      }
-      $mailer->mailer = $mailer->buildMailer();
-      $renderer = new Renderer(json_decode($newsletter['body'], true));
-      $newsletter = array(
-        'subject' => $newsletter['subject'],
-        'id' => $newsletter['id'],
-        'body' => array(
-          'html' => $renderer->renderAll(),
-          'text' => ''
-          // TODO: add text body
-        )
-      );
+      $mailer = $this->configureMailerForNewsletter($newsletter);
       $subscribers = json_decode($queue->subscribers, true);
-      $subscribersToProcess = $subscribers['to_process'];
-      if(!isset($subscribers['failed'])) $subscribers['failed'] = array();
+      $subscribers_to_process = $subscribers['to_process'];
       if(!isset($subscribers['processed'])) $subscribers['processed'] = array();
-      foreach(array_chunk($subscribersToProcess, 200) as $subscriberIds) {
-        $dbSubscribers = Subscriber::whereIn('id', $subscriberIds)
+      if(!isset($subscribers['failed'])) $subscribers['failed'] = array();
+      foreach(array_chunk($subscribers_to_process, 200) as $subscriber_ids) {
+        $db_subscribers = Subscriber::whereIn('id', $subscriber_ids)
           ->findArray();
-        foreach($dbSubscribers as $i => $dbSubscriber) {
+        foreach($db_subscribers as $db_subscriber) {
           $this->checkExecutionTimer();
-          // TODO: replace shortcodes in the newsletter
-          $result = $mailer->mailer->send(
-            $newsletter,
-            $mailer->transformSubscriber($dbSubscriber)
-          );
-          $newsletterStatistics = NewsletterStatistics::create();
-          $newsletterStatistics->subscriber_id = $dbSubscriber['id'];
-          $newsletterStatistics->newsletter_id = $newsletter['id'];
-          $newsletterStatistics->queue_id = $queue->id;
-          $newsletterStatistics->save();
+          $result = $this->sendNewsletter(
+            $mailer,
+            $this->processNewsletter($newsletter, $db_subscriber),
+            $db_subscriber);
           if($result) {
-            $subscribers['processed'][] = $dbSubscriber['id'];
+            $this->updateStatistics($newsletter['id'], $db_subscriber['id'], $queue->id);
+            $subscribers['processed'][] = $db_subscriber['id'];
           } else {
-            $subscribers['failed'][] = $dbSubscriber['id'];
+            $subscribers['failed'][] = $db_subscriber['id'];
           }
-          $subscribers['to_process'] = array_values(
-            array_diff(
-              $subscribers['to_process'],
-              array_merge($subscribers['processed'], $subscribers['failed'])
-            )
-          );
-          $queue->count_processed =
-            count($subscribers['processed']) + count($subscribers['failed']);
-          $queue->count_to_process = count($subscribers['to_process']);
-          $queue->count_failed = count($subscribers['failed']);
-          $queue->count_total =
-            $queue->count_processed + $queue->count_to_process;
-          if(!$queue->count_to_process) {
-            $queue->processed_at = date('Y-m-d H:i:s');
-            $queue->status = 'completed';
-          }
-          $queue->subscribers = json_encode($subscribers);
-          $queue->save();
+          $this->updateQueue($queue, $subscribers);
         }
       }
     }
   }
 
+  function processNewsletter($newsletter, $subscriber) {
+    $rendered_newsletter = $this->renderNewsletter($newsletter);
+    $shortcodes = new Shortcodes($rendered_newsletter['body']['html'], $newsletter, $subscriber);
+    $processed_newsletter['body']['html'] = $shortcodes->replace();
+    $shortcodes = new Shortcodes($rendered_newsletter['body']['text'], $newsletter, $subscriber);
+    $processed_newsletter['body']['text'] = $shortcodes->replace();
+    $processed_newsletter['subject'] = $rendered_newsletter['subject'];
+    return $processed_newsletter;
+  }
+
+  function sendNewsletter($mailer, $newsletter, $subscriber) {
+    return $mailer->mailer_instance->send(
+      $newsletter,
+      $mailer->transformSubscriber($subscriber)
+    );
+  }
+
+  function updateStatistics($newsletter_id, $subscriber_id, $queue_id) {
+    $newsletter_statistic = NewsletterStatistics::create();
+    $newsletter_statistic->subscriber_id = $newsletter_id;
+    $newsletter_statistic->newsletter_id = $subscriber_id;
+    $newsletter_statistic->queue_id = $queue_id;
+    $newsletter_statistic->save();
+  }
+
+  function updateQueue($queue, $subscribers) {
+    $subscribers['to_process'] = array_values(
+      array_diff(
+        $subscribers['to_process'],
+        array_merge($subscribers['processed'], $subscribers['failed'])
+      )
+    );
+    $queue->count_processed =
+      count($subscribers['processed']) + count($subscribers['failed']);
+    $queue->count_to_process = count($subscribers['to_process']);
+    $queue->count_failed = count($subscribers['failed']);
+    $queue->count_total =
+      $queue->count_processed + $queue->count_to_process;
+    if(!$queue->count_to_process) {
+      $queue->processed_at = date('Y-m-d H:i:s');
+      $queue->status = 'completed';
+    }
+    $queue->subscribers = json_encode($subscribers);
+    $queue->save();
+  }
+
+  function configureMailerForNewsletter($newsletter) {
+    if(!empty($newsletter['sender_address']) && !empty($newsletter['sender_name'])) {
+      $sender = array(
+        'name' => $newsletter['sender_name'],
+        'address' => $newsletter['sender_address']
+      );
+    } else {
+      $sender = false;
+    }
+    if(!empty($newsletter['reply_to_address']) && !empty($newsletter['reply_to_name'])) {
+      $reply_to = array(
+        'name' => $newsletter['reply_to_name'],
+        'address' => $newsletter['reply_to_address']
+      );
+    } else {
+      $reply_to = false;
+    }
+    $mailer = new Mailer($method = false, $sender, $reply_to);
+    return $mailer;
+  }
+
   function checkExecutionTimer() {
-    $elapsedTime = microtime(true) - $this->timer;
-    if($elapsedTime >= 28) throw new \Exception('Maximum execution time reached.');
+    $elapsed_time = microtime(true) - $this->timer;
+    if($elapsed_time >= CronHelper::$daemon_execution_limit) throw new \Exception(__('Maximum execution time reached.'));
+  }
+
+  function getQueues() {
+    return \MailPoet\Models\SendingQueue::orderByDesc('priority')
+      ->whereNull('deleted_at')
+      ->whereNull('status')
+      ->findResultSet();
+  }
+
+  function renderNewsletter($newsletter) {
+    $renderer = new Renderer($newsletter);
+    $newsletter['body'] = $renderer->render();
+    return $newsletter;
   }
 }

lib/Form/Block/Base.php

@@ -13,7 +13,9 @@ abstract class Base {
     if($block['id'] === 'segments') {
       $rules['required'] = true;
       $rules['mincheck'] = 1;
-      $rules['error-message'] = __('You need to select a list');
+      $rules['group'] = $block['id'];
+      $rules['errors-container'] = '.mailpoet_error_'.$block['id'];
+      $rules['required-message'] = __('You need to select a list');
     }
 
     if(!empty($block['params']['required'])) {
@@ -29,7 +31,7 @@ abstract class Base {
       }
     }
 
-    if($block['type'] === 'radio') {
+    if(in_array($block['type'], array('radio', 'checkbox'))) {
       $rules['group'] = 'custom_field_'.$block['id'];
       $rules['errors-container'] = '.mailpoet_error_'.$block['id'];
       $rules['required-message'] = __('You need to select at least one option.');

lib/Form/Block/Checkbox.php

@@ -9,15 +9,16 @@ class Checkbox extends Base {
     $field_name = static::getFieldName($block);
     $field_validation = static::getInputValidation($block);
 
-    // TODO: check if it still makes sense
-    // create hidden default value
-    // $html .= '<input type="hidden"name="'.$field_name.'" value="0" '.static::getInputValidation($block).'/>';
-
     $html .= '<p class="mailpoet_paragraph">';
 
     $html .= static::renderLabel($block);
 
-    foreach($block['params']['values'] as $option) {
+    $options = (!empty($block['params']['values'])
+      ? $block['params']['values']
+      : array()
+    );
+
+    foreach($options as $option) {
       $html .= '<label class="mailpoet_checkbox_label">';
 
       $html .= '<input type="checkbox" class="mailpoet_checkbox" ';
@@ -35,6 +36,8 @@ class Checkbox extends Base {
       $html .= '</label>';
     }
 
+    $html .= '<span class="mailpoet_error_'.$block['id'].'"></span>';
+
     $html .= '</p>';
 
     return $html;

lib/Form/Block/Radio.php

@@ -13,9 +13,12 @@ class Radio extends Base {
 
     $html .= static::renderLabel($block);
 
-    $html .= '<span class="mailpoet_error_'.$block['id'].'"></span>';
+    $options = (!empty($block['params']['values'])
+      ? $block['params']['values']
+      : array()
+    );
 
-    foreach($block['params']['values'] as $option) {
+    foreach($options as $option) {
       $html .= '<label class="mailpoet_radio_label">';
 
       $html .= '<input type="radio" class="mailpoet_radio" ';
@@ -33,6 +36,8 @@ class Radio extends Base {
       $html .= '</label>';
     }
 
+    $html .= '<span class="mailpoet_error_'.$block['id'].'"></span>';
+
     $html .= '</p>';
 
     return $html;

lib/Form/Block/Segment.php

@@ -13,23 +13,27 @@ class Segment extends Base {
 
     $html .= static::renderLabel($block);
 
-    if(!empty($block['params']['values'])) {
-      // display values
-      foreach($block['params']['values'] as $segment) {
-        if(!isset($segment['id']) || !isset($segment['name'])) continue;
+    $options = (!empty($block['params']['values'])
+      ? $block['params']['values']
+      : array()
+    );
 
-        $is_checked = (isset($segment['is_checked']) && $segment['is_checked']) ? 'checked="checked"' : '';
+    foreach($options as $option) {
+      if(!isset($option['id']) || !isset($option['name'])) continue;
 
-        $html .= '<label class="mailpoet_checkbox_label">';
-        $html .= '<input type="checkbox" class="mailpoet_checkbox" ';
-        $html .= 'name="'.$field_name.'[]" ';
-        $html .= 'value="'.$segment['id'].'" '.$is_checked.' ';
-        $html .= $field_validation;
-        $html .= ' />'.$segment['name'];
-        $html .= '</label>';
-      }
+      $is_checked = (isset($option['is_checked']) && $option['is_checked']) ? 'checked="checked"' : '';
+
+      $html .= '<label class="mailpoet_checkbox_label">';
+      $html .= '<input type="checkbox" class="mailpoet_checkbox" ';
+      $html .= 'name="'.$field_name.'[]" ';
+      $html .= 'value="'.$option['id'].'" '.$is_checked.' ';
+      $html .= $field_validation;
+      $html .= ' />'.$option['name'];
+      $html .= '</label>';
     }
 
+    $html .= '<span class="mailpoet_error_'.$block['id'].'"></span>';
+
     $html .= '</p>';
 
     return $html;

lib/Form/Block/Submit.php

@@ -6,11 +6,11 @@ class Submit extends Base {
   static function render($block) {
     $html = '';
 
-    $html .= '<input class="mailpoet_submit" type="submit" ';
+    $html .= '<p class="mailpoet_submit"><input type="submit" ';
 
     $html .= 'value="'.static::getFieldLabel($block).'" ';
 
-    $html .= '/>';
+    $html .= '/></p>';
 
     return $html;
   }

lib/Form/Block/Text.php

@@ -1,7 +1,7 @@
 <?php
 namespace MailPoet\Form\Block;
 
-class Input extends Base {
+class Text extends Base {
 
   static function render($block) {
     $type = 'text';
@@ -15,7 +15,7 @@ class Input extends Base {
 
     $html .= static::renderLabel($block);
 
-    $html .= '<input type="'.$type.'" class="mailpoet_input" ';
+    $html .= '<input type="'.$type.'" class="mailpoet_text" ';
 
     $html .= 'name="'.static::getFieldName($block).'" ';
 

lib/Form/Renderer.php

@@ -49,7 +49,7 @@ class Renderer {
 
   private static function renderBlock($block = array()) {
     $html = '';
-    switch ($block['type']) {
+    switch($block['type']) {
       case 'html':
         $html .= Block\Html::render($block);
       break;
@@ -78,8 +78,8 @@ class Renderer {
         $html .= Block\Select::render($block);
       break;
 
-      case 'input':
-        $html .= Block\Input::render($block);
+      case 'text':
+        $html .= Block\Text::render($block);
       break;
 
       case 'textarea':

lib/Form/Widget.php

@@ -65,6 +65,8 @@ class Widget extends \WP_Widget {
       )
     );
 
+    $form_edit_url = admin_url('admin.php?page=mailpoet-form-editor&id=');
+
     // set title
     $title = isset($instance['title']) ? strip_tags($instance['title']) : '';
 
@@ -102,8 +104,9 @@ class Widget extends \WP_Widget {
           endpoint: 'forms',
           action: 'create'
         }).done(function(response) {
-          if(response !== false) {
-            window.location = response;
+          if(response.result && response.form_id) {
+            window.location =
+              "<?php echo $form_edit_url; ?>" + response.form_id;
           }
         });
         return false;
@@ -194,96 +197,4 @@ class Widget extends \WP_Widget {
       }
     }
   }
-}
-
-// set the content filter to replace the shortcode
-if(isset($_GET['mailpoet_page']) && strlen(trim($_GET['mailpoet_page'])) > 0) {
-  switch($_GET['mailpoet_page']) {
-
-    case 'mailpoet_form_iframe':
-      $id = (isset($_GET['mailpoet_form']) && (int)$_GET['mailpoet_form'] > 0) ? (int)$_GET['mailpoet_form'] : null;
-      $form = Form::findOne($id);
-
-      if($form !== false) {
-        // render form
-        $output = Util\Export::get('html', $form->asArray());
-        // $output = do_shortcode($output);
-        print $output;
-        exit;
-      }
-    break;
-
-    default:
-      // add_filter('wp_title', 'mailpoet_meta_page_title'));
-      add_filter('the_title',   'mailpoet_page_title',    10, 2);
-      add_filter('the_content', 'mailpoet_page_content',  98, 1);
-    break;
-  }
-}
-
-function mailpoet_page_title($title = '', $id = null) {
-  // get signup confirmation page id
-  $signup_confirmation = Setting::getValue('signup_confirmation');
-  $page_id = $signup_confirmation['page'];
-
-  // check if we're on the signup confirmation page
-  if((int)$page_id === (int)$id) {
-    global $post;
-
-    // disable comments
-    $post->comment_status = 'close';
-    // disable password
-    $post->post_password = '';
-
-    $subscriber = null;
-
-    // get subscriber key from url
-    $subscriber_digest = (isset($_GET['mailpoet_key']) && strlen(trim($_GET['mailpoet_key'])) === 32) ? trim($_GET['mailpoet_key']) : null;
-
-    if($subscriber_digest !== null) {
-      // get subscriber
-      // TODO: change select() to selectOne() once it's implemented
-      $subscribers = $mailpoet->subscribers()->select(array(
-        'filter' => array(
-          'subscriber_digest' => $subscriber_digest
-        ),
-        'limit' => 1
-      ));
-
-      if(!empty($subscribers)) {
-        $subscriber = array_shift($subscribers);
-      }
-    }
-
-    // check if we have a subscriber record
-    if($subscriber === null) {
-      return __('Your confirmation link expired, please subscribe again.');
-    } else {
-      // we have a subscriber, let's check its state
-      switch($subscriber['subscriber_state']) {
-        case MailPoetSubscribers::STATE_UNCONFIRMED:
-        case MailPoetSubscribers::STATE_UNSUBSCRIBED:
-          // set subscriber state as confirmed
-          $mailpoet->subscribers()->update(array(
-            'subscriber' => $subscriber['subscriber'],
-            'subscriber_state' => MailPoetSubscribers::STATE_SUBSCRIBED,
-            'subscriber_confirmed_at' => time()
-          ));
-          return __("You've subscribed");
-        break;
-        case MailPoetSubscribers::STATE_SUBSCRIBED:
-          return __("You've already subscribed");
-        break;
-      }
-    }
-  } else {
-    return $title;
-  }
-}
-
-function mailpoet_page_content($content = '') {
-  if(strpos($content, '[mailpoet_page]') !== FALSE) {
-    $content = str_replace('[mailpoet_page]', '', $content);
-  }
-  return $content;
 }

lib/Mailer/API/AmazonSES.php

@@ -1,113 +0,0 @@
-<?php
-namespace MailPoet\Mailer\API;
-
-if(!defined('ABSPATH')) exit;
-
-class AmazonSES {
-  function __construct($region, $accessKey, $secretKey, $from) {
-    $this->awsAccessKey = $accessKey;
-    $this->awsSecret_key = $secretKey;
-    $this->awsRegion = $region;
-    $this->awsEndpoint = sprintf('email.%s.amazonaws.com', $region);
-    $this->awsSigningAlgorithm = 'AWS4-HMAC-SHA256';
-    $this->awsService = 'ses';
-    $this->awsTerminationString = 'aws4_request';
-    $this->hashAlgorithm = 'sha256';
-    $this->url = 'https://' . $this->awsEndpoint;
-    $this->from = $from;
-    $this->date = gmdate('Ymd\THis\Z');
-    $this->dateWithoutTime = gmdate('Ymd');
-  }
-
-  function send($newsletter, $subscriber) {
-    $result = wp_remote_post(
-      $this->url,
-      $this->request($newsletter, $subscriber)
-    );
-    return (
-      !is_wp_error($result) === true &&
-      wp_remote_retrieve_response_code($result) === 200
-    );
-  }
-
-  function getBody($newsletter, $subscriber) {
-    $body = array(
-      'Action' => 'SendEmail',
-      'Version' => '2010-12-01',
-      'Source' => $this->from,
-      'Destination.ToAddresses.member.1' => $subscriber,
-      'Message.Subject.Data' => $newsletter['subject'],
-      'ReturnPath' => $this->from
-    );
-    if(!empty($newsletter['body']['html'])) {
-      $body['Message.Body.Html.Data'] = $newsletter['body']['html'];
-    }
-    if(!empty($newsletter['body']['text'])) {
-      $body['Message.Body.Text.Data'] = $newsletter['body']['text'];
-    }
-    return $body;
-  }
-
-  function request($newsletter, $subscriber) {
-    $body = $this->getBody($newsletter, $subscriber);
-    return array(
-      'timeout' => 10,
-      'httpversion' => '1.1',
-      'method' => 'POST',
-      'headers' => array(
-        'Host' => $this->awsEndpoint,
-        'Authorization' => $this->signRequest($body),
-        'X-Amz-Date' => $this->date
-      ),
-      'body' => urldecode(http_build_query($body))
-    );
-  }
-
-  function signRequest($body) {
-    $stringToSign = $this->createStringToSign(
-      $this->getCredentialScope(),
-      $this->getCanonicalRequest($body)
-    );
-    $signature = hash_hmac($this->hashAlgorithm, $stringToSign, $this->getSigningKey());
-
-    return sprintf(
-      '%s Credential=%s/%s, SignedHeaders=host;x-amz-date, Signature=%s',
-      $this->awsSigningAlgorithm,
-      $this->awsAccessKey,
-      $this->getCredentialScope(),
-      $signature);
-  }
-
-  function getCredentialScope() {
-    return sprintf('%s/%s/%s/%s', $this->dateWithoutTime, $this->awsRegion, $this->awsService, $this->awsTerminationString);
-  }
-
-  function getCanonicalRequest($body) {
-    return implode("\n", array(
-      'POST',
-      '/',
-      '',
-      'host:' . $this->awsEndpoint,
-      'x-amz-date:' . $this->date,
-      '',
-      'host;x-amz-date',
-      hash($this->hashAlgorithm, urldecode(http_build_query($body)))
-    ));
-  }
-
-  function createStringToSign($credentialScope, $canonicalRequest) {
-    return implode("\n", array(
-      $this->awsSigningAlgorithm,
-      $this->date,
-      $credentialScope,
-      hash($this->hashAlgorithm, $canonicalRequest)
-    ));
-  }
-
-  function getSigningKey() {
-    $dateKey = hash_hmac($this->hashAlgorithm, $this->dateWithoutTime, 'AWS4' . $this->awsSecret_key, true);
-    $regionKey = hash_hmac($this->hashAlgorithm, $this->awsRegion, $dateKey, true);
-    $serviceKey = hash_hmac($this->hashAlgorithm, $this->awsService, $regionKey, true);
-    return hash_hmac($this->hashAlgorithm, $this->awsTerminationString, $serviceKey, true);
-  }
-}

lib/Mailer/API/Mandrill.php

@@ -1,71 +0,0 @@
-<?php
-namespace MailPoet\Mailer\API;
-
-if(!defined('ABSPATH')) exit;
-
-class Mandrill {
-  function __construct($apiKey, $fromEmail, $fromName) {
-    $this->url = 'https://mandrillapp.com/api/1.0/messages/send.json';
-    $this->apiKey = $apiKey;
-    $this->fromName = $fromName;
-    $this->fromEmail = $fromEmail;
-  }
-  
-  function send($newsletter, $subscriber) {
-    $result = wp_remote_post(
-      $this->url,
-      $this->request($newsletter, $this->processSubscriber($subscriber))
-    );
-    return (
-      !is_wp_error($result) === true &&
-      !preg_match('!invalid!', $result['body']) === true &&
-      wp_remote_retrieve_response_code($result) === 200
-    );
-  }
-  
-  function processSubscriber($subscriber) {
-    preg_match('!(?P<name>.*?)\s<(?P<email>.*?)>!', $subscriber, $subscriberData);
-    if(!isset($subscriberData['email'])) {
-      $subscriberData = array(
-        'email' => $subscriber,
-      );
-    }
-    return array(
-      'email' => $subscriberData['email'],
-      'name' => (isset($subscriberData['name'])) ? $subscriberData['name'] : ''
-    );
-  }
-  
-  function getBody($newsletter, $subscriber) {
-    $body = array(
-      'key' => $this->apiKey,
-      'message' => array(
-        'from_email' => $this->fromEmail,
-        'from_name' => $this->fromName,
-        'to' => array($subscriber),
-        'subject' => $newsletter['subject']
-      ),
-      'async' => false,
-    );
-    if(!empty($newsletter['body']['html'])) {
-      $body['message']['html'] = $newsletter['body']['html'];
-    }
-    if(!empty($newsletter['body']['text'])) {
-      $body['message']['text'] = $newsletter['body']['text'];
-    }
-    return $body;
-  }
-  
-  function request($newsletter, $subscriber) {
-    $body = $this->getBody($newsletter, $subscriber);
-    return array(
-      'timeout' => 10,
-      'httpversion' => '1.0',
-      'method' => 'POST',
-      'headers' => array(
-        'Content-Type' => 'application/json'
-      ),
-      'body' => json_encode($body)
-    );
-  }
-}

lib/Mailer/MailPoet.php

@@ -1,76 +0,0 @@
-<?php
-namespace MailPoet\Mailer;
-
-if(!defined('ABSPATH')) exit;
-
-class MailPoet {
-  function __construct($apiKey, $fromEmail, $fromName) {
-    $this->url = 'https://bridge.mailpoet.com/api/messages';
-    $this->apiKey = $apiKey;
-    $this->fromEmail = $fromEmail;
-    $this->fromName = $fromName;
-  }
-
-  function send($newsletter, $subscriber) {
-    $result = wp_remote_post(
-      $this->url,
-      $this->request($newsletter, $this->processSubscriber($subscriber))
-    );
-    return (
-      !is_wp_error($result) === true &&
-      wp_remote_retrieve_response_code($result) === 201
-    );
-  }
-
-  function processSubscriber($subscriber) {
-    preg_match('!(?P<name>.*?)\s<(?P<email>.*?)>!', $subscriber, $subscriberData);
-    if(!isset($subscriberData['email'])) {
-      $subscriberData = array(
-        'email' => $subscriber,
-      );
-    }
-    return array(
-      'email' => $subscriberData['email'],
-      'name' => (isset($subscriberData['name'])) ? $subscriberData['name'] : ''
-    );
-  }
-
-  function getBody($newsletter, $subscriber) {
-    $body = array(
-      'to' => (array(
-        'address' => $subscriber['email'],
-        'name' => $subscriber['name']
-      )),
-      'from' => (array(
-        'address' => $this->fromEmail,
-        'name' => $this->fromName
-      )),
-      'subject' => $newsletter['subject']
-    );
-    if(!empty($newsletter['body']['html'])) {
-      $body['html'] = $newsletter['body']['html'];
-    }
-    if(!empty($newsletter['body']['text'])) {
-      $body['text'] = $newsletter['body']['text'];
-    }
-    return $body;
-  }
-
-  function auth() {
-    return 'Basic ' . base64_encode('api:' . $this->apiKey);
-  }
-
-  function request($newsletter, $subscriber) {
-    $body = array($this->getBody($newsletter, $subscriber));
-    return array(
-      'timeout' => 10,
-      'httpversion' => '1.0',
-      'method' => 'POST',
-      'headers' => array(
-        'Content-Type' => 'application/json',
-        'Authorization' => $this->auth()
-      ),
-      'body' => $body
-    );
-  }
-}

lib/Mailer/Mailer.php

@@ -0,0 +1,144 @@
+<?php
+namespace MailPoet\Mailer;
+
+use MailPoet\Models\Setting;
+
+require_once(ABSPATH . 'wp-includes/pluggable.php');
+
+if(!defined('ABSPATH')) exit;
+
+class Mailer {
+  public $mailer;
+  public $sender;
+  public $reply_to;
+  public $mailer_instance;
+
+  function __construct($mailer = false, $sender = false, $reply_to = false) {
+    $this->mailer = $this->getMailer($mailer);
+    $this->sender = $this->getSender($sender);
+    $this->reply_to = $this->getReplyTo($reply_to);
+    $this->mailer_instance = $this->buildMailer();
+  }
+
+  function send($newsletter, $subscriber) {
+    $subscriber = $this->transformSubscriber($subscriber);
+    return $this->mailer_instance->send($newsletter, $subscriber);
+  }
+
+  function buildMailer() {
+    switch($this->mailer['method']) {
+      case 'AmazonSES':
+        $mailer_instance = new $this->mailer['class'](
+          $this->mailer['region'],
+          $this->mailer['access_key'],
+          $this->mailer['secret_key'],
+          $this->sender,
+          $this->reply_to
+        );
+        break;
+      case 'ElasticEmail':
+        $mailer_instance = new $this->mailer['class'](
+          $this->mailer['api_key'],
+          $this->sender,
+          $this->reply_to
+        );
+        break;
+      case 'MailGun':
+        $mailer_instance = new $this->mailer['class'](
+          $this->mailer['domain'],
+          $this->mailer['api_key'],
+          $this->sender,
+          $this->reply_to
+        );
+        break;
+      case 'MailPoet':
+        $mailer_instance = new $this->mailer['class'](
+          $this->mailer['mailpoet_api_key'],
+          $this->sender,
+          $this->reply_to
+        );
+        break;
+      case 'SendGrid':
+        $mailer_instance = new $this->mailer['class'](
+          $this->mailer['api_key'],
+          $this->sender,
+          $this->reply_to
+        );
+        break;
+      case 'PHPMail':
+        $mailer_instance = new $this->mailer['class'](
+          $this->sender,
+          $this->reply_to
+        );
+        break;
+      case 'SMTP':
+        $mailer_instance = new $this->mailer['class'](
+          $this->mailer['host'],
+          $this->mailer['port'],
+          $this->mailer['authentication'],
+          $this->mailer['login'],
+          $this->mailer['password'],
+          $this->mailer['encryption'],
+          $this->sender,
+          $this->reply_to
+        );
+        break;
+      default:
+        throw new \Exception(__('Mailing method does not exist.'));
+        break;
+    }
+    return $mailer_instance;
+  }
+
+  function getMailer($mailer = false) {
+    if(!$mailer) {
+      $mailer = Setting::getValue('mta', null);
+      if(!$mailer || !isset($mailer['method'])) throw new \Exception(__('Mailer is not configured.'));
+    }
+    $mailer['class'] = 'MailPoet\\Mailer\\Methods\\' . $mailer['method'];
+    return $mailer;
+  }
+
+  function getSender($sender = false) {
+    if(!$sender) {
+      $sender = Setting::getValue('sender', null);
+      if(!$sender) throw new \Exception(__('Sender name and email are not configured.'));
+    }
+    return array(
+      'from_name' => $sender['name'],
+      'from_email' => $sender['address'],
+      'from_name_email' => sprintf('%s <%s>', $sender['name'], $sender['address'])
+    );
+  }
+
+  function getReplyTo($reply_to = false) {
+    if(!$reply_to) {
+      $reply_to = Setting::getValue('reply_to', null);
+      if(!$reply_to) {
+        $reply_to = array(
+          'name' => $this->sender['from_name'],
+          'address' => $this->sender['from_email']
+        );
+      }
+    }
+    if(!$reply_to['address']) {
+      $reply_to['address'] = $this->sender['from_email'];
+    }
+    return array(
+      'reply_to_name' => $reply_to['name'],
+      'reply_to_email' => $reply_to['address'],
+      'reply_to_name_email' => sprintf('%s <%s>', $reply_to['name'], $reply_to['address'])
+    );
+  }
+
+  function transformSubscriber($subscriber) {
+    if(!is_array($subscriber)) return $subscriber;
+    if(isset($subscriber['address'])) $subscriber['email'] = $subscriber['address'];
+    $first_name = (isset($subscriber['first_name'])) ? $subscriber['first_name'] : '';
+    $last_name = (isset($subscriber['last_name'])) ? $subscriber['last_name'] : '';
+    if(!$first_name && !$last_name) return $subscriber['email'];
+    $subscriber = sprintf('%s %s <%s>', $first_name, $last_name, $subscriber['email']);
+    $subscriber = trim(preg_replace('!\s\s+!', ' ', $subscriber));
+    return $subscriber;
+  }
+}

lib/Mailer/Methods/AmazonSES.php

@@ -0,0 +1,158 @@
+<?php
+namespace MailPoet\Mailer\Methods;
+
+if(!defined('ABSPATH')) exit;
+
+class AmazonSES {
+  public $aws_access_key;
+  public $aws_secret_key;
+  public $aws_region;
+  public $aws_endpoint;
+  public $aws_signing_algorithm;
+  public $aws_service;
+  public $aws_termination_string;
+  public $hash_algorithm;
+  public $url;
+  public $sender;
+  public $reply_to;
+  public $date;
+  public $date_without_time;
+
+  function __construct($region, $access_key, $secret_key, $sender, $reply_to) {
+    $this->aws_access_key = $access_key;
+    $this->aws_secret_key = $secret_key;
+    $this->aws_region = $region;
+    $this->aws_endpoint = sprintf('email.%s.amazonaws.com', $this->aws_region);
+    $this->aws_signing_algorithm = 'AWS4-HMAC-SHA256';
+    $this->aws_service = 'ses';
+    $this->aws_termination_string = 'aws4_request';
+    $this->hash_algorithm = 'sha256';
+    $this->url = 'https://' . $this->aws_endpoint;
+    $this->sender = $sender;
+    $this->reply_to = $reply_to;
+    $this->date = gmdate('Ymd\THis\Z');
+    $this->date_without_time = gmdate('Ymd');
+  }
+
+  function send($newsletter, $subscriber) {
+    $result = wp_remote_post(
+      $this->url,
+      $this->request($newsletter, $subscriber)
+    );
+    return (
+      !is_wp_error($result) === true &&
+      wp_remote_retrieve_response_code($result) === 200
+    );
+  }
+
+  function getBody($newsletter, $subscriber) {
+    $body = array(
+      'Action' => 'SendEmail',
+      'Version' => '2010-12-01',
+      'Destination.ToAddresses.member.1' => $subscriber,
+      'Source' => $this->sender['from_name_email'],
+      'ReplyToAddresses.member.1' => $this->reply_to['reply_to_name_email'],
+      'Message.Subject.Data' => $newsletter['subject'],
+      'ReturnPath' => $this->sender['from_name_email'],
+    );
+    if(!empty($newsletter['body']['html'])) {
+      $body['Message.Body.Html.Data'] = $newsletter['body']['html'];
+    }
+    if(!empty($newsletter['body']['text'])) {
+      $body['Message.Body.Text.Data'] = $newsletter['body']['text'];
+    }
+    return $body;
+  }
+
+  function request($newsletter, $subscriber) {
+    $body = $this->getBody($newsletter, $subscriber);
+    return array(
+      'timeout' => 10,
+      'httpversion' => '1.1',
+      'method' => 'POST',
+      'headers' => array(
+        'Host' => $this->aws_endpoint,
+        'Authorization' => $this->signRequest($body),
+        'X-Amz-Date' => $this->date
+      ),
+      'body' => urldecode(http_build_query($body))
+    );
+  }
+
+  function signRequest($body) {
+    $string_to_sign = $this->createStringToSign(
+      $this->getCredentialScope(),
+      $this->getCanonicalRequest($body)
+    );
+    $signature = hash_hmac(
+      $this->hash_algorithm,
+      $string_to_sign,
+      $this->getSigningKey()
+    );
+
+    return sprintf(
+      '%s Credential=%s/%s, SignedHeaders=host;x-amz-date, Signature=%s',
+      $this->aws_signing_algorithm,
+      $this->aws_access_key,
+      $this->getCredentialScope(),
+      $signature);
+  }
+
+  function getCredentialScope() {
+    return sprintf(
+      '%s/%s/%s/%s',
+      $this->date_without_time,
+      $this->aws_region,
+      $this->aws_service,
+      $this->aws_termination_string);
+  }
+
+  function getCanonicalRequest($body) {
+    return implode("\n", array(
+      'POST',
+      '/',
+      '',
+      'host:' . $this->aws_endpoint,
+      'x-amz-date:' . $this->date,
+      '',
+      'host;x-amz-date',
+      hash($this->hash_algorithm, urldecode(http_build_query($body)))
+    ));
+  }
+
+  function createStringToSign($credential_scope, $canonical_request) {
+    return implode("\n", array(
+      $this->aws_signing_algorithm,
+      $this->date,
+      $credential_scope,
+      hash($this->hash_algorithm, $canonical_request)
+    ));
+  }
+
+  function getSigningKey() {
+    $date_key = hash_hmac(
+      $this->hash_algorithm,
+      $this->date_without_time,
+      'AWS4' . $this->aws_secret_key,
+      true
+    );
+    $region_key = hash_hmac(
+      $this->hash_algorithm,
+      $this->aws_region,
+      $date_key,
+      true
+    );
+    $service_key = hash_hmac(
+      $this->hash_algorithm,
+      $this->aws_service,
+      $region_key,
+      true
+    );
+    return hash_hmac(
+      $this->hash_algorithm,
+      $this->aws_termination_string,
+      $service_key,
+      true
+    );
+  }
+}

lib/Mailer/Methods/ElasticEmail.php

@@ -1,14 +1,18 @@
 <?php
-namespace MailPoet\Mailer\API;
+namespace MailPoet\Mailer\Methods;
 
 if(!defined('ABSPATH')) exit;
 
 class ElasticEmail {
-  function __construct($apiKey, $fromEmail, $fromName) {
-    $this->url = 'https://api.elasticemail.com/mailer/send';
-    $this->apiKey = $apiKey;
-    $this->fromEmail = $fromEmail;
-    $this->fromName = $fromName;
+  public $url = 'https://api.elasticemail.com/mailer/send';
+  public $api_key;
+  public $sender;
+  public $reply_to;
+
+  function __construct($api_key, $sender, $reply_to) {
+    $this->api_key = $api_key;
+    $this->sender = $sender;
+    $this->reply_to = $reply_to;
   }
 
   function send($newsletter, $subscriber) {
@@ -23,10 +27,12 @@ class ElasticEmail {
 
   function getBody($newsletter, $subscriber) {
     $body = array(
-      'api_key' => $this->apiKey,
-      'from' => $this->fromEmail,
-      'from_name' => $this->fromName,
+      'api_key' => $this->api_key,
       'to' => $subscriber,
+      'from' => $this->sender['from_email'],
+      'from_name' => $this->sender['from_name'],
+      'reply_to' => $this->reply_to['reply_to_email'],
+      'reply_to_name' => $this->reply_to['reply_to_name'],
       'subject' => $newsletter['subject']
     );
     if(!empty($newsletter['body']['html'])) {

lib/Mailer/Methods/MailGun.php

@@ -1,13 +1,19 @@
 <?php
-namespace MailPoet\Mailer\API;
+namespace MailPoet\Mailer\Methods;
 
 if(!defined('ABSPATH')) exit;
 
 class MailGun {
-  function __construct($domain, $apiKey, $from) {
+  public $url;
+  public $api_key;
+  public $sender;
+  public $reply_to;
+
+  function __construct($domain, $api_key, $sender, $reply_to) {
     $this->url = sprintf('https://api.mailgun.net/v3/%s/messages', $domain);
-    $this->apiKey = $apiKey;
-    $this->from = $from;
+    $this->api_key = $api_key;
+    $this->sender = $sender;
+    $this->reply_to = $reply_to;
   }
 
   function send($newsletter, $subscriber) {
@@ -23,8 +29,9 @@ class MailGun {
 
   function getBody($newsletter, $subscriber) {
     $body = array(
-      'from' => $this->from,
       'to' => $subscriber,
+      'from' => $this->sender['from_name_email'],
+      'h:Reply-To' => $this->reply_to['reply_to_name_email'],
       'subject' => $newsletter['subject']
     );
     if(!empty($newsletter['body']['html'])) {
@@ -37,7 +44,7 @@ class MailGun {
   }
 
   function auth() {
-    return 'Basic ' . base64_encode('api:' . $this->apiKey);
+    return 'Basic ' . base64_encode('api:' . $this->api_key);
   }
 
   function request($newsletter, $subscriber) {

lib/Mailer/Methods/MailPoet.php

@@ -0,0 +1,98 @@
+<?php
+namespace MailPoet\Mailer\Methods;
+
+if(!defined('ABSPATH')) exit;
+
+class MailPoet {
+  public $url = 'https://bridge.mailpoet.com/api/messages';
+  public $api_key;
+  public $sender;
+  public $reply_to;
+
+  function __construct($api_key, $sender, $reply_to) {
+    $this->api_key = $api_key;
+    $this->sender = $sender;
+    $this->reply_to = $reply_to;
+  }
+
+  function send($newsletter, $subscriber) {
+    $message_body = $this->getBody($newsletter, $subscriber);
+    $result = wp_remote_post(
+      $this->url,
+      $this->request($message_body)
+    );
+    return (
+      !is_wp_error($result) === true &&
+      wp_remote_retrieve_response_code($result) === 201
+    );
+  }
+
+  function processSubscriber($subscriber) {
+    preg_match('!(?P<name>.*?)\s<(?P<email>.*?)>!', $subscriber, $subscriber_data);
+    if(!isset($subscriber_data['email'])) {
+      $subscriber_data = array(
+        'email' => $subscriber,
+      );
+    }
+    return array(
+      'email' => $subscriber_data['email'],
+      'name' => (isset($subscriber_data['name'])) ? $subscriber_data['name'] : ''
+    );
+  }
+
+  function getBody($newsletter, $subscriber) {
+    $composeBody = function ($newsletter, $subscriber) {
+      $body = array(
+        'to' => (array(
+          'address' => $subscriber['email'],
+          'name' => $subscriber['name']
+        )),
+        'from' => (array(
+          'address' => $this->sender['from_email'],
+          'name' => $this->sender['from_name']
+        )),
+        'reply_to' => (array(
+          'address' => $this->reply_to['reply_to_email'],
+          'name' => $this->reply_to['reply_to_name']
+        )),
+        'subject' => $newsletter['subject']
+      );
+      if(!empty($newsletter['body']['html'])) {
+        $body['html'] = $newsletter['body']['html'];
+      }
+      if(!empty($newsletter['body']['text'])) {
+        $body['text'] = $newsletter['body']['text'];
+      }
+      return $body;
+    };
+    if(is_array($newsletter) && is_array($subscriber)) {
+      $body = array();
+      for($record = 0; $record < count($newsletter); $record++) {
+        $body[] = $composeBody(
+          $newsletter[$record],
+          $this->processSubscriber($subscriber[$record])
+        );
+      }
+    } else {
+      $body[] = $composeBody($newsletter, $this->processSubscriber($subscriber));
+    }
+    return $body;
+  }
+
+  function auth() {
+    return 'Basic ' . base64_encode('api:' . $this->api_key);
+  }
+
+  function request($body) {
+    return array(
+      'timeout' => 10,
+      'httpversion' => '1.0',
+      'method' => 'POST',
+      'headers' => array(
+        'Content-Type' => 'application/json',
+        'Authorization' => $this->auth()
+      ),
+      'body' => json_encode($body)
+    );
+  }
+}

lib/Mailer/Methods/PHPMail.php

@@ -0,0 +1,64 @@
+<?php
+namespace MailPoet\Mailer\Methods;
+
+if(!defined('ABSPATH')) exit;
+
+class PHPMail {
+  public $sender;
+  public $reply_to;
+  public $mailer;
+
+  function __construct($sender, $reply_to) {
+    $this->sender = $sender;
+    $this->reply_to = $reply_to;
+    $this->mailer = $this->buildMailer();
+  }
+
+  function send($newsletter, $subscriber) {
+    try {
+      $message = $this->createMessage($newsletter, $subscriber);
+      $result = $this->mailer->send($message);
+    } catch(\Exception $e) {
+      $result = false;
+    }
+    return ($result === 1);
+  }
+
+  function buildMailer() {
+    $transport = \Swift_SmtpTransport::newInstance();
+    $transport->setTimeout(10);
+    return \Swift_Mailer::newInstance($transport);
+  }
+
+  function createMessage($newsletter, $subscriber) {
+    $message = \Swift_Message::newInstance()
+      ->setTo($this->processSubscriber($subscriber))
+      ->setFrom(array(
+          $this->sender['from_email'] => $this->sender['from_name']
+        ))
+      ->setReplyTo(array(
+          $this->reply_to['reply_to_email'] =>  $this->reply_to['reply_to_name']
+        ))
+      ->setSubject($newsletter['subject']);
+    if(!empty($newsletter['body']['html'])) {
+      $message = $message->setBody($newsletter['body']['html'], 'text/html');
+    }
+    if(!empty($newsletter['body']['text'])) {
+      $message = $message->addPart($newsletter['body']['text'], 'text/plain');
+    }
+    return $message;
+  }
+
+  function processSubscriber($subscriber) {
+    preg_match('!(?P<name>.*?)\s<(?P<email>.*?)>!', $subscriber, $subscriber_data);
+    if(!isset($subscriber_data['email'])) {
+      $subscriber_data = array(
+        'email' => $subscriber,
+      );
+    }
+    return array(
+      $subscriber_data['email'] =>
+        (isset($subscriber_data['name'])) ? $subscriber_data['name'] : ''
+    );
+  }
+}

lib/Mailer/Methods/SMTP.php

@@ -1,19 +1,30 @@
 <?php
-namespace MailPoet\Mailer;
+namespace MailPoet\Mailer\Methods;
 
 if(!defined('ABSPATH')) exit;
 
 class SMTP {
-  function __construct($host, $port, $authentication, $login = null, $password = null, $encryption,
-    $fromEmail, $fromName) {
+  public $host;
+  public $port;
+  public $authentication;
+  public $login;
+  public $password;
+  public $encryption;
+  public $sender;
+  public $reply_to;
+  public $mailer;
+
+  function __construct(
+    $host, $port, $authentication, $login = null, $password = null, $encryption,
+    $sender, $reply_to) {
     $this->host = $host;
     $this->port = $port;
     $this->authentication = $authentication;
     $this->login = $login;
     $this->password = $password;
     $this->encryption = $encryption;
-    $this->fromName = $fromName;
-    $this->fromEmail = $fromEmail;
+    $this->sender = $sender;
+    $this->reply_to = $reply_to;
     $this->mailer = $this->buildMailer();
   }
 
@@ -22,7 +33,6 @@ class SMTP {
       $message = $this->createMessage($newsletter, $subscriber);
       $result = $this->mailer->send($message);
     } catch(\Exception $e) {
-      !d($e->getMessage());exit;
       $result = false;
     }
     return ($result === 1);
@@ -40,11 +50,15 @@ class SMTP {
     return \Swift_Mailer::newInstance($transport);
   }
 
-
   function createMessage($newsletter, $subscriber) {
     $message = \Swift_Message::newInstance()
-      ->setFrom(array($this->fromEmail => $this->fromName))
       ->setTo($this->processSubscriber($subscriber))
+      ->setFrom(array(
+          $this->sender['from_email'] => $this->sender['from_name']
+        ))
+      ->setReplyTo(array(
+          $this->reply_to['reply_to_email'] =>  $this->reply_to['reply_to_name']
+        ))
       ->setSubject($newsletter['subject']);
     if(!empty($newsletter['body']['html'])) {
       $message = $message->setBody($newsletter['body']['html'], 'text/html');
@@ -56,15 +70,15 @@ class SMTP {
   }
 
   function processSubscriber($subscriber) {
-    preg_match('!(?P<name>.*?)\s<(?P<email>.*?)>!', $subscriber, $subscriberData);
-    if(!isset($subscriberData['email'])) {
-      $subscriberData = array(
+    preg_match('!(?P<name>.*?)\s<(?P<email>.*?)>!', $subscriber, $subscriber_data);
+    if(!isset($subscriber_data['email'])) {
+      $subscriber_data = array(
         'email' => $subscriber,
       );
     }
     return array(
-      $subscriberData['email'] =>
-        (isset($subscriberData['name'])) ? $subscriberData['name'] : '',
+      $subscriber_data['email'] =>
+        (isset($subscriber_data['name'])) ? $subscriber_data['name'] : ''
     );
   }
 }

lib/Mailer/Methods/SendGrid.php

@@ -1,14 +1,18 @@
 <?php
-namespace MailPoet\Mailer\API;
+namespace MailPoet\Mailer\Methods;
 
 if(!defined('ABSPATH')) exit;
 
 class SendGrid {
-  function __construct($apiKey, $fromEmail, $fromName) {
-    $this->url = 'https://api.sendgrid.com/api/mail.send.json';
-    $this->apiKey = $apiKey;
-    $this->fromEmail = $fromEmail;
-    $this->fromName = $fromName;
+  public $url = 'https://api.sendgrid.com/api/mail.send.json';
+  public $api_key;
+  public $sender;
+  public $reply_to;
+
+  function __construct($api_key, $sender, $reply_to) {
+    $this->api_key = $api_key;
+    $this->sender = $sender;
+    $this->reply_to = $reply_to;
   }
 
   function send($newsletter, $subscriber) {
@@ -16,10 +20,11 @@ class SendGrid {
       $this->url,
       $this->request($newsletter, $subscriber)
     );
+    $result_body = json_decode($result['body'], true);
     return (
       !is_wp_error($result) === true &&
       !preg_match('!invalid!', $result['body']) === true &&
-      !isset(json_decode($result['body'], true)['errors']) === true &&
+      !isset($result_body['errors']) === true &&
       wp_remote_retrieve_response_code($result) === 200
     );
   }
@@ -27,8 +32,9 @@ class SendGrid {
   function getBody($newsletter, $subscriber) {
     $body = array(
       'to' => $subscriber,
-      'from' => $this->fromEmail,
-      'fromname' => $this->fromName,
+      'from' => $this->sender['from_email'],
+      'fromname' => $this->sender['from_name'],
+      'replyto' => $this->reply_to['reply_to_email'],
       'subject' => $newsletter['subject']
     );
     if(!empty($newsletter['body']['html'])) {
@@ -41,7 +47,7 @@ class SendGrid {
   }
 
   function auth() {
-    return 'Bearer ' . $this->apiKey;
+    return 'Bearer ' . $this->api_key;
   }
 
   function request($newsletter, $subscriber) {
@@ -53,7 +59,7 @@ class SendGrid {
       'headers' => array(
         'Authorization' => $this->auth()
       ),
-      'body' => urldecode(http_build_query($body))
+      'body' => http_build_query($body)
     );
   }
 }

lib/Mailer/WPMail.php

@@ -1,61 +0,0 @@
-<?php
-namespace MailPoet\Mailer;
-require_once(ABSPATH . 'wp-includes/pluggable.php');
-
-if(!defined('ABSPATH')) exit;
-
-class WPMail {
-  function __construct($fromEmail, $fromName) {
-    $this->fromEmail = $fromEmail;
-    $this->fromName = $fromName;
-    add_filter('wp_mail_from', array(
-      $this,
-      'setFromEmail'
-    ));
-    $this->filters = array(
-      'wp_mail_from' => 'setFromEmail',
-      'wp_mail_from_name' => 'setFromName',
-      'wp_mail_content_type' => 'setContentType'
-    );
-  }
-
-  function addFilters() {
-    foreach($this->filters as $filter => $method) {
-      add_filter($filter, array(
-        $this,
-        $method
-      ));
-    }
-  }
-
-  function removeFilters() {
-    foreach($this->filters as $filter => $method) {
-      remove_filter($filter, array(
-        $this,
-        $method
-      ));
-    }
-  }
-
-  function setFromEmail() {
-    return $this->fromEmail;
-  }
-
-  function setFromName() {
-    return $this->fromName;
-  }
-
-  function setContentType() {
-    return 'text/html';
-  }
-
-  function send($newsletter, $subscriber) {
-    $this->addFilters();
-    $result = wp_mail(
-      $subscriber, $newsletter['subject'],
-      (!empty($newsletter['body']['html'])) ? $newsletter['body']['html'] : $newsletter['body']['text']
-    );
-    $this->removeFilters();
-    return ($result === true);
-  }
-}

lib/Models/CustomField.php

@@ -19,20 +19,24 @@ class CustomField extends Model {
   function asArray() {
     $model = parent::asArray();
 
-    $model['params'] = (
-      is_serialized($this->params)
-      ? unserialize($this->params)
-      : $this->params
-    );
-
+    if(isset($model['params'])) {
+      $model['params'] = (
+        is_array($this->params)
+        ? $this->params
+        : unserialize($this->params)
+      );
+    }
     return $model;
   }
 
   function save() {
+    if(is_null($this->params)) {
+      $this->params = array();
+    }
     $this->set('params', (
-      is_serialized($this->params)
-      ? $this->params
-      : serialize($this->params)
+      is_array($this->params)
+      ? serialize($this->params)
+      : $this->params
     ));
     return parent::save();
   }
@@ -54,7 +58,7 @@ class CustomField extends Model {
     }
 
     // set name as label by default
-    if(empty($data['params']['label'])) {
+    if(empty($data['params']['label']) && isset($data['name'])) {
       $data['params']['label'] = $data['name'];
     }
 
@@ -66,12 +70,6 @@ class CustomField extends Model {
       $custom_field->set($data);
     }
 
-    try {
-      $custom_field->save();
-      return $custom_field;
-    } catch(Exception $e) {
-      return $custom_field->getValidationErrors();
-    }
-    return false;
+    return $custom_field->save();
   }
 }

lib/Models/Model.php

@@ -4,7 +4,10 @@ namespace MailPoet\Models;
 if(!defined('ABSPATH')) exit;
 
 class Model extends \Sudzy\ValidModel {
+  protected $_errors;
+
   function __construct() {
+    $this->_errors = array();
     $customValidators = new CustomValidator();
     parent::__construct($customValidators->init());
   }
@@ -13,16 +16,37 @@ class Model extends \Sudzy\ValidModel {
     return parent::create();
   }
 
+  function getErrors() {
+    if(empty($this->_errors)) {
+      return false;
+    } else {
+      return $this->_errors;
+    }
+  }
+
+  function setError($error = '') {
+    if(!empty($error)) {
+      if(is_array($error)) {
+        $this->_errors = array_merge($this->_errors, $error);
+        $this->_errors = array_unique($this->_errors);
+      } else {
+        $this->_errors[] = $error;
+      }
+    }
+  }
+
   function save() {
     $this->setTimestamp();
     try {
       parent::save();
-      return true;
-    } catch (\Sudzy\ValidationException $e) {
-      return array_unique($e->getValidationErrors());
-    } catch (\PDOException $e) {
-      return $e->getMessage();
+    } catch(\Sudzy\ValidationException $e) {
+      $this->setError($e->getValidationErrors());
+    } catch(\PDOException $e) {
+      $this->setError($e->getMessage());
+    } catch(\Exception $e) {
+      $this->setError($e->getMessage());
     }
+    return $this;
   }
 
   function trash() {

lib/Models/Newsletter.php

@@ -8,6 +8,10 @@ class Newsletter extends Model {
 
   function __construct() {
     parent::__construct();
+
+    $this->addValidations('type', array(
+      'required' => __('You need to specify a type.')
+    ));
   }
 
   function save() {
@@ -15,9 +19,23 @@ class Newsletter extends Model {
       $this->set_expr('deleted_at', 'NULL');
     }
 
+    $this->set('body',
+      is_array($this->body)
+      ? json_encode($this->body)
+      : $this->body
+    );
     return parent::save();
   }
 
+  function asArray() {
+    $model = parent::asArray();
+
+    if(isset($model['body'])) {
+      $model['body'] = json_decode($model['body'], true);
+    }
+    return $model;
+  }
+
   function delete() {
     // delete all relations to segments
     NewsletterSegment::where('newsletter_id', $this->id)->deleteMany();

lib/Models/NewsletterTemplate.php

@@ -17,6 +17,14 @@ class NewsletterTemplate extends Model {
     ));
   }
 
+  function asArray() {
+    $template = parent::asArray();
+    if(isset($template['body'])) {
+      $template['body'] = json_decode($template['body'], true);
+    }
+    return $template;
+  }
+
   static function createOrUpdate($data = array()) {
     $template = false;
 
@@ -32,16 +40,7 @@ class NewsletterTemplate extends Model {
       $template->set($data);
     }
 
-    $saved = $template->save();
-
-    if($saved === true) {
-      return true;
-    } else {
-      $errors = $template->getValidationErrors();
-      if(!empty($errors)) {
-        return $errors;
-      }
-    }
-    return false;
+    $template->save();
+    return $template;
   }
 }

lib/Models/Segment.php

@@ -164,8 +164,7 @@ class Segment extends Model {
       $segment->set($data);
     }
 
-    $segment->save();
-    return $segment;
+    return $segment->save();
   }
 
   static function getPublic() {

lib/Models/SendingQueue.php

@@ -4,7 +4,7 @@ namespace MailPoet\Models;
 if(!defined('ABSPATH')) exit;
 
 class SendingQueue extends Model {
-  public static $_table = MP_SENDING_QUEUE_TABLE;
+  public static $_table = MP_SENDING_QUEUES_TABLE;
 
   function __construct() {
     parent::__construct();

lib/Models/Setting.php

@@ -10,32 +10,79 @@ class Setting extends Model {
     parent::__construct();
 
     $this->addValidations('name', array(
-      'required' => 'name_is_blank',
-      'isString' => 'name_is_not_string'
+      'required' => __('You need to specify a name.')
     ));
   }
 
   public static function getValue($key, $default = null) {
-    $setting = Setting::where('name', $key)->findOne();
-    if($setting === false) {
-      return $default;
-    } else {
-      if(is_serialized($setting->value)) {
-        return unserialize($setting->value);
+    $keys = explode('.', $key);
+
+    if(count($keys) === 1) {
+      $setting = Setting::where('name', $key)->findOne();
+      if($setting === false) {
+        return $default;
       } else {
-        return $setting->value;
+        if(is_serialized($setting->value)) {
+          return unserialize($setting->value);
+        } else {
+          return $setting->value;
+        }
       }
+    } else {
+      $main_key = array_shift($keys);
+
+      $setting = static::getValue($main_key, $default);
+
+      if($setting !== $default) {
+        for($i = 0, $count = count($keys); $i < $count; $i++) {
+          if(array_key_exists($keys[$i], $setting)) {
+            $setting = $setting[$keys[$i]];
+          } else {
+            return $default;
+          }
+        }
+      }
+      return $setting;
     }
   }
 
   public static function setValue($key, $value) {
-    if(is_array($value)) {
-      $value = serialize($value);
+    $keys = explode('.', $key);
+
+    if(count($keys) === 1) {
+      if(is_array($value)) {
+        $value = serialize($value);
+      }
+
+      $setting = Setting::createOrUpdate(array(
+        'name' => $key,
+        'value' => $value
+      ));
+      return ($setting->id() > 0 && $setting->getErrors() === false);
+    } else {
+      $main_key = array_shift($keys);
+
+      $setting_value = static::getValue($main_key, array());
+      $current_value = &$setting_value;
+      $last_key = array_pop($keys);
+
+      foreach($keys as $key) {
+        if(!is_array($current_value)) {
+          $current_value = array();
+        }
+
+        if(!array_key_exists($key, $current_value)) {
+          $current_value = array($key => array());
+        }
+        $current_value =& $current_value[$key];
+      }
+      if(is_scalar($current_value)) {
+        $current_value = array();
+      }
+      $current_value[$last_key] = $value;
+
+      return static::setValue($main_key, $setting_value);
     }
-    return Setting::createOrUpdate(array(
-      'name' => $key,
-      'value' => $value
-    ));
   }
 
   public static function getAll() {
@@ -54,8 +101,7 @@ class Setting extends Model {
   }
 
   public static function createOrUpdate($model) {
-    $exists = self::where('name', $model['name'])
-      ->find_one();
+    $exists = self::where('name', $model['name'])->findOne();
 
     if($exists === false) {
       $new_model = self::create();

lib/Models/Subscriber.php

@@ -32,6 +32,51 @@ class Subscriber extends Model {
     return parent::delete();
   }
 
+  function addToSegments(array $segment_ids = array()) {
+    $segments = Segment::whereIn('id', $segment_ids)->findMany();
+    foreach($segments as $segment) {
+      $association = SubscriberSegment::create();
+      $association->subscriber_id = $this->id;
+      $association->segment_id = $segment->id;
+      $association->save();
+    }
+  }
+
+  function sendConfirmationEmail() {
+    $this->set('status', 'unconfirmed');
+
+    // TODO
+  }
+
+  static function subscribe($subscriber_data = array(), $segment_ids = array()) {
+    if(empty($subscriber_data) or empty($segment_ids)) {
+      return false;
+    }
+
+    $subscriber = static::createOrUpdate($subscriber_data);
+
+    if($subscriber !== false && $subscriber->id() > 0) {
+      // restore deleted subscriber
+      if($subscriber->deleted_at !== NULL) {
+        $subscriber->setExpr('deleted_at', 'NULL');
+      }
+
+      if((bool)Setting::getValue('signup_confirmation.enabled')) {
+        if($subscriber->status !== 'subscribed') {
+          $subscriber->sendConfirmationEmail();
+        }
+      } else {
+        $subscriber->set('status', 'subscribed');
+      }
+
+      if($subscriber->save()) {
+        $subscriber->addToSegments($segment_ids);
+      }
+    }
+
+    return $subscriber;
+  }
+
   static function search($orm, $search = '') {
     if(strlen(trim($search) === 0)) {
       return $orm;
@@ -154,7 +199,7 @@ class Subscriber extends Model {
       $orm = $orm->selectExpr(
         'CASE WHEN ' .
         MP_CUSTOM_FIELDS_TABLE . '.id=' . $customField['id'] . ' THEN ' .
-        MP_SUBSCRIBER_CUSTOM_FIELD_TABLE . '.value END as "' . $customField['name'].'"');
+        MP_SUBSCRIBER_CUSTOM_FIELD_TABLE . '.value END as "' . $customField['id'].'"');
     }
     $orm = $orm
       ->leftOuterJoin(
@@ -181,21 +226,82 @@ class Subscriber extends Model {
     $subscriber = false;
 
     if(isset($data['id']) && (int)$data['id'] > 0) {
-      $subscriber = self::findOne((int)$data['id']);
+      $subscriber = static::findOne((int)$data['id']);
       unset($data['id']);
     }
 
+    if($subscriber === false && !empty($data['email'])) {
+      $subscriber = static::where('email', $data['email'])->findOne();
+      if($subscriber !== false) {
+        unset($data['email']);
+      }
+    }
+
+    // custom fields
+    $custom_fields = array();
+
+    foreach($data as $key => $value) {
+      if(strpos($key, 'cf_') === 0) {
+        $custom_fields[(int)substr($key, 3)] = $value;
+        unset($data[$key]);
+      }
+    }
+
     if($subscriber === false) {
-      $subscriber = self::create();
+      $subscriber = static::create();
       $subscriber->hydrate($data);
     } else {
       $subscriber->set($data);
     }
 
-    $subscriber->save();
+    if($subscriber->save()) {
+      if(!empty($custom_fields)) {
+        foreach($custom_fields as $custom_field_id => $value) {
+          $subscriber->setCustomField($custom_field_id, $value);
+        }
+      }
+    }
     return $subscriber;
   }
 
+  function withCustomFields() {
+    $custom_fields = CustomField::select('id')->findArray();
+    if(empty($custom_fields)) return $this;
+
+    $custom_field_ids = Helpers::arrayColumn($custom_fields, 'id');
+    $relations = SubscriberCustomField::select('custom_field_id')
+      ->select('value')
+      ->whereIn('custom_field_id', $custom_field_ids)
+      ->where('subscriber_id', $this->id())
+      ->findMany();
+    foreach($relations as $relation) {
+      $this->{'cf_'.$relation->custom_field_id} = $relation->value;
+    }
+
+    return $this;
+  }
+
+  function getCustomField($custom_field_id, $default = null) {
+    $custom_field = SubscriberCustomField::select('value')
+      ->where('custom_field_id', $custom_field_id)
+      ->where('subscriber_id', $this->id())
+      ->findOne();
+
+    if($custom_field === false) {
+      return $default;
+    } else {
+      return $custom_field->value;
+    }
+  }
+
+  function setCustomField($custom_field_id, $value) {
+    return SubscriberCustomField::createOrUpdate(array(
+      'subscriber_id' => $this->id(),
+      'custom_field_id' => $custom_field_id,
+      'value' => $value
+    ));
+  }
+
   static function bulkMoveToList($orm, $data = array()) {
     $segment_id = (isset($data['segment_id']) ? (int)$data['segment_id'] : 0);
     $segment = Segment::findOne($segment_id);
@@ -273,8 +379,7 @@ class Subscriber extends Model {
 
     if(!empty($subscribers)) {
       foreach($subscribers as $subscriber) {
-        // TODO: send confirmation email
-        // $subscriber->sendConfirmationEmail()
+        $subscriber->sendConfirmationEmail();
       }
 
       return $subscribers->count();

lib/Models/SubscriberCustomField.php

@@ -12,6 +12,49 @@ class SubscriberCustomField extends Model {
     parent::__construct();
   }
 
+  static function createOrUpdate($data = array()) {
+    $custom_field = CustomField::findOne($data['custom_field_id']);
+    if($custom_field === false) {
+      return false;
+    } else {
+      $custom_field = $custom_field->asArray();
+    }
+
+    if($custom_field['type'] === 'date') {
+      if(is_array($data['value'])) {
+        $day = (
+          isset($data['value']['day'])
+          ? (int)$data['value']['day']
+          : 1
+        );
+        $month = (
+          isset($data['value']['month'])
+          ? (int)$data['value']['month']
+          : 1
+        );
+        $year = (
+          isset($data['value']['year'])
+          ? (int)$data['value']['year']
+          : 1970
+        );
+        $data['value'] = mktime(0, 0, 0, $month, $day, $year);
+      }
+    }
+
+    $relation = self::where('custom_field_id', $data['custom_field_id'])
+      ->where('subscriber_id', $data['subscriber_id'])
+      ->findOne();
+
+    if($relation === false) {
+      $relation = self::create();
+      $relation->hydrate($data);
+    } else {
+      $relation->set($data);
+    }
+
+    return $relation->save();
+  }
+
   static function createMultiple($values) {
     $values = array_map('array_values', $values);
     return self::rawExecute(