Bump up version to 0.0.19

Editor rendering (Part 2)

.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=""

RoboFile.php

@@ -105,7 +105,18 @@ 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($file = null) {
+    $this->loadEnv();
+    $this->_exec('vendor/bin/codecept build');
+    $this->_exec(join(' ', array(
+      'vendor/bin/codecept run',
+      (($file) ? $file : ''),
+      '--coverage',
+      '--coverage-html'
+    )));
   }
 
   function testJavascript() {

assets/css/src/admin.styl

@@ -17,3 +17,5 @@
 
 @require 'settings'
 @require 'progress_bar'
+
+@require 'subscribers'

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 250ms ease-out
+  transition: margin 350ms ease-out
 
 .mailpoet_panel_wrapper
   background-color: #f1f1f1

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,9 +106,10 @@ $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()
 
   .mailpoet_delete_block_confirm,
   .mailpoet_delete_block_cancel
@@ -95,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

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

@@ -37,3 +37,6 @@
 
   input[type=text]
     vertical-align: middle
+
+.mailpoet_form_field_block
+  display: block

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

@@ -38,9 +38,7 @@
       content: '\f142'
 
 .mailpoet_save_show_options_icon
-  width: auto
+  vertical-align: middle
-  height: auto
-  line-height: auto
 
   &::before
     content: '\f140'

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

@@ -21,3 +21,9 @@
 
 .mailpoet_automated_latest_content_display_options
   animation-slide-open-downwards()
+
+.mailpoet_automated_latest_content_show_amount
+  width: 25px
+
+.mailpoet_automated_latest_content_content_type
+  width: 180px

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

@@ -30,3 +30,8 @@ $block-hover-highlight-color = $primary-active-color
 
 .mailpoet_content
   position: relative
+  line-height: 1.61803398875
+
+  p, h1, h2, h3, h4, h5, h6
+    line-height: 1.61803398875
+    font-style: normal

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

@@ -1,6 +1,10 @@
 .mailpoet_footer_block
   padding-left: 0
   padding-right: 0
+  margin-bottom: 0
 
   .mailpoet_content
-    padding: 5px 20px
+    padding: 10px 20px
+
+    p
+      margin: 0

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

@@ -1,6 +1,10 @@
 .mailpoet_header_block
   padding-left: 0
   padding-right: 0
+  margin-bottom: 0
 
   .mailpoet_content
-    padding: 5px 20px
+    padding: 10px 20px
+
+    p
+      margin: 0

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

@@ -11,9 +11,6 @@
     padding-right: 0
     margin-bottom: 0
 
-    img
-      width: 100%
-
   .mailpoet_content a:hover
     cursor: all-scroll
 

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

@@ -1,16 +1,23 @@
-$text-vertical-padding = 3px
-
 .mailpoet_text_block
   padding-left: 0
   padding-right: 0
 
   & > .mailpoet_content
     overflow: hidden
-    padding-top: 13px
+    padding-top: 0
-    padding-bottom: 13px
+    padding-bottom: 0px
     padding-left: 20px
     padding-right: 20px
 
+    h1, h2, h3, h4, h5, h6
+      padding: 0
+      margin: 0
+      font-weight: normal
+
+    p
+      margin-top: 0
+      font-weight: normal
+
 blockquote
   margin: 1em
   padding-left: 1em

assets/css/src/newsletter_editor/libraryOverrides.styl

@@ -129,3 +129,21 @@ body
 
 #mailpoet_modal_close
   display: none
+
+.wrap > .mailpoet_notice,
+.update-nag
+  margin-left: 2px + 15px !important
+
+/* Make a button group */
+.mailpoet_button_group
+
+  .button:first-child
+    border-right: 0
+    border-top-right-radius: 0
+    border-bottom-right-radius: 0
+
+  .button:last-child
+    border-left: 0
+    border-top-left-radius: 0
+    border-bottom-left-radius: 0
+

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

@@ -13,8 +13,9 @@ animation-background-color()
 
 animation-fade-in()
   animation-name: fadeIn
-  animation-duration: 250ms
+  animation-duration: 300ms
   animation-fill-mode: forwards
+  animation-timing-function: ease-in
 
 animation-fade-in-and-scale-horizontally()
   transition: all 250ms cubic-bezier(0.420, 0.000, 0.580, 1.000) /* ease-in-out */

assets/css/src/public.styl

@@ -2,3 +2,13 @@
 
 @require 'parsley'
 @require 'form_validation'
+
+/* labels */
+.mailpoet_text_label
+.mailpoet_textarea_label
+.mailpoet_select_label
+.mailpoet_radio_label
+.mailpoet_checkbox_label
+.mailpoet_list_label
+.mailpoet_date_label
+  display:block

assets/css/src/subscribers.styl

@@ -0,0 +1,3 @@
+#subscribers_container
+  .mailpoet_segments_unsubscribed
+    color: lighten(#555, 33)

assets/js/src/date.js

@@ -0,0 +1,136 @@
+define('date',
+  [
+    'mailpoet',
+    'jquery',
+    'moment'
+  ], function(
+    MailPoet,
+    jQuery,
+    Moment
+) {
+  'use strict';
+
+  MailPoet.Date = {
+    version: 0.1,
+    options: {},
+    defaults: {
+      offset: 0,
+      format: 'F, d Y H:i:s'
+    },
+    init: function(options) {
+      options = options || {};
+
+      // set UTC offset
+      if (
+        options.offset === undefined
+        && window.mailpoet_date_offset !== undefined
+      ) {
+        options.offset = window.mailpoet_date_offset;
+      }
+      // set date format
+      if (
+        options.format === undefined
+        && window.mailpoet_date_format !== undefined
+      ) {
+        options.format = window.mailpoet_date_format;
+      }
+      // merge options
+      this.options = jQuery.extend({}, this.defaults, options);
+
+      return this;
+    },
+    format: function(date, options) {
+      this.init(options);
+      return Moment.utc(date)
+        .local()
+        .format(this.convertFormat(this.options.format));
+    },
+    short: function(date) {
+      return this.format(date, {
+        format: 'F, j Y'
+      });
+    },
+    full: function(date) {
+      return this.format(date, {
+        format: 'F, j Y H:i:s'
+      });
+    },
+    time: function(date) {
+      return this.format(date, {
+        format: 'H:i:s'
+      });
+    },
+    convertFormat: function(format) {
+      const format_mappings = {
+        date: {
+          D: 'ddd',
+          l: 'dddd',
+          d: 'DD',
+          j: 'D',
+          z: 'DDDD',
+          N: 'E',
+          S: '',
+          M: 'MMM',
+          F: 'MMMM',
+          m: 'MM',
+          n: '',
+          t: '',
+          y: 'YY',
+          Y: 'YYYY',
+          H: 'HH',
+          h: 'hh',
+          g: 'h',
+          A: 'A',
+          i: 'mm',
+          s: 'ss',
+          T: 'z',
+          O: 'ZZ',
+          w: 'd',
+          W: 'WW'
+        },
+        strftime: {
+          a: 'ddd',
+          A: 'dddd',
+          b: 'MMM',
+          B: 'MMMM',
+          d: 'DD',
+          e: 'D',
+          F: 'YYYY-MM-DD',
+          H: 'HH',
+          I: 'hh',
+          j: 'DDDD',
+          k: 'H',
+          l: 'h',
+          m: 'MM',
+          M: 'mm',
+          p: 'A',
+          S: 'ss',
+          u: 'E',
+          w: 'd',
+          W: 'WW',
+          y: 'YY',
+          Y: 'YYYY',
+          z: 'ZZ',
+          Z: 'z'
+        }
+      };
+
+      const replacements = format_mappings['date'];
+
+      let outputFormat = '';
+
+      Object.keys(replacements).forEach(function(key) {
+        if (format.indexOf(key) !== -1) {
+          format = format.replace(key, '%'+key);
+        }
+      });
+      outputFormat = format;
+      Object.keys(replacements).forEach(function(key) {
+        if (outputFormat.indexOf('%'+key) !== -1) {
+          outputFormat = outputFormat.replace('%'+key, replacements[key]);
+        }
+      });
+      return outputFormat;
+    }
+  };
+});

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

@@ -1,62 +1,45 @@
 define([
-  'react',
+  'react'
-  'react-checkbox-group'
 ],
 function(
-  React,
+  React
-  CheckboxGroup
 ) {
-  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 (this.props.field.values === undefined) {
-      if(
+        return false;
-        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;
 
-      var options = Object.keys(this.props.field.values).map(
+      const isChecked = !!(this.props.item[this.props.field.name]);
-        function(value, index) {
+      const options = Object.keys(this.props.field.values).map(
+        (value, index) => {
           return (
             <p key={ 'checkbox-' + index }>
               <label>
-                <input type="checkbox" value={ value } />
+                <input
-                &nbsp;{ this.props.field.values[value] }
+                  ref="checkbox"
+                  type="checkbox"
+                  value="1"
+                  checked={ isChecked }
+                  onChange={ this.onValueChange }
+                  name={ this.props.field.name }
+                />
+                { this.props.field.values[value] }
               </label>
             </p>
           );
-        }.bind(this)
+        }
       );
 
       return (
-        <CheckboxGroup
+        <div>
-          name={ this.props.field.name }
-          value={ selected_values }
-          ref={ this.props.field.name }
-          onChange={ this.handleValueChange }>
           { 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

@@ -4,13 +4,15 @@ define([
 function(
   React
 ) {
-  var FormFieldRadio = React.createClass({
+  const FormFieldRadio = React.createClass({
     render: function() {
-      var selected_value = this.props.item[this.props.field.name];
+      if (this.props.field.values === undefined) {
-      var count = Object.keys(this.props.field.values).length;
+        return false;
+      }
 
-      var options = Object.keys(this.props.field.values).map(
+      const selected_value = this.props.item[this.props.field.name];
-        function(value, index) {
+      const options = Object.keys(this.props.field.values).map(
+        (value, index) => {
           return (
             <p key={ 'radio-' + index }>
               <label>
@@ -20,11 +22,11 @@ function(
                   value={ value }
                   onChange={ this.props.onValueChange }
                   name={ this.props.field.name } />
-                &nbsp;{ this.props.field.values[value] }
+                { this.props.field.values[value] }
               </label>
             </p>
           );
-        }.bind(this)
+        }
       );
 
       return (

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

@@ -4,10 +4,14 @@ define([
 function(
   React
 ) {
-  var FormFieldSelect = React.createClass({
+  const FormFieldSelect = React.createClass({
     render: function() {
-      var options =
+      if (this.props.field.values === undefined) {
-        Object.keys(this.props.field.values).map(function(value, index) {
+        return false;
+      }
+
+      const options = Object.keys(this.props.field.values).map(
+        (value, index) => {
           return (
             <option
               key={ 'option-' + index }
@@ -15,7 +19,7 @@ function(
               { this.props.field.values[value] }
             </option>
           );
-        }.bind(this)
+        }
       );
 
       return (

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

@@ -26,7 +26,7 @@ function(
         && (this.props.item.id !== prevProps.item.id)
       ) {
         jQuery('#'+this.refs.select.id)
-          .val(this.props.item[this.props.field.name])
+          .val(this.getSelectedValues())
           .trigger('change');
       }
     },
@@ -45,7 +45,11 @@ function(
           if(item.element && item.element.selected) {
             return null;
           } else {
-            return item.text;
+            if(item.title) {
+              return item.title;
+            } else {
+              return item.text;
+            }
           }
         }
       });
@@ -65,15 +69,25 @@ function(
 
       select2.select2(
         'val',
-        this.props.item[this.props.field.name]
+        this.getSelectedValues()
       );
 
       this.setState({ initialized: true });
     },
+    getSelectedValues: function() {
+      if(this.props.field['selected'] !== undefined) {
+        return this.props.field['selected'](this.props.item);
+      } else if(this.props.item !== undefined && this.props.field.name !== undefined) {
+        return this.props.item[this.props.field.name];
+      } else {
+        return null;
+      }
+    },
     loadCachedItems: function() {
       if(typeof(window['mailpoet_'+this.props.field.endpoint]) !== 'undefined') {
         var items = window['mailpoet_'+this.props.field.endpoint];
 
+
         if(this.props.field['filter'] !== undefined) {
           items = items.filter(this.props.field.filter);
         }
@@ -98,31 +112,48 @@ function(
         });
       }
     },
+    getLabel: function(item) {
+      if(this.props.field['getLabel'] !== undefined) {
+        return this.props.field.getLabel(item, this.props.item);
+      }
+      return item.name;
+    },
+    getSearchLabel: function(item) {
+      if(this.props.field['getSearchLabel'] !== undefined) {
+        return this.props.field.getSearchLabel(item, this.props.item);
+      }
+      return null;
+    },
+    getValue: function(item) {
+      if(this.props.field['getValue'] !== undefined) {
+        return this.props.field.getValue(item, this.props.item);
+      }
+      return item.id;
+    },
     render: function() {
-      var options = this.state.items.map(function(item, index) {
+      const options = this.state.items.map((item, index) => {
+        let label = this.getLabel(item);
+        let searchLabel = this.getSearchLabel(item);
+        let value = this.getValue(item);
+
         return (
           <option
-            key={ item.id }
+            key={ 'option-'+index }
-            value={ item.id }
+            value={ value }
+            title={ searchLabel }
           >
-            { item.name }
+            { label }
           </option>
         );
       });
 
-      var default_value = (
-        (this.props.item !== undefined && this.props.field.name !== undefined)
-        ? this.props.item[this.props.field.name]
-        : null
-      );
-
       return (
         <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 }
+          defaultValue={ this.getSelectedValues() }
           {...this.props.field.validation}
         >{ options }</select>
       );

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

@@ -25,58 +25,49 @@ const columns = [
 
 const messages = {
   onTrash: function(response) {
-    if(response) {
+    var count = ~~response;
-      let message = null;
+    var message = null;
-      if(~~response === 1) {
-        message = (
-          '1 form was moved to the trash.'
-        );
-      } else if(~~response > 1) {
-        message = (
-          '%$1d forms were moved to the trash.'
-        ).replace('%$1d', ~~response);
-      }
 
-      if(message !== null) {
+    if(count === 1) {
-        MailPoet.Notice.success(message);
+      message = (
-      }
+        '1 form was moved to the trash.'
+      );
+    } else {
+      message = (
+        '%$1d forms were moved to the trash.'
+      ).replace('%$1d', count);
     }
+    MailPoet.Notice.success(message);
   },
   onDelete: function(response) {
-    if(response) {
+    var count = ~~response;
-      let message = null;
+    var message = null;
-      if(~~response === 1) {
-        message = (
-          '1 form was permanently deleted.'
-        );
-      } else if(~~response > 1) {
-        message = (
-          '%$1d forms were permanently deleted.'
-        ).replace('%$1d', ~~response);
-      }
 
-      if(message !== null) {
+    if(count === 1) {
-        MailPoet.Notice.success(message);
+      message = (
-      }
+        '1 form was permanently deleted.'
+      );
+    } else {
+      message = (
+        '%$1d forms were permanently deleted.'
+      ).replace('%$1d', count);
     }
+    MailPoet.Notice.success(message);
   },
   onRestore: function(response) {
-    if(response) {
+    var count = ~~response;
-      let message = null;
+    var message = null;
-      if(~~response === 1) {
-        message = (
-          '1 form has been restored from the trash.'
-        );
-      } else if(~~response > 1) {
-        message = (
-          '%$1d forms have been restored from the trash.'
-        ).replace('%$1d', ~~response);
-      }
 
-      if(message !== null) {
+    if(count === 1) {
-        MailPoet.Notice.success(message);
+      message = (
-      }
+        '1 form has been restored from the trash.'
+      );
+    } else {
+      message = (
+        '%$1d forms have been restored from the trash.'
+      ).replace('%$1d', count);
     }
+    MailPoet.Notice.success(message);
   }
 };
 
@@ -125,8 +116,8 @@ const FormList = React.createClass({
       endpoint: 'forms',
       action: 'create'
     }).done(function(response) {
-      if(response !== false) {
+      if(response.result && response.form_id) {
-        window.location = response;
+        window.location = mailpoet_form_edit_url + response.form_id;
       }
     });
   },
@@ -155,7 +146,7 @@ const FormList = React.createClass({
           { segments }
         </td>
         <td className="column-date" data-colname="Created on">
-          <abbr>{ form.created_at }</abbr>
+          <abbr>{ MailPoet.Date.full(form.created_at) }</abbr>
         </td>
       </div>
     );

assets/js/src/listing/filters.jsx

@@ -14,6 +14,9 @@ function(
       })
       return this.props.onSelectFilter(filters);
     },
+    handleEmptyTrash: function() {
+      return this.props.onEmptyTrash();
+    },
     getAvailableFilters: function() {
       let filters = this.props.filters;
 
@@ -34,7 +37,7 @@ function(
       const available_filters = this.getAvailableFilters()
         .map(function(filter, i) {
           let default_value = false;
-          if(selected_filters[filter] !== undefined && selected_filters[filter]) {
+          if (selected_filters[filter] !== undefined && selected_filters[filter]) {
             default_value = selected_filters[filter]
           } else {
             jQuery(`select[name="${filter}"]`).val('');
@@ -60,9 +63,10 @@ function(
 
       let button = false;
 
-      if(available_filters.length > 0) {
+      if (available_filters.length > 0) {
         button = (
           <input
+            id="post-query-submit"
             onClick={ this.handleFilterAction }
             type="submit"
             defaultValue="Filter"
@@ -70,10 +74,23 @@ function(
         );
       }
 
+      let empty_trash = false;
+      if (this.props.group === 'trash') {
+        empty_trash = (
+          <input
+            onClick={ this.handleEmptyTrash }
+            type="submit"
+            value="Empty Trash"
+            className="button"
+          />
+        );
+      }
+
       return (
         <div className="alignleft actions actions">
           { available_filters }
           { button }
+          { empty_trash }
         </div>
       );
     }

assets/js/src/listing/listing.jsx

@@ -74,10 +74,11 @@ define(
           );
         }
 
-        var custom_actions = this.props.item_actions;
+        const custom_actions = this.props.item_actions;
-        var item_actions = false;
+        let item_actions = false;
 
         if(custom_actions.length > 0) {
+          let is_first = true;
           item_actions = custom_actions.map(function(action, index) {
             if(action.display !== undefined) {
               if(action.display(this.props.item) === false) {
@@ -85,10 +86,12 @@ define(
               }
             }
 
+            let custom_action = null;
+
             if(action.name === 'trash') {
-              return (
+              custom_action = (
                 <span key={ 'action-'+index } className="trash">
-                  {(index > 0) ? ' | ' : ''}
+                  {(!is_first) ? ' | ' : ''}
                   <a
                     href="javascript:;"
                     onClick={ this.handleTrashItem.bind(
@@ -100,27 +103,27 @@ define(
                 </span>
               );
             } else if(action.refresh) {
-              return (
+              custom_action = (
                 <span
                   onClick={ this.props.onRefreshItems }
                   key={ 'action-'+index } className={ action.name }>
-                  {(index > 0) ? ' | ' : ''}
+                  {(!is_first) ? ' | ' : ''}
                   { action.link(this.props.item) }
                 </span>
               );
             } else if(action.link) {
-              return (
+              custom_action = (
                 <span
                   key={ 'action-'+index } className={ action.name }>
-                  {(index > 0) ? ' | ' : ''}
+                  {(!is_first) ? ' | ' : ''}
                   { action.link(this.props.item) }
                 </span>
               );
             } else {
-              return (
+              custom_action = (
                 <span
                   key={ 'action-'+index } className={ action.name }>
-                  {(index > 0) ? ' | ' : ''}
+                  {(!is_first) ? ' | ' : ''}
                   <a href="javascript:;" onClick={
                     (action.onClick !== undefined)
                     ? action.onClick.bind(null,
@@ -132,6 +135,12 @@ define(
                 </span>
               );
             }
+
+            if(custom_action !== null && is_first === true) {
+              is_first = false;
+            }
+
+            return custom_action;
           }.bind(this));
         } else {
           item_actions = (
@@ -504,10 +513,21 @@ define(
           this.getItems();
         }.bind(this));
       },
+      handleEmptyTrash: function() {
+        this.handleBulkAction('all', {
+          action: 'delete',
+          group: 'trash'
+        }, function(response) {
+          MailPoet.Notice.success(
+            MailPoetI18n.permanentlyDeleted.replace('%d', response)
+          );
+        });
+      },
       handleBulkAction: function(selected_ids, params, callback) {
         if(
           this.state.selection === false
           && this.state.selected_ids.length === 0
+          && selected_ids !== 'all'
         ) {
           return;
         }
@@ -520,8 +540,10 @@ define(
           limit: 0,
           filter: this.state.filter,
           group: this.state.group,
-          search: this.state.search,
+          search: this.state.search
-          selection: selected_ids
+        }
+        if(selected_ids !== 'all') {
+          data.listing.selection = selected_ids;
         }
 
         MailPoet.Ajax.post({
@@ -715,7 +737,10 @@ define(
               <ListingFilters
                 filters={ this.state.filters }
                 filter={ this.state.filter }
-                onSelectFilter={ this.handleFilter } />
+                group={ this.state.group }
+                onSelectFilter={ this.handleFilter }
+                onEmptyTrash={ this.handleEmptyTrash }
+              />
               <ListingPages
                 count={ this.state.count }
                 page={ this.state.page }

assets/js/src/listing/pages.jsx

@@ -7,7 +7,11 @@ define(['react', 'classnames'], function(React, classNames) {
       }
     },
     setPage: function(page) {
-      this.props.onSetPage(page);
+      this.setState({
+        page: null
+      }, function () {
+        this.props.onSetPage(this.constrainPage(page));
+      }.bind(this));
     },
     setFirstPage: function() {
       this.setPage(1);
@@ -16,10 +20,14 @@ define(['react', 'classnames'], function(React, classNames) {
       this.setPage(this.getLastPage());
     },
     setPreviousPage: function() {
-      this.setPage(this.constrainPage(this.props.page - 1));
+      this.setPage(this.constrainPage(
+        parseInt(this.props.page, 10) - 1)
+      );
     },
     setNextPage: function() {
-      this.setPage(this.constrainPage(this.props.page + 1));
+      this.setPage(this.constrainPage(
+        parseInt(this.props.page, 10) + 1)
+      );
     },
     constrainPage: function(page) {
       return Math.min(Math.max(1, Math.abs(~~page)), this.getLastPage());
@@ -27,14 +35,16 @@ define(['react', 'classnames'], function(React, classNames) {
     handleSetManualPage: function(e) {
       if(e.which === 13) {
         this.setPage(this.state.page);
-        this.setState({ page: null });
       }
     },
     handleChangeManualPage: function(e) {
       this.setState({
-        page: this.constrainPage(e.target.value)
+        page: e.target.value
       });
     },
+    handleBlurManualPage: function(e) {
+      this.setPage(e.target.value);
+    },
     getLastPage: function() {
       return Math.ceil(this.props.count / this.props.limit);
     },
@@ -101,6 +111,11 @@ define(['react', 'classnames'], function(React, classNames) {
             );
           }
 
+          let pageValue =  this.props.page;
+          if(this.state.page !== null) {
+            pageValue = this.state.page;
+          }
+
           pagination = (
             <span className="pagination-links">
               {firstPage}
@@ -115,10 +130,11 @@ define(['react', 'classnames'], function(React, classNames) {
                   type="text"
                   onChange={ this.handleChangeManualPage }
                   onKeyUp={ this.handleSetManualPage }
+                  onBlur={ this.handleBlurManualPage }
                   aria-describedby="table-paging"
                   size="1"
                   ref="page"
-                  value={ this.state.page || this.props.page }
+                  value={ pageValue }
                   name="paged"
                   id="current-page-selector"
                   className="current-page" />

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

@@ -32,10 +32,10 @@ define([
         inclusionType: 'include', // 'include'|'exclude'
         displayType: 'excerpt', // 'excerpt'|'full'|'titleOnly'
         titleFormat: 'h1', // 'h1'|'h2'|'h3'|'ul'
-        titlePosition: 'inTextBlock', // 'inTextBlock'|'aboveBlock',
         titleAlignment: 'left', // 'left'|'center'|'right'
         titleIsLink: false, // false|true
-        imagePadded: true, // true|false
+        imageFullWidth: false, // true|false
+        featuredImagePosition: 'belowTitle', // 'aboveTitle'|'belowTitle'|'none'
         //imageAlignment: 'centerPadded', // 'centerFull'|'centerPadded'|'left'|'right'|'alternate'|'none'
         showAuthor: 'no', // 'no'|'aboveText'|'belowText'
         authorPrecededBy: 'Author:',
@@ -63,7 +63,7 @@ define([
     initialize: function() {
       base.BlockView.prototype.initialize.apply(this, arguments);
       this.fetchPosts();
-      this.on('change:amount change:contentType change:terms change:inclusionType change:displayType change:titleFormat change:titlePosition change:titleAlignment change:titleIsLink change:imagePadded change:showAuthor change:authorPrecededBy change:showCategories change:categoriesPrecededBy change:readMoreType change:readMoreText change:sortBy change:showDivider', this._scheduleFetchPosts, this);
+      this.on('change:amount change:contentType change:terms change:inclusionType change:displayType change:titleFormat change:featuredImagePosition change:titleAlignment change:titleIsLink change:imageFullWidth change:showAuthor change:authorPrecededBy change:showCategories change:categoriesPrecededBy change:readMoreType change:readMoreText change:sortBy change:showDivider', this._scheduleFetchPosts, this);
       this.listenTo(this.get('readMoreButton'), 'change', this._scheduleFetchPosts);
       this.listenTo(this.get('divider'), 'change', this._scheduleFetchPosts);
     },
@@ -81,7 +81,7 @@ define([
      * ALC posts on each model change
      */
     _scheduleFetchPosts: function() {
-      var timeout = 2000,
+      var timeout = 500,
         that = this;
       if (this._fetchPostsTimer !== undefined) {
         clearTimeout(this._fetchPostsTimer);
@@ -142,9 +142,9 @@ define([
         "keyup .mailpoet_automated_latest_content_show_amount": _.partial(this.changeField, "amount"),
         "change .mailpoet_automated_latest_content_content_type": _.partial(this.changeField, "contentType"),
         "change .mailpoet_automated_latest_content_include_or_exclude": _.partial(this.changeField, "inclusionType"),
-        "change .mailpoet_automated_latest_content_title_position": _.partial(this.changeField, "titlePosition"),
         "change .mailpoet_automated_latest_content_title_alignment": _.partial(this.changeField, "titleAlignment"),
-        "change .mailpoet_automated_latest_content_image_padded": _.partial(this.changeBoolField, "imagePadded"),
+        "change .mailpoet_automated_latest_content_image_full_width": _.partial(this.changeBoolField, "imageFullWidth"),
+        "change .mailpoet_automated_latest_content_featured_image_position": _.partial(this.changeField, "featuredImagePosition"),
         "change .mailpoet_automated_latest_content_show_author": _.partial(this.changeField, "showAuthor"),
         "keyup .mailpoet_automated_latest_content_author_preceded_by": _.partial(this.changeField, "authorPrecededBy"),
         "change .mailpoet_automated_latest_content_show_categories": _.partial(this.changeField, "showCategories"),
@@ -273,12 +273,13 @@ define([
     },
     changeDisplayType: function(event) {
       var value = jQuery(event.target).val();
+
       if (value == 'titleOnly') {
-        this.$('.mailpoet_automated_latest_content_title_position_container').addClass('mailpoet_hidden');
         this.$('.mailpoet_automated_latest_content_title_as_list').removeClass('mailpoet_hidden');
+        this.$('.mailpoet_automated_latest_content_image_full_width_option').addClass('mailpoet_hidden');
       } else {
-        this.$('.mailpoet_automated_latest_content_title_position_container').removeClass('mailpoet_hidden');
         this.$('.mailpoet_automated_latest_content_title_as_list').addClass('mailpoet_hidden');
+        this.$('.mailpoet_automated_latest_content_image_full_width_option').removeClass('mailpoet_hidden');
 
         // Reset titleFormat if it was set to List when switching away from displayType=titleOnly
         if (this.model.get('titleFormat') === 'ul') {
@@ -287,6 +288,12 @@ define([
           this.$('.mailpoet_automated_latest_content_title_as_link').removeClass('mailpoet_hidden');
         }
       }
+
+      if (value === 'excerpt') {
+        this.$('.mailpoet_automated_latest_content_featured_image_position_container').removeClass('mailpoet_hidden');
+      } else {
+        this.$('.mailpoet_automated_latest_content_featured_image_position_container').addClass('mailpoet_hidden');
+      }
       this.changeField('displayType', event);
     },
     changeTitleFormat: function(event) {

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

@@ -133,10 +133,10 @@ define([
       }.bind(this));
     },
     transitionIn: function() {
-      return this._transition('slideDown', 'fadeIn', 'easeIn');
+      return this._transition('slideDown', 'fadeIn', 'easeOut');
     },
     transitionOut: function() {
-      return this._transition('slideUp', 'fadeOut', 'easeOut');
+      return this._transition('slideUp', 'fadeOut', 'easeIn');
     },
     _transition: function(slideDirection, fadeDirection, easing) {
       var promise = jQuery.Deferred();

assets/js/src/newsletter_editor/blocks/button.js

@@ -32,6 +32,7 @@ define([
             fontColor: '#000000',
             fontFamily: 'Arial',
             fontSize: '16px',
+            fontWeight: 'normal', // 'normal'|'bold'
             textAlign: 'center',
           },
         },
@@ -72,6 +73,7 @@ define([
         "change .mailpoet_field_button_font_size": _.partial(this.changeField, "styles.block.fontSize"),
         "change .mailpoet_field_button_background_color": _.partial(this.changeColorField, "styles.block.backgroundColor"),
         "change .mailpoet_field_button_border_color": _.partial(this.changeColorField, "styles.block.borderColor"),
+        "change .mailpoet_field_button_font_weight": "changeFontWeight",
 
         "input .mailpoet_field_button_border_width": _.partial(this.updateValueAndCall, '.mailpoet_field_button_border_width_input', _.partial(this.changePixelField, "styles.block.borderWidth").bind(this)),
         "change .mailpoet_field_button_border_width": _.partial(this.updateValueAndCall, '.mailpoet_field_button_border_width_input', _.partial(this.changePixelField, "styles.block.borderWidth").bind(this)),
@@ -128,6 +130,13 @@ define([
       this.$(fieldToUpdate).val(jQuery(event.target).val());
       callable(event);
     },
+    changeFontWeight: function(event) {
+      var checked = !!jQuery(event.target).prop('checked');
+      this.model.set(
+        'styles.block.fontWeight',
+        (checked) ? jQuery(event.target).val() : 'normal'
+      );
+    }
   });
 
   Module.ButtonWidgetView = base.WidgetView.extend({

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

@@ -41,7 +41,7 @@ define([
     getTemplate: function() { return templates.footerBlock; },
     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),
+    }, _.omit(base.BlockView.prototype.modelEvents, 'change')),
     onDragSubstituteBy: function() { return Module.FooterWidgetView; },
     onRender: function() {
       this.toolsView = new Module.FooterBlockToolsView({ model: this.model });
@@ -60,11 +60,9 @@ define([
 
         valid_elements: "p[class|style],span[class|style],a[href|class|title|target|style],strong[class|style],em[class|style],strike,br",
         invalid_elements: "script",
-        style_formats: [
+        block_formats: 'Paragraph=p',
-          {title: 'Paragraph', block: 'p'},
-        ],
 
-        plugins: "link textcolor mailpoet_custom_fields",
+        plugins: "link textcolor colorpicker mailpoet_custom_fields",
 
         setup: function(editor) {
           editor.on('change', function(e) {

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

@@ -41,7 +41,7 @@ define([
     getTemplate: function() { return templates.headerBlock; },
     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),
+    }, _.omit(base.BlockView.prototype.modelEvents, 'change')),
     onDragSubstituteBy: function() { return Module.HeaderWidgetView; },
     onRender: function() {
       this.toolsView = new Module.HeaderBlockToolsView({ model: this.model });
@@ -60,11 +60,9 @@ define([
 
         valid_elements: "p[class|style],span[class|style],a[href|class|title|target|style],strong[class|style],em[class|style],strike,br",
         invalid_elements: "script",
-        style_formats: [
+        block_formats: 'Paragraph=p',
-          {title: 'Paragraph', block: 'p'},
-        ],
 
-        plugins: "link textcolor mailpoet_custom_fields",
+        plugins: "link textcolor colorpicker mailpoet_custom_fields",
 
         setup: function(editor) {
           editor.on('change', function(e) {

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

@@ -20,7 +20,7 @@ define([
         link: 'http://example.org',
         src: 'no-image.png',
         alt: 'An image of...',
-        padded: true, // true | false - Padded or full width
+        fullWidth: true, // true | false
         width: '64px',
         height: '64px',
         styles: {
@@ -45,10 +45,10 @@ define([
       this.toolsView = new Module.ImageBlockToolsView({ model: this.model });
       this.toolsRegion.show(this.toolsView);
 
-      if (this.model.get('padded')) {
+      if (this.model.get('fullWidth')) {
-        this.$el.removeClass('mailpoet_full_image');
-      } else {
         this.$el.addClass('mailpoet_full_image');
+      } else {
+        this.$el.removeClass('mailpoet_full_image');
       }
     },
   });
@@ -64,7 +64,7 @@ define([
         "keyup .mailpoet_field_image_link": _.partial(this.changeField, "link"),
         "keyup .mailpoet_field_image_address": _.partial(this.changeField, "src"),
         "keyup .mailpoet_field_image_alt_text": _.partial(this.changeField, "alt"),
-        "change .mailpoet_field_image_padded": _.partial(this.changeBoolCheckboxField, "padded"),
+        "change .mailpoet_field_image_full_width": _.partial(this.changeBoolCheckboxField, "fullWidth"),
         "change .mailpoet_field_image_alignment": _.partial(this.changeField, "styles.block.textAlign"),
         "click .mailpoet_field_image_select_another_image": "showMediaManager",
         "click .mailpoet_done_editing": "close",

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

@@ -43,10 +43,10 @@ define([
         inclusionType: 'include', // 'include'|'exclude'
         displayType: 'excerpt', // 'excerpt'|'full'|'titleOnly'
         titleFormat: 'h1', // 'h1'|'h2'|'h3'|'ul'
-        titlePosition: 'inTextBlock', // 'inTextBlock'|'aboveBlock',
         titleAlignment: 'left', // 'left'|'center'|'right'
         titleIsLink: false, // false|true
-        imagePadded: true, // true|false
+        imageFullWidth: false, // true|false
+        featuredImagePosition: 'belowTitle', // 'aboveTitle'|'belowTitle'|'none'
         //imageAlignment: 'centerPadded', // 'centerFull'|'centerPadded'|'left'|'right'|'alternate'|'none'
         showAuthor: 'no', // 'no'|'aboveText'|'belowText'
         authorPrecededBy: 'Author:',
@@ -88,7 +88,7 @@ define([
       this.on('change:amount change:contentType change:terms change:inclusionType change:postStatus change:search change:sortBy', refreshAvailablePosts);
 
       this.listenTo(this.get('_selectedPosts'), 'add remove reset', refreshTransformedPosts);
-      this.on('change:displayType change:titleFormat change:titlePosition change:titleAlignment change:titleIsLink change:imagePadded change:showAuthor change:authorPrecededBy change:showCategories change:categoriesPrecededBy change:readMoreType change:readMoreText change:showDivider', refreshTransformedPosts);
+      this.on('change:displayType change:titleFormat change:featuredImagePosition change:titleAlignment change:titleIsLink change:imageFullWidth change:showAuthor change:authorPrecededBy change:showCategories change:categoriesPrecededBy change:readMoreType change:readMoreText change:showDivider', refreshTransformedPosts);
       this.listenTo(this.get('readMoreButton'), 'change', refreshTransformedPosts);
       this.listenTo(this.get('divider'), 'change', refreshTransformedPosts);
 
@@ -111,7 +111,7 @@ define([
       data.posts = this.get('_selectedPosts').pluck('ID');
 
       if (data.posts.length === 0) {
-        this.get('_transformedPosts.blocks').reset();
+        this.get('_transformedPosts').get('blocks').reset();
         return;
       }
 
@@ -394,9 +394,9 @@ define([
         "keyup .mailpoet_posts_show_amount": _.partial(this.changeField, "amount"),
         "change .mailpoet_posts_content_type": _.partial(this.changeField, "contentType"),
         "change .mailpoet_posts_include_or_exclude": _.partial(this.changeField, "inclusionType"),
-        "change .mailpoet_posts_title_position": _.partial(this.changeField, "titlePosition"),
         "change .mailpoet_posts_title_alignment": _.partial(this.changeField, "titleAlignment"),
-        "change .mailpoet_posts_image_padded": _.partial(this.changeBoolField, "imagePadded"),
+        "change .mailpoet_posts_image_full_width": _.partial(this.changeBoolField, "imageFullWidth"),
+        "change .mailpoet_posts_featured_image_position": _.partial(this.changeField, "featuredImagePosition"),
         "change .mailpoet_posts_show_author": _.partial(this.changeField, "showAuthor"),
         "keyup .mailpoet_posts_author_preceded_by": _.partial(this.changeField, "authorPrecededBy"),
         "change .mailpoet_posts_show_categories": _.partial(this.changeField, "showCategories"),
@@ -448,11 +448,11 @@ define([
     changeDisplayType: function(event) {
       var value = jQuery(event.target).val();
       if (value == 'titleOnly') {
-        this.$('.mailpoet_posts_title_position_container').addClass('mailpoet_hidden');
         this.$('.mailpoet_posts_title_as_list').removeClass('mailpoet_hidden');
+        this.$('.mailpoet_posts_image_full_width_option').addClass('mailpoet_hidden');
       } else {
-        this.$('.mailpoet_posts_title_position_container').removeClass('mailpoet_hidden');
         this.$('.mailpoet_posts_title_as_list').addClass('mailpoet_hidden');
+        this.$('.mailpoet_posts_image_full_width_option').removeClass('mailpoet_hidden');
 
         // Reset titleFormat if it was set to List when switching away from displayType=titleOnly
         if (this.model.get('titleFormat') === 'ul') {
@@ -461,6 +461,13 @@ define([
           this.$('.mailpoet_posts_title_as_link').removeClass('mailpoet_hidden');
         }
       }
+
+      if (value === 'excerpt') {
+        this.$('.mailpoet_posts_featured_image_position_container').removeClass('mailpoet_hidden');
+      } else {
+        this.$('.mailpoet_posts_featured_image_position_container').addClass('mailpoet_hidden');
+      }
+
       this.changeField('displayType', event);
     },
     changeTitleFormat: function(event) {

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

@@ -52,21 +52,15 @@ define([
           inline: true,
 
           menubar: false,
-          toolbar1: "styleselect bold italic forecolor | link unlink",
+          toolbar1: "formatselect bold italic forecolor | link unlink",
           toolbar2: "alignleft aligncenter alignright alignjustify | bullist numlist blockquote | code mailpoet_custom_fields",
 
           //forced_root_block: 'p',
           valid_elements: "p[class|style],span[class|style],a[href|class|title|target|style],h1[class|style],h2[class|style],h3[class|style],ol[class|style],ul[class|style],li[class|style],strong[class|style],em[class|style],strike,br,blockquote[class|style],table[class|style],tr[class|style],th[class|style],td[class|style]",
           invalid_elements: "script",
-          style_formats: [
+          block_formats: 'Heading 1=h1;Heading 2=h2;Heading 3=h3;Paragraph=p',
-            {title: 'Heading 1', block: 'h1'},
-            {title: 'Heading 2', block: 'h2'},
-            {title: 'Heading 3', block: 'h3'},
 
-            {title: 'Paragraph', block: 'p'},
+          plugins: "link code textcolor colorpicker mailpoet_custom_fields",
-          ],
-
-          plugins: "link code textcolor mailpoet_custom_fields",
 
           setup: function(editor) {
             editor.on('change', function(e) {

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,17 @@ 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 MailPoet.Ajax.post({
       endpoint: 'newsletters',
-      action: 'preview',
+      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');

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({
+    CommunicationComponent.saveNewsletter(json).done(function(response) {
-      endpoint: 'newsletters',
-      action: 'save',
-      data: 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 });
           });
         }
       }
@@ -48,7 +67,28 @@ define([
   };
 
   Module.getThumbnail = function(element, options) {
-    return html2canvas(element, options || {});
+    var promise = html2canvas(element, options || {});
+
+    return promise.then(function(oldCanvas) {
+      // Temporary workaround for html2canvas-alpha2.
+      // Removes 1px left transparent border from resulting canvas.
+
+      var oldContext = oldCanvas.getContext('2d'),
+          newCanvas = document.createElement("canvas"),
+          newContext = newCanvas.getContext("2d"),
+          leftBorderWidth = 1;
+
+      newCanvas.width = oldCanvas.width;
+      newCanvas.height = oldCanvas.height;
+
+      newContext.drawImage(
+        oldCanvas,
+        leftBorderWidth, 0, oldCanvas.width - leftBorderWidth, oldCanvas.height,
+        0, 0, oldCanvas.width, oldCanvas.height
+      );
+
+      return newCanvas;
+    });
   };
 
   Module.saveTemplate = function(options) {
@@ -58,7 +98,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 +194,7 @@ define([
           App.getConfig().get('translations.templateNameMissing'),
           {
             positionAfter: that.$el,
+            scroll: true,
           }
         );
       } else if (templateDescription === '') {
@@ -161,6 +202,7 @@ define([
           App.getConfig().get('translations.templateDescriptionMissing'),
           {
             positionAfter: that.$el,
+            scroll: true,
           }
         );
       } else {
@@ -174,6 +216,7 @@ define([
             App.getConfig().get('translations.templateSaved'),
             {
               positionAfter: that.$el,
+              scroll: true,
             }
           );
         }).fail(function() {
@@ -182,6 +225,7 @@ define([
             App.getConfig().get('translations.templateSaveFailed'),
             {
               positionAfter: that.$el,
+              scroll: true,
             }
           );
         });
@@ -206,6 +250,7 @@ define([
           App.getConfig().get('translations.templateNameMissing'),
           {
             positionAfter: that.$el,
+            scroll: true,
           }
         );
       } else if (templateDescription === '') {
@@ -213,6 +258,7 @@ define([
           App.getConfig().get('translations.templateDescriptionMissing'),
           {
             positionAfter: that.$el,
+            scroll: true,
           }
         );
       } else {

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

@@ -225,15 +225,22 @@ define([
     showPreview: function() {
       var json = App.toJSON();
 
+      // Stringify to enable transmission of primitive non-string value types
+      if (!_.isUndefined(json.body)) {
+        json.body = JSON.stringify(json.body);
+      }
+
+      MailPoet.Modal.loading(true);
+
       MailPoet.Ajax.post({
         endpoint: 'newsletters',
         action: 'render',
         data: json,
       }).done(function(response){
-        console.log('Should open a new window');
+        MailPoet.Modal.loading(false);
-        window.open('data:text/html,' + encodeURIComponent(response.rendered_body), '_blank');
+        window.open('data:text/html;charset=utf-8,' + encodeURIComponent(response.rendered_body), '_blank');
       }).fail(function(error) {
-        console.log('Preview error', json);
+        MailPoet.Modal.loading(false);
         alert('Something went wrong, check console');
       });
     },
@@ -241,27 +248,42 @@ define([
       // testing sending method
       console.log('trying to send a preview');
       // get form data
+      var $emailField = this.$('#mailpoet_preview_to_email');
       var data = {
-        from_name: this.$('#mailpoet_preview_from_name').val(),
+        subscriber: $emailField.val(),
-        from_email: this.$('#mailpoet_preview_from_email').val(),
+        id: App.getNewsletter().get('id'),
-        to_email: this.$('#mailpoet_preview_to_email').val(),
-        newsletter: App.newsletterId,
       };
 
+      if (data.subscriber.length <= 0) {
+        MailPoet.Notice.error(
+          App.getConfig().get('translations.newsletterPreviewEmailMissing'),
+          {
+            positionAfter: $emailField,
+            scroll: true,
+          }
+        );
+        return false;
+      }
+
       // send test email
       MailPoet.Modal.loading(true);
 
-      // TODO: Migrate logic to new AJAX format
       CommunicationComponent.previewNewsletter(data).done(function(response) {
-        if(response.success !== undefined && response.success === true) {
+        if(response.result !== undefined && response.result === true) {
-          MailPoet.Notice.success(App.getConfig().get('translations.testEmailSent'));
+          MailPoet.Notice.success(App.getConfig().get('translations.newsletterPreviewSent'), { scroll: true });
-        } else if(response.error !== undefined) {
+        } else {
-          if(response.error.length === 0) {
+          if (_.isArray(response.errors)) {
-            MailPoet.Notice.error(App.getConfig().get('translations.unknownErrorOccurred'));
+            response.errors.map(function(error) {
-          } else {
+              MailPoet.Notice.error(error, { scroll: true });
-            $(response.error).each(function(i, error) {
-              MailPoet.Notice.error(error);
             });
+          } else {
+            MailPoet.Notice.error(
+              App.getConfig().get('translations.newsletterPreviewFailedToSend'),
+              {
+                scroll: true,
+                static: true,
+              }
+            );
           }
         }
         MailPoet.Modal.loading(false);

assets/js/src/newsletters/list.jsx

@@ -43,58 +43,49 @@ define(
 
     var messages = {
       onTrash: function(response) {
-        var count = ~~response.newsletters;
+        var count = ~~response;
         var message = null;
 
-        if(count === 1 || response === true) {
+        if(count === 1) {
           message = (
             '1 newsletter was moved to the trash.'
           );
-        } else if(count > 1) {
+        } else {
           message = (
             '%$1d newsletters were moved to the trash.'
           ).replace('%$1d', count);
         }
-
+        MailPoet.Notice.success(message);
-        if(message !== null) {
-          MailPoet.Notice.success(message);
-        }
       },
       onDelete: function(response) {
-        var count = ~~response.newsletters;
+        var count = ~~response;
         var message = null;
 
-        if(count === 1 || response === true) {
+        if(count === 1) {
           message = (
             '1 newsletter was permanently deleted.'
           );
-        } else if(count > 1) {
+        } else {
           message = (
             '%$1d newsletters were permanently deleted.'
           ).replace('%$1d', count);
         }
-
+        MailPoet.Notice.success(message);
-        if(message !== null) {
-          MailPoet.Notice.success(message);
-        }
       },
       onRestore: function(response) {
-        var count = ~~response.newsletters;
+        var count = ~~response;
         var message = null;
 
-        if(count === 1 || response === true) {
+        if(count === 1) {
           message = (
             '1 newsletter has been restored from the trash.'
           );
-        } else if(count > 1) {
+        } else {
           message = (
             '%$1d newsletters have been restored from the trash.'
           ).replace('%$1d', count);
         }
-
+        MailPoet.Notice.success(message);
-        if(message !== null) {
-          MailPoet.Notice.success(message);
-        }
       }
     };
 
@@ -144,7 +135,7 @@ define(
         });
       },
       renderStatus: function(item) {
-        if(item.queue === null) {
+        if(!item.queue) {
           return (
             <span>Not sent yet.</span>
           );
@@ -217,10 +208,8 @@ define(
           'has-row-actions'
         );
 
-        var segments = mailpoet_segments.filter(function(segment) {
+        var segments = newsletter.segments.map(function(segment) {
-          return (jQuery.inArray(segment.id, newsletter.segments) !== -1);
+          return segment.name
-        }).map(function(segment) {
-          return segment.name;
         }).join(', ');
 
         return (
@@ -238,10 +227,10 @@ define(
               { segments }
             </td>
             <td className="column-date" data-colname="Subscribed on">
-              <abbr>{ newsletter.created_at }</abbr>
+              <abbr>{ MailPoet.Date.full(newsletter.created_at) }</abbr>
             </td>
             <td className="column-date" data-colname="Last modified on">
-              <abbr>{ newsletter.updated_at }</abbr>
+              <abbr>{ MailPoet.Date.full(newsletter.updated_at) }</abbr>
             </td>
           </div>
         );

assets/js/src/newsletters/send.jsx

@@ -26,7 +26,8 @@ define(
              "Tempt them to open your email.",
         type: 'text',
         validation: {
-          'data-parsley-required': true
+          'data-parsley-required': true,
+          'data-parsley-required-message': 'You need to specify a subject.'
         }
       },
       {
@@ -42,7 +43,8 @@ define(
           return !!(!segment.deleted_at);
         },
         validation: {
-          'data-parsley-required': true
+          'data-parsley-required': true,
+          'data-parsley-required-message': 'You need to select a segment.'
         }
       },
       {
@@ -107,8 +109,16 @@ define(
       mixins: [
         Router.History
       ],
+      componentDidMount: function() {
+        jQuery('#mailpoet_newsletter').parsley();
+      },
+      isValid: function() {
+        return jQuery('#mailpoet_newsletter').parsley().isValid();
+      },
       handleSend: function() {
-        if(jQuery('#mailpoet_newsletter').parsley().validate() === true) {
+        if(!this.isValid()) {
+          jQuery('#mailpoet_newsletter').parsley().validate();
+        } else {
           MailPoet.Ajax.post({
             endpoint: 'sendingQueue',
             action: 'add',
@@ -132,9 +142,7 @@ define(
               );
             } else {
               if(response.errors) {
-                MailPoet.Notice.error(
+                MailPoet.Notice.error(response.errors);
-                  response.errors.join("<br />")
-                );
               } else {
                 MailPoet.Notice.error(
                   'An error occurred while trying to send. '+
@@ -144,14 +152,7 @@ define(
             }
           }.bind(this));
         }
-      },
+        return false;
-      componentDidMount: function() {
-        if(this.isMounted()) {
-          jQuery('#mailpoet_newsletter').parsley();
-        }
-      },
-      isValid: function() {
-        return (jQuery('#mailpoet_newsletter').parsley().validate());
       },
       render: function() {
         return (
@@ -166,8 +167,8 @@ define(
               fields={ fields }
               params={ this.props.params }
               messages={ messages }
-              isValid={ this.isValid }>
+              isValid={ this.isValid }
-
+            >
               <p className="submit">
                 <input
                   className="button button-primary"

assets/js/src/newsletters/templates.jsx

@@ -18,12 +18,21 @@ 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.Modal.loading(true);
+
         MailPoet.Ajax.post({
           endpoint: 'newsletterTemplates',
           action: 'save',
           data: template
         }).done(function(response) {
-          if(response === true) {
+          MailPoet.Modal.loading(false);
+          if(response.result === true) {
             this.props.onImport(template);
           } else {
             response.map(function(error) {
@@ -86,10 +95,13 @@ define(
       getTemplates: function() {
         this.setState({ loading: true });
 
+        MailPoet.Modal.loading(true);
+
         MailPoet.Ajax.post({
           endpoint: 'newsletterTemplates',
           action: 'getAll',
         }).done(function(response) {
+          MailPoet.Modal.loading(false);
           if(this.isMounted()) {
 
             if(response.length === 0) {
@@ -111,12 +123,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) {

assets/js/src/newsletters/types.jsx

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

assets/js/src/notice.js

@@ -192,21 +192,28 @@ define('notice', ['mailpoet', 'jquery'], function(MailPoet, jQuery) {
       error: function(message, options) {
         this.show(jQuery.extend({}, {
               type: 'error',
-              message: '<p>'+message+'</p>'
+              message: '<p>'+this.formatMessage(message)+'</p>'
           }, options));
       },
       success: function(message, options) {
           this.show(jQuery.extend({}, {
               type: 'success',
-              message: '<p>'+message+'</p>'
+              message: '<p>'+this.formatMessage(message)+'</p>'
           }, options));
       },
       system: function(message, options) {
           this.show(jQuery.extend({}, {
               type: 'system',
               static: true,
-              message: message
+              message: '<p>'+this.formatMessage(message)+'</p>'
           }, options));
+      },
+      formatMessage: function(message) {
+        if(Array.isArray(message)) {
+          return message.join('<br />');
+        } else {
+          return message;
+        }
       }
   };
 });

assets/js/src/public.js

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

assets/js/src/segments/form.jsx

@@ -12,7 +12,7 @@ define(
     Form
   ) {
 
-    var fields = [
+    let fields = [
       {
         name: 'name',
         label: 'Name',
@@ -25,7 +25,7 @@ define(
       }
     ];
 
-    var messages = {
+    const messages = {
       onUpdate: function() {
         MailPoet.Notice.success('Segment successfully updated!');
       },
@@ -34,7 +34,7 @@ define(
       }
     };
 
-    var SegmentForm = React.createClass({
+    const SegmentForm = React.createClass({
       mixins: [
         Router.History
       ],

assets/js/src/segments/list.jsx

@@ -42,58 +42,49 @@ var columns = [
 
 const messages = {
   onTrash: function(response) {
-    if(response) {
+    var count = ~~response;
-      let message = null;
+    var message = null;
-      if(~~response === 1) {
-        message = (
-          '1 segment was moved to the trash.'
-        );
-      } else if(~~response > 1) {
-        message = (
-          '%$1d segments were moved to the trash.'
-        ).replace('%$1d', ~~response);
-      }
 
-      if(message !== null) {
+    if(count === 1) {
-        MailPoet.Notice.success(message);
+      message = (
-      }
+        '1 segment was moved to the trash.'
+      );
+    } else {
+      message = (
+        '%$1d segments were moved to the trash.'
+      ).replace('%$1d', count);
     }
+    MailPoet.Notice.success(message);
   },
   onDelete: function(response) {
-    if(response) {
+    var count = ~~response;
-      let message = null;
+    var message = null;
-      if(~~response === 1) {
-        message = (
-          '1 segment was permanently deleted.'
-        );
-      } else if(~~response > 1) {
-        message = (
-          '%$1d segments were permanently deleted.'
-        ).replace('%$1d', ~~response);
-      }
 
-      if(message !== null) {
+    if(count === 1) {
-        MailPoet.Notice.success(message);
+      message = (
-      }
+        '1 segment was permanently deleted.'
+      );
+    } else {
+      message = (
+        '%$1d segments were permanently deleted.'
+      ).replace('%$1d', count);
     }
+    MailPoet.Notice.success(message);
   },
   onRestore: function(response) {
-    if(response) {
+    var count = ~~response;
-      let message = null;
+    var message = null;
-      if(~~response === 1) {
-        message = (
-          '1 segment has been restored from the trash.'
-        );
-      } else if(~~response > 1) {
-        message = (
-          '%$1d segments have been restored from the trash.'
-        ).replace('%$1d', ~~response);
-      }
 
-      if(message !== null) {
+    if(count === 1) {
-        MailPoet.Notice.success(message);
+      message = (
-      }
+        '1 segment has been restored from the trash.'
+      );
+    } else {
+      message = (
+        '%$1d segments have been restored from the trash.'
+      ).replace('%$1d', count);
     }
+    MailPoet.Notice.success(message);
   }
 };
 
@@ -105,6 +96,9 @@ const item_actions = [
       return (
         <Link to={ `/edit/${item.id}` }>Edit</Link>
       );
+    },
+    display: function(segment) {
+      return (segment.type !== 'wp_users');
     }
   },
   {
@@ -187,16 +181,16 @@ const SegmentList = React.createClass({
           <abbr>{ segment.description }</abbr>
         </td>
         <td className="column-date" data-colname="Subscribed">
-          <abbr>{ segment.subscribed || 0 }</abbr>
+          <abbr>{ segment.subscribers_count.subscribed || 0 }</abbr>
         </td>
         <td className="column-date" data-colname="Unconfirmed">
-          <abbr>{ segment.unconfirmed || 0 }</abbr>
+          <abbr>{ segment.subscribers_count.unconfirmed || 0 }</abbr>
         </td>
         <td className="column-date" data-colname="Unsubscribed">
-          <abbr>{ segment.unsubscribed || 0 }</abbr>
+          <abbr>{ segment.subscribers_count.unsubscribed || 0 }</abbr>
         </td>
         <td className="column-date" data-colname="Created on">
-          <abbr>{ segment.created_at }</abbr>
+          <abbr>{ MailPoet.Date.full(segment.created_at) }</abbr>
         </td>
       </div>
     );

assets/js/src/subscribers/form.jsx

@@ -11,7 +11,6 @@ define(
     MailPoet,
     Form
   ) {
-
     var fields = [
       {
         name: 'email',
@@ -45,12 +44,59 @@ define(
         placeholder: "Select a list",
         endpoint: "segments",
         multiple: true,
+        selected: function(subscriber) {
+          if (Array.isArray(subscriber.subscriptions) === false) {
+            return null;
+          }
+
+          return subscriber.subscriptions.map(function(subscription) {
+            if (subscription.status === 'subscribed') {
+              return subscription.segment_id;
+            }
+          });
+        },
         filter: function(segment) {
           return !!(!segment.deleted_at);
+        },
+        getSearchLabel: function(segment, subscriber) {
+          let label = '';
+
+          if (subscriber.subscriptions !== undefined) {
+            subscriber.subscriptions.map(function(subscription) {
+              if (segment.id === subscription.segment_id) {
+                label = segment.name;
+
+                if (subscription.status === 'unsubscribed') {
+                  const unsubscribed_at = MailPoet.Date
+                    .format(subscription.updated_at);
+                  label += ' (Unsubscribed on '+unsubscribed_at+')';
+                }
+              }
+            });
+          }
+          return label;
         }
       }
     ];
 
+    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

@@ -115,7 +115,7 @@ define(
          exportData.exportConfirmedOption = false;
          renderSegmentsAndFields(segmentsContainerElement, segments);
        }
-       segmentsContainerElement.select2('val', selectedSegments);
+       segmentsContainerElement.val(selectedSegments).trigger('change');
      });
 
      function toggleNextStepButton(condition) {
@@ -148,7 +148,7 @@ define(
         .done(function (response) {
           MailPoet.Modal.loading(false);
           if (response.result === false) {
-            MailPoet.Notice.error(response.error);
+            MailPoet.Notice.error(response.errors);
           } else {
             resultMessage = MailPoetI18n.exportMessage
              .replace('%1$s', '<strong>' + response.data.totalExported + '</strong>')
@@ -167,4 +167,4 @@ define(
         });
      });
    });
- });
+ });

assets/js/src/subscribers/importExport/import.js

@@ -6,18 +6,23 @@ define(
       'mailpoet',
       'handlebars',
       'papaparse',
-      'select2'
+      'select2',
+      'asyncqueue'
     ],
-    function (Backbone,
+    function (
-              _,
+      Backbone,
-              jQuery,
+      _,
-              MailPoet,
+      jQuery,
-              Handlebars,
+      MailPoet,
-              Papa) {
+      Handlebars,
+      Papa,
+      AsyncQueue
+    ) {
       if (!jQuery('#mailpoet_subscribers_import').length) {
         return;
       }
       jQuery(document).ready(function () {
+        var noticeTimeout = 3000;
         jQuery('input[name="select_method"]').attr('checked', false);
         // configure router
         router = new (Backbone.Router.extend({
@@ -122,7 +127,7 @@ define(
             var pasteSize = encodeURI(pasteInputElement.val()).split(/%..|./).length - 1;
             if (pasteSize > maxPostSizeBytes) {
               MailPoet.Notice.error(MailPoetI18n.maxPostSizeNotice, {
-                timeout: 3000,
+                timeout: noticeTimeout,
               });
               return;
             }
@@ -138,6 +143,14 @@ define(
            */
           uploadElement.change(function () {
             MailPoet.Notice.hide();
+              var ext = this.value.match(/\.(.+)$/);
+              if (ext === null || ext[1].toLowerCase() !== 'csv') {
+                this.value = '';
+                MailPoet.Notice.error(MailPoetI18n.wrongFileFormat, {
+                  timeout: noticeTimeout,
+                });
+              }
+
             toggleNextStepButton(
                 uploadProcessButtonElement,
                 (this.value.trim() !== '') ? 'on' : 'off'
@@ -183,8 +196,8 @@ define(
             }).done(function (response) {
               if (response.result === false) {
                 MailPoet.Notice.hide();
-                MailPoet.Notice.error(response.error, {
+                MailPoet.Notice.error(response.errors, {
-                  timeout: 3000,
+                  timeout: noticeTimeout,
                 });
                 jQuery('.mailpoet_mailchimp-key-status')
                     .removeClass()
@@ -209,7 +222,7 @@ define(
               MailPoet.Modal.loading(false);
               MailPoet.Notice.error(
                   MailPoetI18n.serverError + error.statusText.toLowerCase() + '.', {
-                    timeout: 3000,
+                    timeout: noticeTimeout,
                   }
               );
             });
@@ -235,8 +248,8 @@ define(
               }
               else {
                 MailPoet.Notice.hide();
-                MailPoet.Notice(response.message, {
+                MailPoet.Notice.error(response.errors, {
-                  timeout: 3000,
+                  timeout: noticeTimeout,
                 });
               }
               MailPoet.Modal.loading(false);
@@ -244,7 +257,7 @@ define(
               MailPoet.Modal.loading(false);
               MailPoet.Notice.error(
                   MailPoetI18n.serverError + result.statusText.toLowerCase() + '.', {
-                    timeout: 3000,
+                    timeout: noticeTimeout,
                   }
               );
             });
@@ -336,7 +349,7 @@ define(
               error: function () {
                 MailPoet.Notice.hide();
                 MailPoet.Notice.error(MailPoetI18n.dataProcessingError, {
-                  timeout: 3000,
+                  timeout: noticeTimeout,
                 });
               },
               complete: function (CSV) {
@@ -416,8 +429,11 @@ define(
                 }
                 else {
                   MailPoet.Modal.loading(false);
-                  MailPoet.Notice.error(MailPoetI18n.noValidRecords, {
+                  var errorNotice = MailPoetI18n.noValidRecords;
-                    timeout: 3000,
+                  errorNotice = errorNotice.replace('[link]', MailPoetI18n.csvKBLink);
+                  errorNotice = errorNotice.replace('[/link]', '</a>');
+                  MailPoet.Notice.error(errorNotice, {
+                    timeout: noticeTimeout,
                   });
                 }
               }
@@ -548,7 +564,7 @@ define(
                     if (!segmentSelectionNotice.length) {
                       MailPoet.Notice.error(MailPoetI18n.segmentSelectionRequired, {
                         static: true,
-                        timeout: 3000,
+                        timeout: noticeTimeout,
                         scroll: true,
                         id: 'segmentSelection',
                         hideClose: true
@@ -627,7 +643,7 @@ define(
                         MailPoet.Modal.close();
                         MailPoet.Notice.error(
                             MailPoetI18n.segmentCreateError + response.message + '.', {
-                              timeout: 3000,
+                              timeout: noticeTimeout,
                             }
                         );
                       }
@@ -636,7 +652,7 @@ define(
                       MailPoet.Modal.close();
                       MailPoet.Notice.error(
                           MailPoetI18n.serverError + error.statusText.toLowerCase() + '.', {
-                            timeout: 3000
+                            timeout: noticeTimeout
                           }
                       );
                     });
@@ -721,7 +737,7 @@ define(
             }
           });
 
-          // reduce subscribers object if the total length is geater than the
+          // reduce subscribers object if the total length is greater than the
           // maximum number of defined rows
           if (subscribers.subscribersCount > (maxRowsToShow + 1)) {
             subscribers.subscribers.splice(
@@ -843,7 +859,7 @@ define(
                             }
                             else {
                               MailPoet.Notice.error(MailPoetI18n.customFieldCreateError, {
-                                timeout: 3000,
+                                timeout: noticeTimeout,
                               });
                             }
                             MailPoet.Modal.loading(false);
@@ -852,7 +868,7 @@ define(
                             MailPoet.Modal.loading(false);
                             MailPoet.Notice.error(
                                 MailPoetI18n.serverError + error.statusText.toLowerCase() + '.', {
-                                  timeout: 3000,
+                                  timeout: noticeTimeout,
                                 }
                             );
                           });
@@ -917,7 +933,7 @@ define(
                   if (!jQuery('[data-id="notice_invalidEmail"]').length) {
                     MailPoet.Notice.error(MailPoetI18n.columnContainsInvalidElement, {
                       static: true,
-                      timeout: 3000,
+                      timeout: noticeTimeout,
                       scroll: true,
                       hideClose: true,
                       id: 'invalidEmail'
@@ -997,7 +1013,7 @@ define(
                 if (preventNextStep && !jQuery('.mailpoet_invalidDate').length) {
                   MailPoet.Notice.error(MailPoetI18n.columnContainsInvalidDate, {
                     static: true,
-                    timeout: 3000,
+                    timeout: noticeTimeout,
                     scroll: true,
                     hideClose: true,
                     id: 'invalidDate'
@@ -1037,64 +1053,98 @@ define(
             }
             MailPoet.Modal.loading(true);
 
-            var subscribers = {};
+            var columns = {},
+              queue = new jQuery.AsyncQueue(),
+              batchNumber = 0,
+              batchSize = 2000,
+              timestamp = Date.now() / 1000,
+              subscribers = [],
+              importResults = {
+                'created': 0,
+                'updated': 0,
+                'errors': [],
+                'segments': []
+              },
+              splitSubscribers = function (subscribers, size) {
+                return subscribers.reduce(function (res, item, index) {
+                  if (index % size === 0) {
+                    res.push([]);
+                  }
+                  res[res.length - 1].push(item);
+                  return res;
+                }, []);
+              },
+              subscribers = splitSubscribers(importData.step1.subscribers, batchSize);
 
             _.each(jQuery('select.mailpoet_subscribers_column_data_match'),
-                function (column, index) {
+              function (column, columnIndex) {
-                  var columnId = jQuery(column).data('column-id');
+                var columnId = jQuery(column).data('column-id');
-                  if (columnId === 'ignore') {
+                if (columnId === 'ignore') {
-                    return;
+                  return;
-                  }
+                }
-                  subscribers[columnId] = [];
+                columns[columnId] = columnIndex;
-                  _.each(importData.step1.subscribers, function (subsciber) {
+              });
-                    subscribers[columnId].push(
-                        _.chain(subsciber)
-                            .pick(index)
-                            .toArray()
-                            .flatten()
-                            .value()
-                    );
-                  });
-                  subscribers[columnId] = _.flatten(subscribers[columnId]);
-                });
 
-            MailPoet.Ajax.post({
+            _.each(subscribers, function () {
-              endpoint: 'ImportExport',
+              queue.add(function (queue) {
-              action: 'processImport',
+                queue.pause();
-              data: JSON.stringify({
+                MailPoet.Ajax
-                subscribers: subscribers,
+                  .post({
-                segments: segmentSelectElement.val(),
+                    endpoint: 'ImportExport',
-                updateSubscribers: (jQuery(':radio[name="subscriber_update_option"]:checked').val() === 'yes') ? true : false
+                    action: 'processImport',
+                    data: JSON.stringify({
+                      columns: columns,
+                      subscribers: subscribers[batchNumber],
+                      timestamp: timestamp,
+                      segments: segmentSelectElement.val(),
+                      updateSubscribers: (jQuery(':radio[name="subscriber_update_option"]:checked').val() === 'yes') ? true : false
+                    })
+                  })
+                  .done(function (response) {
+                    if (response.result === false) {
+                      importResults.errors.push(response.errors);
+                    } else {
+                      importResults.created = response.data.created;
+                      importResults.updated = response.data.updated;
+                      importResults.segments = response.data.segments;
+                    }
+                    queue.run();
+                  })
+                  .error(function (error) {
+                    importResults.errors.push(
+                      MailPoetI18n.serverError + error.statusText.toLowerCase() + '.'
+                    );
+                    queue.run();
+                  });
+                batchNumber++;
               })
-            }).done(function (response) {
+            });
+
+            queue.run();
+
+            queue.onComplete(function () {
               MailPoet.Modal.loading(false);
-              if (response.result === false) {
+              if (importResults.errors.length > 0 && !importResults.updated && !importResults.created) {
-                MailPoet.Notice.error(response.error, {
+                MailPoet.Notice.error(_.flatten(importResults.errors), {
-                  timeout: 3000,
+                    timeout: noticeTimeout,
-                });
+                  }
-              } else {
+                );
-                mailpoetSegments = response.data.segments;
+              }
-                response.data.segments = _.map(segmentSelectElement.select2('data'),
+              else {
-                    function (data) {
+                mailpoetSegments = importResults.segments;
-                      return data.name;
+                importResults.segments = _.map(segmentSelectElement.select2('data'),
-                    });
+                  function (data) {
-                importData.step2 = response.data;
+                    return data.name;
+                  });
+                importData.step2 = importResults;
                 enableSegmentSelection(mailpoetSegments);
                 router.navigate('step3', {trigger: true});
               }
-            }).error(function (error) {
-              MailPoet.Modal.loading(false);
-              MailPoet.Notice.error(
-                  MailPoetI18n.serverError + error.statusText.toLowerCase() + '.',  {
-                    timeout: 3000,
-                  }
-              );
             });
           });
 
           filterSubscribers();
           enableSegmentSelection(mailpoetSegments);
-
         });
 
         router.on('route:step3', function () {
@@ -1105,6 +1155,12 @@ define(
 
           showCurrentStep();
 
+          if (importData.step2.errors.length > 0) {
+            MailPoet.Notice.error(_.flatten(importData.step2.errors), {
+              timeout: noticeTimeout,
+            });
+          }
+
           // display statistics
           var subscribersDataImportResultsTemplate =
                   Handlebars

assets/js/src/subscribers/list.jsx

@@ -208,6 +208,16 @@ const bulk_actions = [
       );
     }
   },
+  {
+    name: 'sendConfirmationEmail',
+    label: 'Resend confirmation email',
+    onSuccess: function(response) {
+      MailPoet.Notice.success(
+        '%$1d confirmation emails have been sent.'
+        .replace('%$1d', ~~response)
+      );
+    }
+  },
   {
     name: 'trash',
     label: 'Trash',
@@ -231,6 +241,15 @@ const item_actions = [
 ];
 
 const SubscriberList = React.createClass({
+  getSegmentFromId: function(segment_id) {
+    let result = false;
+    mailpoet_segments.map(function(segment) {
+      if (segment.id === segment_id) {
+        result = segment;
+      }
+    });
+    return result;
+  },
   renderItem: function(subscriber, actions) {
     let row_classes = classNames(
       'manage-column',
@@ -255,11 +274,41 @@ const SubscriberList = React.createClass({
       break;
     }
 
-    let segments = mailpoet_segments.filter(function(segment) {
+    let segments = false;
-      return (jQuery.inArray(segment.id, subscriber.segments) !== -1);
+
-    }).map(function(segment) {
+    if (subscriber.subscriptions.length > 0) {
-      return segment.name;
+      let subscribed_segments = [];
-    }).join(', ');
+      let unsubscribed_segments = [];
+
+      subscriber.subscriptions.map((subscription) => {
+        const segment = this.getSegmentFromId(subscription.segment_id);
+        if(segment === false) return;
+        if (subscription.status === 'subscribed') {
+          subscribed_segments.push(segment.name);
+        } else if (subscription.status === 'unsubscribed') {
+          unsubscribed_segments.push(segment.name);
+        }
+      });
+      segments = (
+        <span>
+          <span className="mailpoet_segments_subscribed">
+            { subscribed_segments.join(', ') }
+            {
+              (
+                subscribed_segments.length > 0
+                && unsubscribed_segments.length > 0
+              ) ? ' / ' : ''
+            }
+          </span>
+          <span
+            className="mailpoet_segments_unsubscribed"
+            title="Lists to which the subscriber was subscribed."
+          >
+            { unsubscribed_segments.join(', ') }
+          </span>
+        </span>
+      );
+    }
 
     let avatar = false;
     if(subscriber.avatar_url) {
@@ -292,10 +341,10 @@ const SubscriberList = React.createClass({
           { segments }
         </td>
         <td className="column-date" data-colname="Subscribed on">
-          <abbr>{ subscriber.created_at }</abbr>
+          <abbr>{ MailPoet.Date.full(subscriber.created_at) }</abbr>
         </td>
         <td className="column-date" data-colname="Last modified on">
-          <abbr>{ subscriber.updated_at }</abbr>
+          <abbr>{ MailPoet.Date.full(subscriber.updated_at) }</abbr>
         </td>
       </div>
     );
@@ -313,6 +362,7 @@ const SubscriberList = React.createClass({
         </h2>
 
         <Listing
+          limit={ mailpoet_listing_per_page }
           location={ this.props.location }
           params={ this.props.params }
           endpoint="subscribers"

assets/js/src/vendor/jquery.asyncqueue.js

@@ -0,0 +1,79 @@
+/*
+* This file is part of the jquery plugin "asyncQueue".
+*
+* (c) Sebastien Roch <roch.sebastien@gmail.com>
+*
+* For the full copyright and license information, please view the LICENSE
+* file that was distributed with this source code.
+*/
+(function($){
+    $.AsyncQueue = function() {
+        var that = this,
+            queue = [],
+            failureFunc,
+            completeFunc,
+            paused = false,
+            lastCallbackData,
+            _run;
+
+        _run = function() {
+            var f = queue.shift();
+
+            if (f) {
+                f.apply(that, [that]);
+                if (paused === false) {
+                    _run();
+                }
+            } else {
+                if(completeFunc){
+                    completeFunc.apply(that);
+                }
+            }
+        }
+
+        this.onFailure = function(func) {
+            failureFunc = func;
+        }
+
+        this.onComplete = function(func) {
+            completeFunc = func;
+        }
+
+        this.add = function(func) {
+            queue.push(func);
+            return this;
+        }
+
+        this.storeData = function(dataObject) {
+            lastCallbackData = dataObject;
+            return this;
+        }
+
+        this.lastCallbackData = function () {
+            return lastCallbackData;
+        }
+
+        this.run = function() {
+            paused = false;
+            _run();
+        }
+
+        this.pause = function () {
+            paused = true;
+            return this;
+        }
+
+        this.failure = function() {
+            paused = true;
+            if (failureFunc) {
+                var args = [that];
+                for(i = 0; i < arguments.length; i++) {
+                    args.push(arguments[i]);
+                }
+                failureFunc.apply(that, args);
+            }
+        }
+
+        return this;
+    }
+})(jQuery);

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();

lib/Config/Changelog.php

@@ -1,8 +1,12 @@
 <?php
 namespace MailPoet\Config;
 use \MailPoet\Models\Setting;
+use \MailPoet\Util\Url;
 
 class Changelog {
+  function __construct() {
+  }
+
   function init() {
     $doing_ajax = (bool)(defined('DOING_AJAX') && DOING_AJAX);
 
@@ -42,20 +46,7 @@ class Changelog {
       // save version number
       Setting::setValue('version', Env::$version);
 
-      global $wp;
+      Url::redirectWithReferer($redirect_url);
-      $current_url = home_url(add_query_arg($wp->query_string, $wp->request));
-
-      if($redirect_url !== $current_url) {
-        wp_safe_redirect(
-          add_query_arg(
-            array(
-              'mailpoet_redirect' => urlencode($current_url)
-            ),
-            $redirect_url
-          )
-        );
-        exit;
-      }
     }
   }
 }

lib/Config/Env.php

@@ -36,8 +36,9 @@ class Env {
     self::$views_path = self::$path . '/views';
     self::$assets_path = self::$path . '/assets';
     self::$assets_url = plugins_url('/assets', $file);
-    self::$temp_path = wp_upload_dir()['path'];
+    $wp_upload_dir = wp_upload_dir();
-    self::$temp_URL = wp_upload_dir()['url'];
+    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_';
@@ -72,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,89 @@
 <?php
 namespace MailPoet\Config;
+use MailPoet\Cron\Workers\Scheduler;
+use MailPoet\Cron\Workers\SendingQueue;
+use \MailPoet\Models\Setting;
 
 class Hooks {
   function __construct() {
   }
 
   function init() {
+    $this->setupSubscribe();
+    $this->setupWPUsers();
+    $this->setupImageSize();
+    $this->setupListing();
+    $this->setupCronWorkers();
+  }
+
+  function setupSubscribe() {
+    $subscribe = Setting::getValue('subscribe', array());
+    // Subscribe in comments
+    if(
+      isset($subscribe['on_comment']['enabled'])
+      &&
+      (bool)$subscribe['on_comment']['enabled']
+    ) {
+      if(is_user_logged_in()) {
+        add_action(
+          'comment_form_field_comment',
+          '\MailPoet\Subscription\Comment::extendLoggedInForm'
+        );
+      } else {
+        add_action(
+          'comment_form_after_fields',
+          '\MailPoet\Subscription\Comment::extendLoggedOutForm'
+        );
+      }
+
+      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(
+      isset($subscribe['on_register']['enabled'])
+      &&
+      (bool)$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
+        );
+      }
+    }
+  }
+
+  function setupWPUsers() {
     // WP Users synchronization
     add_action(
       'user_register',
@@ -38,19 +116,50 @@ class Hooks {
       '\MailPoet\Segments\WP::synchronizeUser',
       1
     );
+  }
 
+  function setupImageSize() {
     add_filter(
       'image_size_names_choose',
-      array(
+      array($this, 'appendImageSize'),
-        $this,
+      10, 1
-        'appendImageSizes'
-      )
     );
   }
 
-  function appendImageSizes($sizes) {
+  function appendImageSize($sizes) {
     return array_merge($sizes, array(
-      'mailpoet_newsletter_max' => __('MailPoet Newsletter'),
+      'mailpoet_newsletter_max' => __('MailPoet Newsletter')
     ));
   }
+
+  function setupListing() {
+    add_filter(
+      'set-screen-option',
+      array($this, 'setScreenOption'),
+      10, 3
+    );
+  }
+
+  function setScreenOption($status, $option, $value) {
+    if(preg_match('/^mailpoet_(.*)_per_page$/', $option)) {
+      return $value;
+    } else {
+      return $status;
+    }
+  }
+
+  function setupCronWorkers() {
+    add_action('mailpoet_cron_worker', array($this, 'runSchedulerWorker'), 10, 1);
+    add_action('mailpoet_cron_worker', array($this, 'runSendingQueueWorker'), 10, 1);
+  }
+
+  function runSchedulerWorker($timer) {
+    $scheduler = new Scheduler($timer);
+    $scheduler->process();
+
+  }
+  function runSendingQueueWorker($timer) {
+    $sending_queue = new SendingQueue($timer);
+    $sending_queue->process();
+  }
 }

lib/Config/Initializer.php

@@ -4,10 +4,11 @@ namespace MailPoet\Config;
 use MailPoet\Models;
 use MailPoet\Cron\Supervisor;
 use MailPoet\Router;
-use MailPoet\Models\Setting;
 
 if(!defined('ABSPATH')) exit;
 
+require_once(ABSPATH . 'wp-admin/includes/plugin.php');
+
 class Initializer {
   function __construct($params = array(
     'file' => '',
@@ -18,20 +19,39 @@ class Initializer {
 
   function init() {
     $this->setupDB();
-    $this->setupActivator();
+
-    $this->setupRenderer();
+    register_activation_hook(Env::$file, array($this, 'runMigrator'));
-    $this->setupLocalizer();
+    register_activation_hook(Env::$file, array($this, 'runPopulator'));
-    $this->setupMenu();
+
+    add_action('plugins_loaded', array($this, 'setup'));
+    add_action('init', array($this, 'onInit'));
+    add_action('widgets_init', array($this, 'setupWidget'));
+  }
+
+  function setup() {
+    try {
+      $this->setupRenderer();
+      $this->setupLocalizer();
+      $this->setupMenu();
+      $this->setupPermissions();
+      $this->setupAnalytics();
+      $this->setupChangelog();
+      $this->setupShortcodes();
+      $this->setupHooks();
+      $this->setupImages();
+      $this->setupPublicAPI();
+      $this->runQueueSupervisor();
+    } catch(\Exception $e) {
+      // if anything goes wrong during init
+      // automatically deactivate the plugin
+      deactivate_plugins(Env::$file);
+    }
+  }
+
+  function onInit() {
     $this->setupRouter();
-    $this->setupWidget();
+    $this->setupPages();
-    $this->setupAnalytics();
-    $this->setupPermissions();
-    $this->setupChangelog();
-    $this->setupPublicAPI();
     $this->runQueueSupervisor();
-    $this->setupShortcodes();
-    $this->setupHooks();
-    $this->setupImages();
   }
 
   function setupDB() {
@@ -39,6 +59,10 @@ class Initializer {
     \ORM::configure('username', Env::$db_username);
     \ORM::configure('password', Env::$db_password);
     \ORM::configure('logging', WP_DEBUG);
+    \ORM::configure('logger', function($query, $time) {
+      // error_log("\n".$query."\n");
+    });
+
     \ORM::configure('driver_options', array(
       \PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8',
       \PDO::MYSQL_ATTR_INIT_COMMAND => 'SET TIME_ZONE = "+00:00"'
@@ -49,8 +73,6 @@ class Initializer {
     $newsletters = Env::$db_prefix . 'newsletters';
     $newsletter_templates = Env::$db_prefix . 'newsletter_templates';
     $segments = Env::$db_prefix . 'segments';
-    $filters = Env::$db_prefix . 'filters';
-    $segment_filter = Env::$db_prefix . 'segment_filter';
     $forms = Env::$db_prefix . 'forms';
     $subscriber_segment = Env::$db_prefix . 'subscriber_segment';
     $newsletter_segment = Env::$db_prefix . 'newsletter_segment';
@@ -65,8 +87,6 @@ class Initializer {
     define('MP_SETTINGS_TABLE', $settings);
     define('MP_NEWSLETTERS_TABLE', $newsletters);
     define('MP_SEGMENTS_TABLE', $segments);
-    define('MP_FILTERS_TABLE', $filters);
-    define('MP_SEGMENT_FILTER_TABLE', $segment_filter);
     define('MP_FORMS_TABLE', $forms);
     define('MP_SUBSCRIBER_SEGMENT_TABLE', $subscriber_segment);
     define('MP_NEWSLETTER_TEMPLATES_TABLE', $newsletter_templates);
@@ -79,9 +99,14 @@ class Initializer {
     define('MP_NEWSLETTER_STATISTICS_TABLE', $newsletter_statistics);
   }
 
-  function setupActivator() {
+  function runMigrator() {
-    $activator = new Activator();
+    $migrator = new Migrator();
-    $activator->init();
+    $migrator->up();
+  }
+
+  function runPopulator() {
+    $populator = new Populator();
+    $populator->up();
   }
 
   function setupRenderer() {
@@ -95,10 +120,7 @@ class Initializer {
   }
 
   function setupMenu() {
-    $menu = new Menu(
+    $menu = new Menu($this->renderer, Env::$assets_url);
-      $this->renderer,
-      Env::$assets_url
-    );
     $menu->init();
   }
 
@@ -127,10 +149,19 @@ class Initializer {
     $changelog->init();
   }
 
+  function setupPages() {
+    $pages = new \MailPoet\Settings\Pages();
+    $pages->init();
+
+    $subscription_pages = new \MailPoet\Subscription\Pages();
+    $subscription_pages->init();
+  }
+
   function setupShortcodes() {
     $shortcodes = new Shortcodes();
     $shortcodes->init();
   }
+
   function setupHooks() {
     $hooks = new Hooks();
     $hooks->init();
@@ -146,7 +177,7 @@ class Initializer {
     try {
       $supervisor = new Supervisor();
       $supervisor->checkDaemon();
-    } catch (\Exception $e) {
+    } catch(\Exception $e) {
     }
   }
 

lib/Config/Localizer.php

@@ -11,8 +11,7 @@ class Localizer {
   function init() {
     add_action(
       'init',
-      array($this, 'setup'),
+      array($this, 'setup')
-      0
     );
   }
 

lib/Config/Menu.php

@@ -13,6 +13,7 @@ use MailPoet\Settings\Pages;
 use MailPoet\Subscribers\ImportExport\BootStrapMenu;
 use MailPoet\Util\DKIM;
 use MailPoet\Util\Permissions;
+use MailPoet\Listing;
 
 if(!defined('ABSPATH')) exit;
 
@@ -67,7 +68,7 @@ class Menu {
         'forms'
       )
     );
-    add_submenu_page(
+    $subscribers_page = add_submenu_page(
       'mailpoet',
       __('Subscribers'),
       __('Subscribers'),
@@ -78,6 +79,17 @@ class Menu {
         'subscribers'
       )
     );
+    // add limit per page to screen options
+    add_action('load-'.$subscribers_page, function() {
+      add_screen_option('per_page', array(
+        'label' => _x(
+          'Number of subscribers per page',
+          'subscribers per page (screen options)'
+        ),
+        'option' => 'mailpoet_subscribers_per_page'
+      ));
+    });
+
     add_submenu_page(
       'mailpoet',
       __('Segments'),
@@ -190,6 +202,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 +254,7 @@ class Menu {
 
   function settings() {
     $settings = Setting::getAll();
+    $flags = $this->_getFlags();
 
     // dkim: check if public/private keys have been generated
     if(
@@ -258,10 +273,9 @@ class Menu {
 
     $data = array(
       'settings' => $settings,
-      'segments' => Segment::getPublished()
+      'segments' => Segment::getPublic()->findArray(),
-        ->findArray(),
       'pages' => Pages::getAll(),
-      'flags' => $this->_getFlags(),
+      'flags' => $flags,
       'charsets' => Charsets::getAll(),
       'current_user' => wp_get_current_user(),
       'permissions' => Permissions::getAll(),
@@ -294,7 +308,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;
@@ -303,8 +317,33 @@ class Menu {
   function subscribers() {
     $data = array();
 
+    // listing: limit per page
+    $listing_per_page = get_user_meta(
+      get_current_user_id(), 'mailpoet_subscribers_per_page', true
+    );
+    $data['per_page'] = (!empty($listing_per_page))
+      ? (int)$listing_per_page
+      : Listing\Handler::DEFAULT_LIMIT_PER_PAGE;
+
     $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);
   }
 
@@ -341,6 +380,7 @@ class Menu {
 
     $data = array(
       'customFields' => $custom_fields,
+      'settings' => Setting::getAll(),
     );
     wp_enqueue_media();
     wp_enqueue_script('tinymce-wplink', includes_url('js/tinymce/plugins/wplink/plugin.js'));

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');
 
@@ -236,10 +236,7 @@ class Migrator {
       'newsletter_id mediumint(9) NOT NULL,',
       'subscriber_id mediumint(9) NOT NULL,',
       'queue_id mediumint(9) NOT NULL,',
-      'sent_at TIMESTAMP NOT NULL DEFAULT 0,',
+      'sent_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,',
-      'created_at TIMESTAMP NOT NULL DEFAULT 0,',
-      'updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,',
-      'deleted_at TIMESTAMP NULL DEFAULT NULL,',
       'PRIMARY KEY  (id)',
     );
     return $this->sqlify(__FUNCTION__, $attributes);

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/FranksRoastHouseTemplate.php

@@ -68,7 +68,7 @@ class FranksRoastHouseTemplate {
                     "link" => "http://www.example.com",
                     "src" => $this->template_image_url . "/header-v2.jpg",
                     "alt" => __("Frank's Roast House"),
-                    "padded" => false,
+                    "fullWidth" => true,
                     "width" => "600px",
                     "height" => "220px",
                     "styles" => array(
@@ -95,7 +95,7 @@ class FranksRoastHouseTemplate {
                     "link" => "http://example.org",
                     "src" => $this->template_image_url . "/coffee-grain.jpg",
                     "alt" => __("coffee-grain-3-1329675-1599x941"),
-                    "padded" => true,
+                    "fullWidth" => false,
                     "width" => "1599px",
                     "height" => "777px",
                     "styles" => array(
@@ -139,7 +139,7 @@ class FranksRoastHouseTemplate {
                     "link" => "http://example.org",
                     "src" => $this->template_image_url . "/sandwich.jpg",
                     "alt" => "sandwich",
-                    "padded" => true,
+                    "fullWidth" => false,
                     "width" => "640px",
                     "height" => "344px",
                     "styles" => array(
@@ -168,6 +168,7 @@ class FranksRoastHouseTemplate {
                         "fontColor" => "#ffffff",
                         "fontFamily" => "Arial",
                         "fontSize" => "14px",
+                        "fontWeight" => "normal",
                         "textAlign" => "center"
                       )
                     )
@@ -238,7 +239,7 @@ class FranksRoastHouseTemplate {
                     "link" => "http://example.org",
                     "src" => $this->template_image_url . "/map-v2.jpg",
                     "alt" => __("map-v2"),
-                    "padded" => true,
+                    "fullWidth" => false,
                     "width" => "636px",
                     "height" => "342px",
                     "styles" => array(
@@ -279,19 +280,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/PopulatorData/Templates/PostNotificationsBlankTemplate.php

@@ -90,7 +90,7 @@ class PostNotificationsBlankTemplate {
                     "link" => "http://example.org",
                     "src" => $this->template_image_url . "/ALC-widget-icon.png",
                     "alt" => __("ALC-widget-icon"),
-                    "padded" => true,
+                    "fullWidth" => false,
                     "width" => "200px",
                     "height" => "134px",
                     "styles" => array(
@@ -325,6 +325,7 @@ class PostNotificationsBlankTemplate {
                           "fontColor" => "#ffffff",
                           "fontFamily" => "Arial",
                           "fontSize" => "18px",
+                          "fontWeight" => "normal",
                           "textAlign" => "center"
                         )
                       )

lib/Config/PopulatorData/Templates/WelcomeTemplate.php

@@ -68,7 +68,7 @@ class WelcomeTemplate {
                     "link" => "http://example.org",
                     "src" => $this->template_image_url . "/logo-header.gif",
                     "alt" => "logo-header",
-                    "padded" => true,
+                    "fullWidth" => false,
                     "width" => "233px",
                     "height" => "118px",
                     "styles" => array(

lib/Config/PublicAPI.php

@@ -20,7 +20,7 @@ class PublicAPI {
       Helpers::underscoreToCamelCase($_GET['action']) :
       false;
     $this->request_payload = isset($_GET['request_payload']) ?
-      json_decode(urldecode($_GET['request_payload']), true) :
+      unserialize(base64_decode($_GET['request_payload'])) :
       false;
   }
 

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();
+      $this->setupDependencies();
-      add_action('widgets_init', array($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,78 @@
+<?php
+namespace MailPoet\Cron;
+
+use MailPoet\Models\Setting;
+use MailPoet\Util\Security;
+
+if(!defined('ABSPATH')) exit;
+
+class CronHelper {
+  const daemon_execution_limit = 20;
+  const daemon_execution_timeout = 35;
+  const daemon_request_timeout = 2;
+
+  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, $timeout = self::daemon_request_timeout) {
+    $payload = serialize(array('token' => $token));
+    $url = '/?mailpoet-api&section=queue&action=run&request_payload=' .
+      base64_encode($payload);
+    $args = array(
+      'timeout' => $timeout,
+      '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.'));
+  }
+
+  static function checkExecutionTimer($timer) {
+    $elapsed_time = microtime(true) - $timer;
+    if($elapsed_time >= self::daemon_execution_limit) {
+      throw new \Exception(__('Maximum execution time reached.'));
+    }
+  }
+}

lib/Cron/Daemon.php

@@ -1,9 +1,9 @@
 <?php
 namespace MailPoet\Cron;
 
+use MailPoet\Cron\Workers\Scheduler;
 use MailPoet\Cron\Workers\SendingQueue;
-use MailPoet\Models\Setting;
+use MailPoet\Models\Newsletter;
-use MailPoet\Util\Security;
 
 require_once(ABSPATH . 'wp-includes/pluggable.php');
 
@@ -13,132 +13,68 @@ class Daemon {
   public $daemon;
   public $request_payload;
   public $refreshed_token;
-  public $timer;
+  const daemon_request_timeout = 5;
+  private $timer;
 
   function __construct($request_payload = array()) {
     set_time_limit(0);
     ignore_user_abort();
-    $this->daemon = $this->getDaemon();
+    $this->daemon = CronHelper::getDaemon();
-    $this->refreshed_token = $this->refreshToken();
+    $this->token = CronHelper::createToken();
     $this->request_payload = $request_payload;
     $this->timer = microtime(true);
   }
 
-  function start() {
+  function run() {
-    if(!isset($this->request_payload['session'])) {
-      $this->abortWithError(__('Missing session ID.'));
-    }
-    $this->manageSession('start');
     $daemon = $this->daemon;
     if(!$daemon) {
-      $this->saveDaemon(
+      $this->abortWithError(__('Daemon does not exist.'));
-        array(
-          'status' => 'starting',
-          'counter' => 0
-        )
-      );
-    }
-    if($daemon['status'] === 'started') {
-      $_SESSION['cron_daemon'] = array(
-        'result' => false,
-        'errors' => array(__('Daemon already running.'))
-      );
-    }
-    if($daemon['status'] === 'starting') {
-      $_SESSION['cron_daemon'] = 'started';
-      $_SESSION['cron_daemon'] = array('result' => true);
-      $this->manageSession('end');
-      $daemon['status'] = 'started';
-      $daemon['token'] = $this->refreshed_token;
-      $this->saveDaemon($daemon);
-      $this->callSelf();
-    }
-    $this->manageSession('end');
-  }
-
-  function run() {
-    $allowed_statuses = array(
-      'stopping',
-      'starting',
-      'started'
-    );
-    if(!$this->daemon || !in_array($this->daemon['status'], $allowed_statuses)) {
-      $this->abortWithError(__('Invalid daemon status.'));
     }
     if(!isset($this->request_payload['token']) ||
-      $this->request_payload['token'] !== $this->daemon['token']
+      $this->request_payload['token'] !== $daemon['token']
     ) {
-      $this->abortWithError('Invalid token.');
+      $this->abortWithError(__('Invalid or missing token.'));
     }
+    $this->abortIfStopped($daemon);
     try {
-      $sending_queue = new SendingQueue($this->timer);
+      do_action('mailpoet_cron_worker', $this->timer);
-      $sending_queue->process();
+    } catch(\Exception $e) {
-    } catch(Exception $e) {
     }
     $elapsed_time = microtime(true) - $this->timer;
-    if($elapsed_time < 30) {
+    if($elapsed_time < CronHelper::daemon_execution_limit) {
-      sleep(30 - $elapsed_time);
+      sleep(CronHelper::daemon_execution_limit - $elapsed_time);
+    }
+    // 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;
     }
-    // after each execution, read daemon in case its status was modified
-    $daemon = $this->getDaemon();
-
-    if($daemon['status'] === 'stopping') $daemon['status'] = 'stopped';
-    if($daemon['status'] === 'starting') $daemon['status'] = 'started';
-
-    $daemon['token'] = $this->refreshed_token;
     $daemon['counter']++;
-
+    $this->abortIfStopped($daemon);
-    $this->saveDaemon($daemon);
+    if($daemon['status'] === 'starting') {
-
+      $daemon['status'] = 'started';
-    if($daemon['status'] === 'started') $this->callSelf();
-  }
-
-  function getDaemon() {
-    return Setting::getValue('cron_daemon');
-  }
-
-  function saveDaemon($daemon_data) {
-    $daemon_data['updated_at'] = time();
-
-    return Setting::setValue(
-      'cron_daemon',
-      $daemon_data
-    );
-  }
-
-  function refreshToken() {
-    return Security::generateRandomString();
-  }
-
-  function manageSession($action) {
-    switch($action) {
-    case 'start':
-      if(session_id()) {
-        session_write_close();
-      }
-      session_id($this->request_payload['session']);
-      session_start();
-    break;
-    case 'end':
-      session_write_close();
-    break;
     }
+    $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->refreshed_token));
+    CronHelper::accessDaemon($this->token, self::daemon_request_timeout);
-    Supervisor::accessRemoteUrl(
-      '/?mailpoet-api&section=queue&action=run&request_payload=' . urlencode($payload)
-    );
-    exit;
-  }
-
-  function abortWithError($error) {
-    wp_send_json(
-      array(
-        'result' => false,
-        'errors' => array($error)
-      ));
     exit;
   }
 }

lib/Cron/Supervisor.php

@@ -1,103 +1,94 @@
 <?php
 namespace MailPoet\Cron;
 
-use MailPoet\Config\Env;
-use MailPoet\Models\Setting;
-
 if(!defined('ABSPATH')) exit;
 
 class Supervisor {
   public $daemon;
+  public $token;
+  public $force_run;
 
-  function __construct($force_start = false) {
+  function __construct($force_run = false) {
-    $this->force_start = $force_start;
+    $this->daemon = CronHelper::getDaemon();
-    if(!Env::isPluginActivated()) {
+    $this->token = CronHelper::createToken();
-      throw new \Exception(__('MailPoet is not activated.'));
+    $this->force_run = $force_run;
-    }
-    $this->daemon = $this->getDaemon();
   }
 
   function checkDaemon() {
-    if(!$this->daemon) {
+    $daemon = $this->daemon;
-      return $this->startDaemon();
+    if(!$daemon) {
+      $daemon = CronHelper::createDaemon($this->token);
+      return $this->runDaemon($daemon);
     }
-    if(
+    // if the daemon is stopped, return its status and do nothing
-      !$this->force_start &&
+    if(!$this->force_run &&
-      in_array($this->daemon['status'], array('stopped', 'stopping'))
+      isset($daemon['status']) &&
+      $daemon['status'] === 'stopped'
     ) {
-      return $this->daemon['status'];
+      return $this->formatDaemonStatusMessage($daemon['status']);
+
     }
-
+    $elapsed_time = time() - (int) $daemon['updated_at'];
-    $elapsed_time = time() - (int)$this->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 < 40) {
+    if($elapsed_time < CronHelper::daemon_execution_timeout && !$this->force_run) {
-      if(!$this->force_start) {
+      return $this->formatDaemonStatusMessage($daemon['status']);
-        return;
-      }
-      if($this->daemon['status'] === 'stopping' ||
-        $this->daemon['status'] === 'starting'
-      ) {
-        return $this->daemon['status'];
-      }
     }
-    $this->daemon['status'] = 'starting';
+    // if it's been less than 40 seconds since last execution, we are
-    $this->saveDaemon($this->daemon);
+    // force-running the daemon and it's either being started or stopped,
-    return $this->startDaemon();
+    // return its status and do nothing
+    elseif($elapsed_time < CronHelper::daemon_execution_timeout &&
+      $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() {
+  function runDaemon() {
-    if(!session_id()) session_start();
+    $request = CronHelper::accessDaemon($this->token);
-    $sessionId = session_id();
+    preg_match('/\[(mailpoet_cron_error:.*?)\]/i', $request, $status);
-    session_write_close();
+    $daemon = CronHelper::getDaemon();
-    $_SESSION['cron_daemon'] = null;
+    if(!empty($status) || !$daemon) {
-    $requestPayload = json_encode(array('session' => $sessionId));
+      if(!$daemon) {
-    self::accessRemoteUrl(
+        $message = __('Daemon failed to run.');
-      '/?mailpoet-api&section=queue&action=start&request_payload=' .
+      } else {
-      urlencode($requestPayload)
+        list(, $message) = explode(':', $status[0]);
-    );
+        $message = base64_decode($message);
-    session_start();
+      }
-    $daemonStatus = $_SESSION['cron_daemon'];
+      return $this->formatResultMessage(
-    unset($_SESSION['daemon']);
+        false,
-    session_write_close();
+        $message
-    return $daemonStatus;
+      );
+    }
+    return $this->formatDaemonStatusMessage($daemon['status']);
   }
 
-  function getDaemon() {
+  private function formatDaemonStatusMessage($status) {
-    return Setting::getValue('cron_daemon');
+    return $this->formatResultMessage(
-  }
+      true,
-
+      sprintf(
-  function saveDaemon($daemon_data) {
+        __('Daemon is currently %s.'),
-    return Setting::setValue(
+        __($status)
-      'cron_daemon',
+      )
-      $daemon_data
     );
   }
 
-  static function accessRemoteUrl($url) {
+  private function formatResultMessage($result, $message) {
-    $args = array(
+    $formattedResult = array(
-      'timeout' => 1,
+      'result' => $result
-      'user-agent' => 'MailPoet (www.mailpoet.com) Cron'
     );
-    wp_remote_get(
+    if(!$result) {
-      self::getSiteUrl() . $url,
+      $formattedResult['errors'] = array($message);
-      $args
+    } else {
-    );
+      $formattedResult['message'] = $message;
-  }
+    }
-
+    return $formattedResult;
-  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 connections fail
-    throw new \Exception(__('Site URL is unreachable.'));
   }
 }

lib/Cron/Workers/Scheduler.php

@@ -0,0 +1,27 @@
+<?php
+namespace MailPoet\Cron\Workers;
+
+use MailPoet\Cron\CronHelper;
+use MailPoet\Models\Setting;
+use MailPoet\Util\Security;
+
+if(!defined('ABSPATH')) exit;
+
+class Scheduler {
+  public $timer;
+
+  function __construct($timer = false) {
+    $this->timer = ($timer) ? $timer : microtime(true);
+    CronHelper::checkExecutionTimer($this->timer);
+  }
+
+  function process() {
+  }
+
+  function checkExecutionTimer() {
+    $elapsed_time = microtime(true) - $this->timer;
+    if($elapsed_time >= CronHelper::daemon_execution_limit) {
+      throw new \Exception(__('Maximum execution time reached.'));
+    }
+  }
+}

lib/Cron/Workers/SendingQueue.php

@@ -1,123 +1,192 @@
 <?php
 namespace MailPoet\Cron\Workers;
 
+use MailPoet\Cron\CronHelper;
 use MailPoet\Mailer\Mailer;
 use MailPoet\Models\Newsletter;
 use MailPoet\Models\NewsletterStatistics;
+use MailPoet\Models\Setting;
 use MailPoet\Models\Subscriber;
 use MailPoet\Newsletter\Renderer\Renderer;
+use MailPoet\Newsletter\Shortcodes\Shortcodes;
+use MailPoet\Util\Helpers;
+use MailPoet\Util\Security;
 
 if(!defined('ABSPATH')) exit;
 
 class SendingQueue {
-  public $timer;
+  public $mta_config;
+  public $mta_log;
+  public $processing_method;
+  private $timer;
+  const batch_size = 50;
 
   function __construct($timer = false) {
+    $this->mta_config = $this->getMailerConfig();
+    $this->mta_log = $this->getMailerLog();
+    $this->processing_method = ($this->mta_config['method'] === 'MailPoet') ?
+      'processBulkSubscribers' :
+      'processIndividualSubscriber';
     $this->timer = ($timer) ? $timer : microtime(true);
+    CronHelper::checkExecutionTimer($this->timer);
   }
 
   function process() {
-    // TODO: implement mailer sending frequency limits
     foreach($this->getQueues() as $queue) {
-      $newsletter = Newsletter::findOne($queue->newsletter_id)
+      $newsletter = Newsletter::findOne($queue->newsletter_id);
-        ->asArray();
       if(!$newsletter) {
         continue;
-      };
+      }
-      $mailer = $this->configureMailerForNewsletter($newsletter);
+      $queue->subscribers = (object) unserialize($queue->subscribers);
-      $newsletter = $this->renderNewsletter($newsletter);
+      if(!isset($queue->subscribers->processed)) {
-      $subscribers = json_decode($queue->subscribers, true);
+        $queue->subscribers->processed = array();
-      $subscribers_to_process = $subscribers['to_process'];
+      }
-      if(!isset($subscribers['processed'])) $subscribers['processed'] = array();
+      if(!isset($queue->subscribers->failed)) {
-      if(!isset($subscribers['failed'])) $subscribers['failed'] = array();
+        $queue->subscribers->failed = array();
-      foreach(array_chunk($subscribers_to_process, 200) as $subscriber_ids) {
+      }
-        $db_subscribers = Subscriber::whereIn('id', $subscriber_ids)
+      $newsletter = $newsletter->asArray();
+      $newsletter['body'] = $this->renderNewsletter($newsletter);
+      $mailer = $this->configureMailer($newsletter);
+      foreach(array_chunk($queue->subscribers->to_process, self::batch_size) as
+              $subscribers_ids) {
+        $subscribers = Subscriber::whereIn('id', $subscribers_ids)
           ->findArray();
-        foreach($db_subscribers as $db_subscriber) {
+        $queue->subscribers = call_user_func_array(
-          $this->checkExecutionTimer();
+          array(
-          $result = $this->sendNewsletter(
+            $this,
+            $this->processing_method
+          ),
+          array(
             $mailer,
-            $this->processNewsletter($newsletter),
+            $newsletter,
-            $db_subscriber);
+            $subscribers,
-          if($result) {
+            $queue
-            $this->updateStatistics($newsletter['id'], $db_subscriber['id'], $queue->id);
+          )
-            $subscribers['processed'][] = $db_subscriber['id'];
+        );
-          } else {
-            $subscribers['failed'][] = $db_subscriber['id'];
-          }
-          $this->updateQueue($queue, $subscribers);
-        }
       }
     }
   }
 
-  function processNewsletter($newsletter) {
+  function processBulkSubscribers($mailer, $newsletter, $subscribers, $queue) {
-    // TODO: replace shortcodes, etc..
+    foreach($subscribers as $subscriber) {
+      $processed_newsletters[] =
+        $this->processNewsletter($newsletter, $subscriber);
+      $transformed_subscribers[] =
+        $mailer->transformSubscriber($subscriber);
+    }
+    $result = $this->sendNewsletter(
+      $mailer,
+      $processed_newsletters,
+      $transformed_subscribers
+    );
+    $subscribers_ids = Helpers::arrayColumn($subscribers, 'id');
+    if(!$result) {
+      $queue->subscribers->failed = array_merge(
+        $queue->subscribers->failed,
+        $subscribers_ids
+      );
+    } else {
+      $newsletter_statistics =
+        array_map(function ($data) use ($newsletter, $subscribers_ids, $queue) {
+          return array(
+            $newsletter['id'],
+            $subscribers_ids[$data],
+            $queue->id
+          );
+        }, range(0, count($transformed_subscribers) - 1));
+      $newsletter_statistics = Helpers::flattenArray($newsletter_statistics);
+      $this->updateMailerLog();
+      $this->updateNewsletterStatistics($newsletter_statistics);
+      $queue->subscribers->processed = array_merge(
+        $queue->subscribers->processed,
+        $subscribers_ids
+      );
+    }
+    $this->updateQueue($queue);
+    $this->checkSendingLimit();
+    CronHelper::checkExecutionTimer($this->timer);
+    return $queue->subscribers;
+  }
+
+  function processIndividualSubscriber($mailer, $newsletter, $subscribers, $queue) {
+    foreach($subscribers as $subscriber) {
+      $this->checkSendingLimit();
+      $processed_newsletter = $this->processNewsletter($newsletter, $subscriber);
+      $transformed_subscriber = $mailer->transformSubscriber($subscriber);
+      $result = $this->sendNewsletter(
+        $mailer,
+        $processed_newsletter,
+        $transformed_subscriber
+      );
+      if(!$result) {
+        $queue->subscribers->failed[] = $subscriber['id'];;
+      } else {
+        $queue->subscribers->processed[] = $subscriber['id'];
+        $newsletter_statistics = array(
+          $newsletter['id'],
+          $subscriber['id'],
+          $queue->id
+        );
+        $this->updateMailerLog();
+        $this->updateNewsletterStatistics($newsletter_statistics);
+      }
+      $this->updateQueue($queue);
+      CronHelper::checkExecutionTimer($this->timer);
+    }
+    return $queue->subscribers;
+  }
+
+  function updateNewsletterStatistics($data) {
+    return NewsletterStatistics::createMultiple($data);
+  }
+
+  function renderNewsletter($newsletter) {
+    $renderer = new Renderer($newsletter);
+    return $renderer->render();
+  }
+
+  function processNewsletter($newsletter, $subscriber = false) {
+    $divider = '***MailPoet***';
+    $shortcodes = new Shortcodes(
+      implode($divider, $newsletter['body']),
+      $newsletter,
+      $subscriber
+    );
+    list($newsletter['body']['html'], $newsletter['body']['text']) =
+      explode($divider, $shortcodes->replace());
     return $newsletter;
   }
 
   function sendNewsletter($mailer, $newsletter, $subscriber) {
     return $mailer->mailer_instance->send(
       $newsletter,
-      $mailer->transformSubscriber($subscriber)
+      $subscriber
     );
   }
 
-  function updateStatistics($newsletter_id, $subscriber_id, $queue_id) {
+  function configureMailer($newsletter) {
-    $newsletter_statistic = NewsletterStatistics::create();
+    $sender['address'] = (!empty($newsletter['sender_address'])) ?
-    $newsletter_statistic->subscriber_id = $newsletter_id;
+      $newsletter['sender_address'] :
-    $newsletter_statistic->newsletter_id = $subscriber_id;
+      false;
-    $newsletter_statistic->queue_id = $queue_id;
+    $sender['name'] = (!empty($newsletter['sender_name'])) ?
-    $newsletter_statistic->save();
+      $newsletter['sender_name'] :
-  }
+      false;
-
+    $reply_to['address'] = (!empty($newsletter['reply_to_address'])) ?
-  function updateQueue($queue, $subscribers) {
+      $newsletter['reply_to_address'] :
-    $subscribers['to_process'] = array_values(
+      false;
-      array_diff(
+    $reply_to['name'] = (!empty($newsletter['reply_to_name'])) ?
-        $subscribers['to_process'],
+      $newsletter['reply_to_name'] :
-        array_merge($subscribers['processed'], $subscribers['failed'])
+      false;
-      )
+    if(!$sender['address']) {
-    );
-    $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'])) {
+    if(!$reply_to['address']) {
-      $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() {
-    $elapsed_time = microtime(true) - $this->timer;
-    if($elapsed_time >= 30) throw new \Exception('Maximum execution time reached.');
-  }
-
   function getQueues() {
     return \MailPoet\Models\SendingQueue::orderByDesc('priority')
       ->whereNull('deleted_at')
@@ -125,10 +194,71 @@ class SendingQueue {
       ->findResultSet();
   }
 
-  function renderNewsletter($newsletter) {
+  function updateQueue($queue) {
-    $renderer = new Renderer(json_decode($newsletter['body'], true));
+    $queue = clone($queue);
-    // TODO: update once text rendering is implemented/enderer returns an array
+    $queue->subscribers->to_process = array_diff(
-    $newsletter['body'] = array('html' => $renderer->render(), 'text' => '');
+      $queue->subscribers->to_process,
-    return $newsletter;
+      array_merge(
+        $queue->subscribers->processed,
+        $queue->subscribers->failed
+      )
+    );
+    $queue->subscribers->to_process = array_values($queue->subscribers->to_process);
+    $queue->count_processed =
+      count($queue->subscribers->processed) + count($queue->subscribers->failed);
+    $queue->count_to_process = count($queue->subscribers->to_process);
+    $queue->count_failed = count($queue->subscribers->failed);
+    $queue->count_total =
+      $queue->count_processed + $queue->count_to_process;
+    if(!$queue->count_to_process) {
+      $queue->processed_at = date('Y-m-d H:i:s');
+      $queue->status = 'completed';
+    }
+    $queue->subscribers = serialize((array) $queue->subscribers);
+    $queue->save();
+  }
+
+  function updateMailerLog() {
+    $this->mta_log['sent']++;
+    return Setting::setValue('mta_log', $this->mta_log);
+  }
+
+  function getMailerConfig() {
+    $mta_config = Setting::getValue('mta');
+    if(!$mta_config) {
+      throw new \Exception(__('Mailer is not configured.'));
+    }
+    return $mta_config;
+  }
+
+  function getMailerLog() {
+    $mta_log = Setting::getValue('mta_log');
+    if(!$mta_log) {
+      $mta_log = array(
+        'sent' => 0,
+        'started' => time()
+      );
+      Setting::setValue('mta_log', $mta_log);
+    }
+    return $mta_log;
+  }
+
+  function checkSendingLimit() {
+    $frequency_interval = (int) $this->mta_config['frequency']['interval'] * 60;
+    $frequency_limit = (int) $this->mta_config['frequency']['emails'];
+    $elapsed_time = time() - (int) $this->mta_log['started'];
+    if($this->mta_log['sent'] === $frequency_limit &&
+      $elapsed_time <= $frequency_interval
+    ) {
+      throw new \Exception(__('Sending frequency limit reached.'));
+    }
+    if($elapsed_time > $frequency_interval) {
+      $this->mta_log = array(
+        'sent' => 0,
+        'started' => time()
+      );
+      Setting::setValue('mta_log', $this->mta_log);
+    }
+    return;
   }
 }

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,32 +9,39 @@ 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'])
-      $html .= '<label class="mailpoet_checkbox_label">';
+      ? $block['params']['values']
+      : array()
+    );
 
+    foreach($options as $option) {
+      $html .= '<label class="mailpoet_checkbox_label">';
+      $html .= '<input type="hidden" name="'.$field_name.'" value="" />';
       $html .= '<input type="checkbox" class="mailpoet_checkbox" ';
 
       $html .= 'name="'.$field_name.'" ';
 
       $html .= 'value="1" ';
 
-      $html .= (isset($option['is_checked']) && $option['is_checked'])
+      $html .= (
-                ? 'checked="checked"' : '';
+        (isset($option['is_checked']) && $option['is_checked'])
+        ||
+        (self::getFieldValue($block))
+      ) ? 'checked="checked"' : '';
+
       $html .= $field_validation;
 
-      $html .= ' />'.$option['value'];
+      $html .= ' /> '.esc_attr($option['value']);
 
       $html .= '</label>';
     }
 
+    $html .= '<span class="mailpoet_error_'.$block['id'].'"></span>';
+
     $html .= '</p>';
 
     return $html;

lib/Form/Block/Date.php

@@ -33,18 +33,37 @@ class Date extends Base {
     // generate an array of selectors based on date format
     $date_selectors = explode('/', $date_format);
 
+    // format value if present
+    $value = self::getFieldValue($block);
+    $day = null;
+    $month = null;
+    $year = null;
+
+    if($value) {
+      $day = (int)strftime('%d', $value);
+      $month = (int)strftime('%m', $value);
+      $year = (int)strftime('%Y', $value);
+    } else if(!empty($block['params']['is_default_today'])) {
+      $day = (int)strftime('%d');
+      $month = (int)strftime('%m');
+      $year = (int)strftime('%Y');
+    }
+
     foreach($date_selectors as $date_selector) {
       if($date_selector === 'dd') {
+        $block['selected'] = $day;
         $html .= '<select class="mailpoet_date_day" ';
         $html .= 'name="'.$field_name.'[day]" placeholder="'.__('Day').'">';
         $html .= static::getDays($block);
         $html .= '</select>';
       } else if($date_selector === 'mm') {
+        $block['selected'] = $month;
         $html .= '<select class="mailpoet_date_month" ';
         $html .= 'name="'.$field_name.'[month]" placeholder="'.__('Month').'">';
         $html .= static::getMonths($block);
         $html .= '</select>';
       } else if($date_selector === 'yyyy') {
+        $block['selected'] = $year;
         $html .= '<select class="mailpoet_date_year" ';
         $html .= 'name="'.$field_name.'[year]" placeholder="'.__('Year').'">';
         $html .= static::getYears($block);
@@ -84,11 +103,6 @@ class Date extends Base {
       'selected' => null
     );
 
-    // is default today
-    if(!empty($block['params']['is_default_today'])) {
-      $defaults['selected'] = (int)strftime('%m');
-    }
-
     // merge block with defaults
     $block = array_merge($defaults, $block);
 

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" ';
@@ -24,15 +27,21 @@ class Radio extends Base {
 
       $html .= 'value="'.esc_attr($option['value']).'" ';
 
-      $html .= (isset($option['is_checked']) && $option['is_checked'])
+      $html .= (
-                ? 'checked="checked"' : '';
+        (isset($option['is_checked']) && $option['is_checked'])
+        ||
+        (self::getFieldValue($block) === $option['value'])
+      ) ? 'checked="checked"' : '';
+
       $html .= $field_validation;
 
-      $html .= ' />&nbsp;'.esc_attr($option['value']);
+      $html .= ' /> '.esc_attr($option['value']);
 
       $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'])) {
+    $options = (!empty($block['params']['values'])
-      // display values
+      ? $block['params']['values']
-      foreach($block['params']['values'] as $segment) {
+      : array()
-        if(!isset($segment['id']) || !isset($segment['name'])) continue;
+    );
 
-        $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">';
+      $is_checked = (isset($option['is_checked']) && $option['is_checked']) ? 'checked="checked"' : '';
-        $html .= '<input type="checkbox" class="mailpoet_checkbox" ';
+
-        $html .= 'name="'.$field_name.'[]" ';
+      $html .= '<label class="mailpoet_checkbox_label">';
-        $html .= 'value="'.$segment['id'].'" '.$is_checked.' ';
+      $html .= '<input type="checkbox" class="mailpoet_checkbox" ';
-        $html .= $field_validation;
+      $html .= 'name="'.$field_name.'[]" ';
-        $html .= ' />'.$segment['name'];
+      $html .= 'value="'.$option['id'].'" '.$is_checked.' ';
-        $html .= '</label>';
+      $html .= $field_validation;
-      }
+      $html .= ' /> '.esc_attr($option['name']);
+      $html .= '</label>';
     }
 
+    $html .= '<span class="mailpoet_error_'.$block['id'].'"></span>';
+
     $html .= '</p>';
 
     return $html;

lib/Form/Block/Select.php

@@ -10,9 +10,7 @@ class Select extends Base {
     $field_validation = static::getInputValidation($block);
 
     $html .= '<p class="mailpoet_paragraph">';
-
     $html .= static::renderLabel($block);
-
     $html .= '<select class="mailpoet_select" name="'.$field_name.'">';
 
     if(isset($block['params']['label_within'])
@@ -21,10 +19,22 @@ class Select extends Base {
     }
 
     foreach($block['params']['values'] as $option) {
-      $is_selected = (isset($option['is_checked']) && $option['is_checked'])
+      $is_selected = (
-                      ? 'selected="selected"' : '';
+        (isset($option['is_checked']) && $option['is_checked'])
-      $html .= '<option value="'.$option['value'].'" '.$is_selected.'>';
+        ||
-      $html .= $option['value'];
+        (self::getFieldValue($block) === $option['value'])
+      ) ? 'selected="selected"' : '';
+
+      if(is_array($option['value'])) {
+        $value = key($option['value']);
+        $label = reset($option['value']);
+      } else {
+        $value = $option['value'];
+        $label = $option['value'];
+      }
+
+      $html .= '<option value="'.$value.'" '.$is_selected.'>';
+      $html .= esc_attr($label);
       $html .= '</option>';
     }
     $html .= '</select>';

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

@@ -13,9 +13,11 @@ class Renderer {
     return $html;
   }
 
-  static function renderStyles($form = array()) {
+  static function renderStyles($form = array(), $prefix = null) {
+    $styles = new Util\Styles(static::getStyles($form));
+
     $html = '<style type="text/css">';
-    $html .= static::getStyles($form);
+    $html .= $styles->render($prefix);
     $html .= '</style>';
 
     return $html;
@@ -37,8 +39,7 @@ class Renderer {
     }
   }
 
-  // private: rendering methods
+  static function renderBlocks($blocks = array()) {
-  private static function renderBlocks($blocks = array()) {
     $html = '';
     foreach ($blocks as $key => $block) {
       $html .= static::renderBlock($block)."\n";
@@ -47,9 +48,9 @@ class Renderer {
     return $html;
   }
 
-  private static function renderBlock($block = array()) {
+  static function renderBlock($block = array()) {
     $html = '';
-    switch ($block['type']) {
+    switch($block['type']) {
       case 'html':
         $html .= Block\Html::render($block);
       break;
@@ -78,8 +79,8 @@ class Renderer {
         $html .= Block\Select::render($block);
       break;
 
-      case 'input':
+      case 'text':
-        $html .= Block\Input::render($block);
+        $html .= Block\Text::render($block);
       break;
 
       case 'textarea':

lib/Form/Util/Export.php

@@ -22,19 +22,21 @@ class Export {
         ), site_url());
 
         // generate iframe
-        return '<iframe '.
+        return join(' ', array(
-        'width="100%" '.
+          '<iframe',
-        'scrolling="no" '.
+          'width="100%"',
-        'frameborder="0" '.
+          'scrolling="no"',
-        'src="'.$iframe_url.'" '.
+          'frameborder="0"',
-        'class="mailpoet_form_iframe" '.
+          'src="'.$iframe_url.'"',
-        'vspace="0" '.
+          'class="mailpoet_form_iframe"',
-        'tabindex="0" '.
+          'vspace="0"',
-        'onload="javascript:(this.style.height = this.contentWindow.document.body.scrollHeight + \'px\');"'.
+          'tabindex="0"',
-        'marginwidth="0" '.
+          'onload="javascript:(this.style.height = this.contentWindow.document.body.scrollHeight + \'px\');"',
-        'marginheight="0" '.
+          'marginwidth="0"',
-        'hspace="0" '.
+          'marginheight="0"',
-        'allowtransparency="true"></iframe>';
+          'hspace="0"',
+          'allowtransparency="true"></iframe>'
+        ));
       break;
 
       case 'php':

lib/Form/Util/Styles.php

@@ -17,7 +17,7 @@ class Styles {
 }
 
 /* labels */
-.mailpoet_input_label,
+.mailpoet_text_label,
 .mailpoet_textarea_label,
 .mailpoet_select_label,
 .mailpoet_radio_label,
@@ -28,7 +28,7 @@ class Styles {
 }
 
 /* inputs */
-.mailpoet_input,
+.mailpoet_text,
 .mailpoet_textarea,
 .mailpoet_select,
 .mailpoet_date {
@@ -36,9 +36,7 @@ class Styles {
 }
 
 .mailpoet_checkbox {
-  display:inline;
+
-  margin-right: 5px;
-  vertical-align:middle;
 }
 
 .mailpoet_validate_success {
@@ -101,7 +99,7 @@ EOL;
   }
 
   private function stripComments($stylesheet) {
-        // remove comments
+    // remove comments
     return preg_replace('!/\*.*?\*/!s', '', $stylesheet);
   }
 
@@ -111,7 +109,6 @@ EOL;
 
   private function setStyles($styles) {
     $this->_styles = $styles;
-
     return $this;
   }
 

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) {
+          if(response.result && response.form_id) {
-            window.location = response;
+            window.location =
+              "<?php echo $form_edit_url; ?>" + response.form_id;
           }
         });
         return false;
@@ -151,12 +154,14 @@ class Widget extends \WP_Widget {
       $output = '';
 
       if(!empty($body)) {
+        $form_id = $this->id_base.'_'.$this->number;
+
         $data = array(
-          'form_id' => $this->id_base.'_'.$this->number,
+          'form_id' => $form_id,
           'form_type' => $form_type,
           'form' => $form,
           'title' => $title,
-          'styles' => FormRenderer::renderStyles($form),
+          'styles' => FormRenderer::renderStyles($form, '#'.$form_id),
           'html' => FormRenderer::renderHTML($form),
           'before_widget' => (!empty($before_widget) ? $before_widget : ''),
           'after_widget' => (!empty($after_widget) ? $after_widget : ''),
@@ -194,96 +199,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/Listing/Handler.php

@@ -4,6 +4,8 @@ namespace MailPoet\Listing;
 if(!defined('ABSPATH')) exit;
 
 class Handler {
+  const DEFAULT_LIMIT_PER_PAGE = 20;
+
   private $data = array();
   private $model = null;
 
@@ -14,7 +16,10 @@ class Handler {
     $this->data = array(
       // pagination
       'offset' => (isset($data['offset']) ? (int)$data['offset'] : 0),
-      'limit' => (isset($data['limit']) ? (int)$data['limit'] : 50),
+      'limit' => (isset($data['limit'])
+        ? (int)$data['limit']
+        : self::DEFAULT_LIMIT_PER_PAGE
+      ),
       // searching
       'search' => (isset($data['search']) ? $data['search'] : null),
       // sorting
@@ -84,11 +89,11 @@ class Handler {
     $items = $this->model
       ->offset($this->data['offset'])
       ->limit($this->data['limit'])
-      ->findArray();
+      ->findMany();
 
     return array(
       'count' => $count,
-      'filters' => $this->model->filter('filters'),
+      'filters' => $this->model->filter('filters', $this->data['group']),
       'groups' => $this->model->filter('groups'),
       'items' => $items
     );

lib/Mailer/Mailer.php

@@ -19,82 +19,77 @@ class Mailer {
     $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':
+      case 'AmazonSES':
-      $mailer_instance = new $this->mailer['class'](
+        $mailer_instance = new $this->mailer['class'](
-        $this->mailer['region'],
+          $this->mailer['region'],
-        $this->mailer['access_key'],
+          $this->mailer['access_key'],
-        $this->mailer['secret_key'],
+          $this->mailer['secret_key'],
-        $this->sender['from_name_email']
+          $this->sender,
-      );
+          $this->reply_to
-    break;
+        );
-    case 'ElasticEmail':
+        break;
-      $mailer_instance = new $this->mailer['class'](
+      case 'ElasticEmail':
-        $this->mailer['api_key'],
+        $mailer_instance = new $this->mailer['class'](
-        $this->sender['from_email'],
+          $this->mailer['api_key'],
-        $this->sender['from_name']
+          $this->sender,
-      );
+          $this->reply_to
-    break;
+        );
-    case 'MailGun':
+        break;
-      $mailer_instance = new $this->mailer['class'](
+      case 'MailGun':
-        $this->mailer['domain'],
+        $mailer_instance = new $this->mailer['class'](
-        $this->mailer['api_key'],
+          $this->mailer['domain'],
-        $this->sender['from_name_email']
+          $this->mailer['api_key'],
-      );
+          $this->sender,
-    break;
+          $this->reply_to
-    case 'MailPoet':
+        );
-      $mailer_instance = new $this->mailer['class'](
+        break;
-        $this->mailer['mailpoet_api_key'],
+      case 'MailPoet':
-        $this->sender['from_email'],
+        $mailer_instance = new $this->mailer['class'](
-        $this->sender['from_name']
+          $this->mailer['mailpoet_api_key'],
-      );
+          $this->sender,
-    break;
+          $this->reply_to
-    case 'Mandrill':
+        );
-      $mailer_instance = new $this->mailer['class'](
+        break;
-        $this->mailer['api_key'],
+      case 'SendGrid':
-        $this->sender['from_email'],
+        $mailer_instance = new $this->mailer['class'](
-        $this->sender['from_name']
+          $this->mailer['api_key'],
-      );
+          $this->sender,
-    break;
+          $this->reply_to
-    case 'SendGrid':
+        );
-      $mailer_instance = new $this->mailer['class'](
+        break;
-        $this->mailer['api_key'],
+      case 'PHPMail':
-        $this->sender['from_email'],
+        $mailer_instance = new $this->mailer['class'](
-        $this->sender['from_name']
+          $this->sender,
-      );
+          $this->reply_to
-    break;
+        );
-    case 'WPMail':
+        break;
-      $mailer_instance = new $this->mailer['class'](
+      case 'SMTP':
-        $this->sender['from_email'],
+        $mailer_instance = new $this->mailer['class'](
-        $this->sender['from_name']
+          $this->mailer['host'],
-      );
+          $this->mailer['port'],
-    break;
+          $this->mailer['authentication'],
-    case 'SMTP':
+          $this->mailer['login'],
-      $mailer_instance = new $this->mailer['class'](
+          $this->mailer['password'],
-        $this->mailer['host'],
+          $this->mailer['encryption'],
-        $this->mailer['port'],
+          $this->sender,
-        $this->mailer['authentication'],
+          $this->reply_to
-        $this->mailer['login'],
+        );
-        $this->mailer['password'],
+        break;
-        $this->mailer['encryption'],
+      default:
-        $this->sender['from_email'],
+        throw new \Exception(__('Mailing method does not exist.'));
-        $this->sender['from_name']
+        break;
-      );
-    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);
@@ -107,7 +102,7 @@ class Mailer {
   function getSender($sender = false) {
     if(!$sender) {
       $sender = Setting::getValue('sender', null);
-      if(!$sender) throw new \Exception(__('Sender name and email are not configured.'));
+      if(!$sender['address']) throw new \Exception(__('Sender name and email are not configured.'));
     }
     return array(
       'from_name' => $sender['name'],
@@ -126,6 +121,9 @@ class Mailer {
         );
       }
     }
+    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'],

lib/Mailer/Methods/AmazonSES.php

@@ -13,25 +13,27 @@ class AmazonSES {
   public $aws_termination_string;
   public $hash_algorithm;
   public $url;
-  public $from;
+  public $sender;
+  public $reply_to;
   public $date;
   public $date_without_time;
-  
+
-  function __construct($region, $access_key, $secret_key, $from) {
+  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', $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->from = $from;
+    $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,
@@ -42,15 +44,16 @@ class AmazonSES {
       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,
+      'Source' => $this->sender['from_name_email'],
+      'ReplyToAddresses.member.1' => $this->reply_to['reply_to_name_email'],
       'Message.Subject.Data' => $newsletter['subject'],
-      'ReturnPath' => $this->from
+      'ReturnPath' => $this->sender['from_name_email'],
     );
     if(!empty($newsletter['body']['html'])) {
       $body['Message.Body.Html.Data'] = $newsletter['body']['html'];
@@ -60,7 +63,7 @@ class AmazonSES {
     }
     return $body;
   }
-  
+
   function request($newsletter, $subscriber) {
     $body = $this->getBody($newsletter, $subscriber);
     return array(
@@ -75,7 +78,7 @@ class AmazonSES {
       'body' => urldecode(http_build_query($body))
     );
   }
-  
+
   function signRequest($body) {
     $string_to_sign = $this->createStringToSign(
       $this->getCredentialScope(),
@@ -86,7 +89,7 @@ class AmazonSES {
       $string_to_sign,
       $this->getSigningKey()
     );
-    
+
     return sprintf(
       '%s Credential=%s/%s, SignedHeaders=host;x-amz-date, Signature=%s',
       $this->aws_signing_algorithm,
@@ -94,7 +97,7 @@ class AmazonSES {
       $this->getCredentialScope(),
       $signature);
   }
-  
+
   function getCredentialScope() {
     return sprintf(
       '%s/%s/%s/%s',
@@ -103,7 +106,7 @@ class AmazonSES {
       $this->aws_service,
       $this->aws_termination_string);
   }
-  
+
   function getCanonicalRequest($body) {
     return implode("\n", array(
       'POST',
@@ -116,7 +119,7 @@ class AmazonSES {
       hash($this->hash_algorithm, urldecode(http_build_query($body)))
     ));
   }
-  
+
   function createStringToSign($credential_scope, $canonical_request) {
     return implode("\n", array(
       $this->aws_signing_algorithm,
@@ -125,7 +128,7 @@ class AmazonSES {
       hash($this->hash_algorithm, $canonical_request)
     ));
   }
-  
+
   function getSigningKey() {
     $date_key = hash_hmac(
       $this->hash_algorithm,

lib/Mailer/Methods/ElasticEmail.php

@@ -6,13 +6,13 @@ if(!defined('ABSPATH')) exit;
 class ElasticEmail {
   public $url = 'https://api.elasticemail.com/mailer/send';
   public $api_key;
-  public $from_email;
+  public $sender;
-  public $from_name;
+  public $reply_to;
-  
+
-  function __construct($api_key, $from_email, $from_name) {
+  function __construct($api_key, $sender, $reply_to) {
     $this->api_key = $api_key;
-    $this->from_email = $from_email;
+    $this->sender = $sender;
-    $this->from_name = $from_name;
+    $this->reply_to = $reply_to;
   }
 
   function send($newsletter, $subscriber) {
@@ -28,9 +28,11 @@ class ElasticEmail {
   function getBody($newsletter, $subscriber) {
     $body = array(
       'api_key' => $this->api_key,
-      'from' => $this->from_email,
-      'from_name' => $this->from_name,
       '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

@@ -6,12 +6,14 @@ if(!defined('ABSPATH')) exit;
 class MailGun {
   public $url;
   public $api_key;
-  public $from;
+  public $sender;
-  
+  public $reply_to;
-  function __construct($domain, $api_key, $from) {
+
+  function __construct($domain, $api_key, $sender, $reply_to) {
     $this->url = sprintf('https://api.mailgun.net/v3/%s/messages', $domain);
     $this->api_key = $api_key;
-    $this->from = $from;
+    $this->sender = $sender;
+    $this->reply_to = $reply_to;
   }
 
   function send($newsletter, $subscriber) {
@@ -27,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'])) {