Bump up release version to 0.0.23

Updates query parameters for public API

RoboFile.php

@@ -89,14 +89,14 @@ class RoboFile extends \Robo\Tasks {
   }
 
   function makepot() {
-    $this->_exec('grunt makepot'.
+    $this->_exec('./node_modules/.bin/grunt makepot'.
       ' --gruntfile '.__DIR__.'/tasks/makepot/makepot.js'.
       ' --base_path '.__DIR__
     );
   }
 
   function pushpot() {
-    $this->_exec('grunt pushpot'.
+    $this->_exec('./node_modules/.bin/grunt pushpot'.
       ' --gruntfile '.__DIR__.'/tasks/makepot/makepot.js'.
       ' --base_path '.__DIR__
     );
@@ -123,7 +123,7 @@ class RoboFile extends \Robo\Tasks {
     $this->compileJs();
 
     $this->_exec(join(' ', array(
-      './node_modules/mocha/bin/mocha',
+      './node_modules/.bin/mocha',
       '-r tests/javascript/mochaTestHelper.js',
       'tests/javascript/testBundles/**/*.js'
     )));

assets/css/src/form_editor.styl

@@ -563,3 +563,6 @@ handle_icon = '../img/handle.png'
 .CodeMirror
   border: 1px solid #eee
 
+/* Settings */
+#mailpoet_form_segments.parsley-error + span .select2-selection
+  border: 1px solid #b94a48

assets/js/src/cron.jsx

@@ -48,28 +48,22 @@ define(
       })
       .done(function(response) {
         if(!response.result) {
-          MailPoet.Notice.error(MailPoetI18n.daemonControlError);
+          MailPoet.Notice.error(MailPoet.I18n.t('daemonControlError'));
         }
       }.bind(this));
     },
     render: function() {
       if(this.state.status === 'loading') {
-        return(<div>Loading daemon status...</div>);
+        return(<div>{MailPoet.I18n.t('loadingDaemonStatus')}</div>);
       }
       switch(this.state.status) {
         case 'started':
           return(
             <div>
-              Cron daemon is running.
+              {MailPoet.I18n.t('cronDaemonIsRunning')}
               <br/>
               <br/>
-              It was started
+              <a href="#" className="button-primary" onClick={this.controlCron.bind(null, 'stop')}>{MailPoet.I18n.t('stop')}</a>
-              <strong> {this.state.timeSinceStart} </strong> and last executed
-              <strong> {this.state.timeSinceUpdate} </strong> for a total of
-              <strong> {this.state.counter} </strong> times (once every 30 seconds, unless it was interrupted and restarted).
-              <br />
-              <br />
-              <a href="#" className="button-primary" onClick={this.controlCron.bind(null, 'stop')}>Stop</a>
             </div>
           );
         break;
@@ -77,17 +71,17 @@ define(
         case 'stopping':
           return(
             <div>
-              Daemon is {this.state.status}
+              {MailPoet.I18n.t('cronDaemonState').replace('%$1s', this.state.status)}
             </div>
           );
         break;
         case 'stopped':
           return(
             <div>
-              Daemon is {this.state.status}
+              {MailPoet.I18n.t('cronDaemonState').replace('%$1s', this.state.status)}
               <br />
               <br />
-              <a href="#" className="button-primary" onClick={this.controlCron.bind(null, 'start')}>Start</a>
+              <a href="#" className="button-primary" onClick={this.controlCron.bind(null, 'start')}>{MailPoet.I18n.t('start')}</a>
             </div>
           );
         break;
@@ -103,4 +97,4 @@ define(
       container
     );
   }
-});
+});

assets/js/src/form/form.jsx

@@ -167,7 +167,7 @@ define(
             <input
               className="button button-primary"
               type="submit"
-              value="Save"
+              value={MailPoet.I18n.t('save')}
               disabled={this.state.loading} />
           );
         }
@@ -199,4 +199,4 @@ define(
 
     return Form;
   }
-);
+);

assets/js/src/form_editor/form_editor.js

@@ -402,11 +402,30 @@ var WysijaForm = {
       }
     });
 
-    // hide list selection if a list widget has been dragged into the editor
+    var hasSegmentSelection = WysijaForm.hasSegmentSelection();
-    $('mailpoet_settings_segment_selection')[
+
-      (($$('#' + WysijaForm.options.editor + ' [wysija_id="segments"]').length > 0) === true)
+    if(hasSegmentSelection) {
-      ? 'hide' : 'show'
+      $('mailpoet_form_segments').writeAttribute('required', false).disable();
-    ]();
+      $('mailpoet_settings_segment_selection').hide();
+    } else {
+      $('mailpoet_form_segments').writeAttribute('required', true).enable();
+      $('mailpoet_settings_segment_selection').show();
+    }
+  },
+  hasSegmentSelection: function() {
+    return ($$('#' + WysijaForm.options.editor + ' [wysija_id="segments"]').length > 0);
+  },
+  isSegmentSelectionValid: function() {
+    var segment_selection = $$('#' + WysijaForm.options.editor + ' [wysija_id="segments"]')[0];
+    if(segment_selection !== undefined) {
+      var block = WysijaForm.get(segment_selection).block.getData();
+      return (
+        (block.params.values !== undefined)
+        &&
+        (block.params.values.length > 0)
+      );
+    }
+    return false;
   },
   setBlockPositions: function(event, target) {
     // release dragging lock

assets/js/src/forms/list.jsx

@@ -8,17 +8,17 @@ import MailPoet from 'mailpoet'
 const columns = [
   {
     name: 'name',
-    label: 'Name',
+    label: MailPoet.I18n.t('formName'),
     sortable: true
   },
   {
     name: 'segments',
-    label: 'Lists',
+    label: MailPoet.I18n.t('segments'),
     sortable: false
   },
   {
     name: 'created_at',
-    label: 'Created on',
+    label: MailPoet.I18n.t('createdOn'),
     sortable: true
   }
 ];
@@ -30,11 +30,11 @@ const messages = {
 
     if(count === 1) {
       message = (
-        '1 form was moved to the trash.'
+        MailPoet.I18n.t('oneFormTrashed')
       );
     } else {
       message = (
-        '%$1d forms were moved to the trash.'
+        MailPoet.I18n.t('multipleFormsTrashed')
       ).replace('%$1d', count);
     }
     MailPoet.Notice.success(message);
@@ -45,11 +45,11 @@ const messages = {
 
     if(count === 1) {
       message = (
-        '1 form was permanently deleted.'
+        MailPoet.I18n.t('oneFormDeleted')
       );
     } else {
       message = (
-        '%$1d forms were permanently deleted.'
+        MailPoet.I18n.t('multipleFormsDeleted')
       ).replace('%$1d', count);
     }
     MailPoet.Notice.success(message);
@@ -60,11 +60,11 @@ const messages = {
 
     if(count === 1) {
       message = (
-        '1 form has been restored from the trash.'
+        MailPoet.I18n.t('oneFormRestored')
       );
     } else {
       message = (
-        '%$1d forms have been restored from the trash.'
+        MailPoet.I18n.t('multipleFormsRestored')
       ).replace('%$1d', count);
     }
     MailPoet.Notice.success(message);
@@ -74,16 +74,16 @@ const messages = {
 const item_actions = [
   {
     name: 'edit',
-    label: 'Edit',
+    label: MailPoet.I18n.t('edit'),
     link: function(item) {
       return (
-        <a href={ `admin.php?page=mailpoet-form-editor&id=${item.id}` }>Edit</a>
+        <a href={ `admin.php?page=mailpoet-form-editor&id=${item.id}` }>{MailPoet.I18n.t('edit')}</a>
       );
     }
   },
   {
     name: 'duplicate_form',
-    label: 'Duplicate',
+    label: MailPoet.I18n.t('duplicate'),
     onClick: function(item, refresh) {
       return MailPoet.Ajax.post({
         endpoint: 'forms',
@@ -91,7 +91,7 @@ const item_actions = [
         data: item.id
       }).done(function(response) {
         MailPoet.Notice.success(
-          ('Form "%$1s" has been duplicated.').replace('%$1s', response.name)
+          (MailPoet.I18n.t('formDuplicated')).replace('%$1s', response.name)
         );
         refresh();
       });
@@ -105,7 +105,7 @@ const item_actions = [
 const bulk_actions = [
   {
     name: 'trash',
-    label: 'Trash',
+    label: MailPoet.I18n.t('trash'),
     onSuccess: messages.onTrash
   }
 ];
@@ -142,10 +142,10 @@ const FormList = React.createClass({
           </strong>
           { actions }
         </td>
-        <td className="column-format" data-colname="Lists">
+        <td className="column-format" data-colname={MailPoet.I18n.t('segments')}>
           { segments }
         </td>
-        <td className="column-date" data-colname="Created on">
+        <td className="column-date" data-colname={MailPoet.I18n.t('createdOn')}>
           <abbr>{ MailPoet.Date.full(form.created_at) }</abbr>
         </td>
       </div>
@@ -155,11 +155,11 @@ const FormList = React.createClass({
     return (
       <div>
         <h2 className="title">
-          Forms <a
+          {MailPoet.I18n.t('pageTitle')} <a
             className="add-new-h2"
             href="javascript:;"
             onClick={ this.createForm }
-          >New</a>
+          >{MailPoet.I18n.t('new')}</a>
         </h2>
 
         <Listing
@@ -179,4 +179,4 @@ const FormList = React.createClass({
   }
 });
 
-module.exports = FormList;
+module.exports = FormList;

assets/js/src/i18n.js

@@ -0,0 +1,25 @@
+define('i18n',
+  [
+    'mailpoet',
+    'underscore',
+  ], function(
+    MailPoet,
+    _
+) {
+  'use strict';
+
+  var translations = {};
+
+  MailPoet.I18n = {
+    add: function(key, value) {
+      translations[key] = value;
+    },
+    t: function(key) {
+      return translations[key] || 'TRANSLATION "%$1s" NOT FOUND'.replace("%$1s", key);
+    },
+    all: function() {
+      return translations;
+    }
+  };
+
+});

assets/js/src/iframe.js

@@ -0,0 +1,23 @@
+define('iframe', ['mailpoet', 'jquery'], function(MailPoet, jQuery) {
+  'use strict';
+  MailPoet.Iframe = {
+    marginY: 20,
+    autoSize: function(iframe) {
+      if(!iframe) return;
+
+      this.setSize(
+        iframe,
+        iframe.contentWindow.document.body.scrollHeight
+      );
+    },
+    setSize: function(iframe, i) {
+      if(!iframe) return;
+
+      iframe.style.height = (
+        parseInt(i) + this.marginY
+      ) + "px";
+    }
+  };
+
+  return MailPoet;
+});

assets/js/src/listing/bulk_actions.jsx

@@ -1,8 +1,10 @@
 define([
-  'react'
+  'react',
+  'mailpoet'
 ],
 function(
-  React
+  React,
+  MailPoet
 ) {
   var ListingBulkActions = React.createClass({
     getInitialState: function() {
@@ -82,7 +84,7 @@ function(
           <label
             className="screen-reader-text"
             htmlFor="bulk-action-selector-top">
-            Select bulk action
+            {MailPoet.I18n.t('selectBulkAction')}
           </label>
 
           <select
@@ -91,7 +93,7 @@ function(
             value={ this.state.action }
             onChange={this.handleChangeAction}
           >
-            <option value="">Bulk Actions</option>
+            <option value="">{MailPoet.I18n.t('bulkActions')}</option>
             { this.props.bulk_actions.map(function(action, index) {
               return (
                 <option
@@ -104,7 +106,7 @@ function(
           <input
             onClick={ this.handleApplyAction }
             type="submit"
-            defaultValue="Apply"
+            defaultValue={MailPoet.I18n.t('apply')}
             className="button action" />
 
             { this.state.extra }
@@ -114,4 +116,4 @@ function(
   });
 
   return ListingBulkActions;
-});
+});

assets/js/src/listing/filters.jsx

@@ -1,10 +1,12 @@
 define([
   'react',
-  'jquery'
+  'jquery',
+  'mailpoet'
 ],
 function(
   React,
-  jQuery
+  jQuery,
+  MailPoet
 ) {
   var ListingFilters = React.createClass({
     handleFilterAction: function() {
@@ -69,7 +71,7 @@ function(
             id="post-query-submit"
             onClick={ this.handleFilterAction }
             type="submit"
-            defaultValue="Filter"
+            defaultValue={MailPoet.I18n.t('filter')}
             className="button" />
         );
       }
@@ -80,7 +82,7 @@ function(
           <input
             onClick={ this.handleEmptyTrash }
             type="submit"
-            value="Empty Trash"
+            value={MailPoet.I18n.t('emptyTrash')}
             className="button"
           />
         );

assets/js/src/listing/header.jsx

@@ -1,4 +1,12 @@
-define(['react', 'classnames'], function(React, classNames) {
+define([
+    'react',
+    'classnames',
+    'mailpoet'
+  ], function(
+    React,
+    classNames,
+    MailPoet
+  ) {
 
   var ListingHeader = React.createClass({
     handleSelectItems: function() {
@@ -28,7 +36,7 @@ define(['react', 'classnames'], function(React, classNames) {
           <th
             className="manage-column column-cb check-column">
             <label className="screen-reader-text">
-              { 'Select All' }
+              {MailPoet.I18n.t('selectAll')}
             </label>
             <input
               type="checkbox"
@@ -87,4 +95,4 @@ define(['react', 'classnames'], function(React, classNames) {
   });
 
   return ListingHeader;
-});
+});

assets/js/src/listing/listing.jsx

@@ -98,7 +98,7 @@ define(
                       null,
                       this.props.item.id
                     ) }>
-                    Trash
+                    {MailPoet.I18n.t('trash')}
                   </a>
                 </span>
               );
@@ -145,7 +145,7 @@ define(
         } else {
           item_actions = (
             <span className="edit">
-              <Link to={ `/edit/${ this.props.item.id }` }>Edit</Link>
+              <Link to={ `/edit/${ this.props.item.id }` }>{MailPoet.I18n.t('edit')}</Link>
             </span>
           );
         }
@@ -161,7 +161,7 @@ define(
                       null,
                       this.props.item.id
                     )}
-                  >Restore</a>
+                  >{MailPoet.I18n.t('restore')}</a>
                 </span>
                 { ' | ' }
                 <span className="delete">
@@ -172,13 +172,13 @@ define(
                       null,
                       this.props.item.id
                     )}
-                  >Delete permanently</a>
+                  >{MailPoet.I18n.t('deletePermanently')}</a>
                 </span>
               </div>
               <button
                 onClick={ this.handleToggleItem.bind(null, this.props.item.id) }
                 className="toggle-row" type="button">
-                <span className="screen-reader-text">Show more details</span>
+                <span className="screen-reader-text">{MailPoet.I18n.t('showMoreDetails')}</span>
               </button>
             </div>
           );
@@ -191,7 +191,7 @@ define(
               <button
                 onClick={ this.handleToggleItem.bind(null, this.props.item.id) }
                 className="toggle-row" type="button">
-                <span className="screen-reader-text">Show more details</span>
+                <span className="screen-reader-text">{MailPoet.I18n.t('showMoreDetails')}</span>
               </button>
             </div>
           );
@@ -223,8 +223,8 @@ define(
                   className="colspanchange">
                   {
                     (this.props.loading === true)
-                    ? MailPoetI18n.loadingItems
+                    ? MailPoet.I18n.t('loadingItems')
-                    : MailPoetI18n.noItemsFound
+                    : MailPoet.I18n.t('noItemsFound')
                   }
                 </td>
               </tr>
@@ -250,8 +250,8 @@ define(
                   }>
                   {
                     (this.props.selection !== 'all')
-                    ? MailPoetI18n.selectAllLabel
+                    ? MailPoet.I18n.t('selectAllLabel')
-                    : MailPoetI18n.selectedAllLabel.replace(
+                    : MailPoet.I18n.t('selectedAllLabel').replace(
                       '%d',
                       this.props.count
                     )
@@ -261,8 +261,8 @@ define(
                     onClick={ this.props.onSelectAll }
                     href="javascript:;">{
                       (this.props.selection !== 'all')
-                      ? MailPoetI18n.selectAllLink
+                      ? MailPoet.I18n.t('selectAllLink')
-                      : MailPoetI18n.clearSelection
+                      : MailPoet.I18n.t('clearSelection')
                     }</a>
                 </td>
               </tr>
@@ -519,7 +519,7 @@ define(
           group: 'trash'
         }, function(response) {
           MailPoet.Notice.success(
-            MailPoetI18n.permanentlyDeleted.replace('%d', response)
+            MailPoet.I18n.t('permanentlyDeleted').replace('%d', response)
           );
         });
       },
@@ -678,12 +678,12 @@ define(
           bulk_actions = [
             {
               name: 'restore',
-              label: 'Restore',
+              label: MailPoet.I18n.t('restore'),
               onSuccess: this.props.messages.onRestore
             },
             {
               name: 'delete',
-              label: 'Delete permanently',
+              label: MailPoet.I18n.t('deletePermanently'),
               onSuccess: this.props.messages.onDelete
             }
           ];

assets/js/src/listing/pages.jsx

@@ -1,4 +1,12 @@
-define(['react', 'classnames'], function(React, classNames) {
+define([
+    'react',
+    'classnames',
+    'mailpoet'
+  ], function(
+    React,
+    classNames,
+    MailPoet
+  ) {
 
   var ListingPages = React.createClass({
     getInitialState: function() {
@@ -72,7 +80,7 @@ define(['react', 'classnames'], function(React, classNames) {
               <a href="javascript:;"
                 onClick={ this.setPreviousPage }
                 className="prev-page">
-                <span className="screen-reader-text">Previous page</span>
+                <span className="screen-reader-text">{MailPoet.I18n.t('previousPage')}</span>
                 <span aria-hidden="true">‹</span>
               </a>
             );
@@ -83,7 +91,7 @@ define(['react', 'classnames'], function(React, classNames) {
               <a href="javascript:;"
                 onClick={ this.setFirstPage }
                 className="first-page">
-                <span className="screen-reader-text">First page</span>
+                <span className="screen-reader-text">{MailPoet.I18n.t('firstPage')}</span>
                 <span aria-hidden="true">«</span>
               </a>
             );
@@ -94,7 +102,7 @@ define(['react', 'classnames'], function(React, classNames) {
               <a href="javascript:;"
                 onClick={ this.setNextPage }
                 className="next-page">
-                <span className="screen-reader-text">Next page</span>
+                <span className="screen-reader-text">{MailPoet.I18n.t('nextPage')}</span>
                 <span aria-hidden="true">›</span>
               </a>
             );
@@ -105,7 +113,7 @@ define(['react', 'classnames'], function(React, classNames) {
               <a href="javascript:;"
                 onClick={ this.setLastPage }
                 className="last-page">
-                <span className="screen-reader-text">Last page</span>
+                <span className="screen-reader-text">{MailPoet.I18n.t('lastPage')}</span>
                 <span aria-hidden="true">»</span>
               </a>
             );
@@ -125,20 +133,20 @@ define(['react', 'classnames'], function(React, classNames) {
               <span className="paging-input">
                 <label
                   className="screen-reader-text"
-                  htmlFor="current-page-selector">Current Page</label>
+                  htmlFor="current-page-selector">{MailPoet.I18n.t('currentPage')}</label>
                 <input
                   type="text"
                   onChange={ this.handleChangeManualPage }
                   onKeyUp={ this.handleSetManualPage }
                   onBlur={ this.handleBlurManualPage }
                   aria-describedby="table-paging"
-                  size="1"
+                  size="2"
                   ref="page"
                   value={ pageValue }
                   name="paged"
                   id="current-page-selector"
                   className="current-page" />
-                &nbsp;of&nbsp;
+                &nbsp;{MailPoet.I18n.t('pageOutOf')}&nbsp;
                 <span className="total-pages">
                   {Math.ceil(this.props.count / this.props.limit)}
                 </span>
@@ -158,7 +166,9 @@ define(['react', 'classnames'], function(React, classNames) {
 
         return (
           <div className={ classes }>
-            <span className="displaying-num">{ this.props.count } items</span>
+            <span className="displaying-num">{
+              MailPoet.I18n.t('numberOfItems').replace('%$1d', this.props.count)
+            }</span>
             { pagination }
           </div>
         );
@@ -167,4 +177,4 @@ define(['react', 'classnames'], function(React, classNames) {
   });
 
   return ListingPages;
-});
+});

assets/js/src/listing/search.jsx

@@ -1,4 +1,10 @@
-define(['react'], function(React) {
+define([
+    'mailpoet',
+    'react'
+  ], function(
+    MailPoet,
+    React
+  ) {
 
   var ListingSearch = React.createClass({
     handleSearch: function(e) {
@@ -18,7 +24,7 @@ define(['react'], function(React) {
           <form name="search" onSubmit={this.handleSearch}>
             <p className="search-box">
               <label htmlFor="search_input" className="screen-reader-text">
-                Search
+              {MailPoet.I18n.t('searchLabel')}
               </label>
               <input
                 type="search"
@@ -28,7 +34,7 @@ define(['react'], function(React) {
                 defaultValue={this.props.search} />
               <input
                 type="submit"
-                defaultValue={MailPoetI18n.searchLabel}
+                defaultValue={MailPoet.I18n.t('searchLabel')}
                 className="button" />
             </p>
           </form>

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

@@ -12,9 +12,19 @@ define([
     'newsletter_editor/blocks/button',
     'newsletter_editor/blocks/divider',
     'newsletter_editor/components/communication',
+    'mailpoet',
     'underscore',
     'jquery'
-  ], function(App, BaseBlock, ButtonBlock, DividerBlock, CommunicationComponent, _, jQuery) {
+  ], function(
+    App,
+    BaseBlock,
+    ButtonBlock,
+    DividerBlock,
+    CommunicationComponent,
+    MailPoet,
+    _,
+    jQuery
+  ) {
 
   "use strict";
 
@@ -73,7 +83,7 @@ define([
         that.get('_container').get('blocks').reset(content, {parse: true});
         that.trigger('postsChanged');
       }).fail(function(error) {
-        console.log('ALC fetchPosts error', arguments);
+        MailPoet.Notice.error(MailPoet.I18n.t('failedToFetchRenderedPosts'));
       });
     },
     /**

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

@@ -16,7 +16,7 @@ define([
     defaults: function() {
       return this._getDefaults({
         type: 'footer',
-        text: '<a href="[unsubscribeUrl]">Unsubscribe</a> | <a href="[manageSubscriptionUrl]">Manage subscription</a><br /><b>Add your postal address here!</b>',
+        text: '<a href="[subscription:unsubscribe_url]">Unsubscribe</a> | <a href="[subscription:manage_url]">Manage subscription</a><br /><b>Add your postal address here!</b>',
         styles: {
           block: {
             backgroundColor: 'transparent',
@@ -79,7 +79,7 @@ define([
         },
 
         mailpoet_custom_fields: App.getConfig().get('customFields').toJSON(),
-        mailpoet_custom_fields_window_title: App.getConfig().get('translations.customFieldsWindowTitle'),
+        mailpoet_custom_fields_window_title: MailPoet.I18n.t('customFieldsWindowTitle'),
       });
     },
   });

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

@@ -16,7 +16,7 @@ define([
     defaults: function() {
       return this._getDefaults({
         type: 'header',
-        text: 'Display problems? <a href="[viewInBrowserUrl]">View it in your browser</a>',
+        text: 'Display problems? <a href="[newsletter:view_in_browser_url]">View it in your browser</a>',
         styles: {
           block: {
             backgroundColor: 'transparent',
@@ -79,7 +79,7 @@ define([
         },
 
         mailpoet_custom_fields: App.getConfig().get('customFields').toJSON(),
-        mailpoet_custom_fields_window_title: App.getConfig().get('translations.customFieldsWindowTitle'),
+        mailpoet_custom_fields_window_title: MailPoet.I18n.t('customFieldsWindowTitle'),
       });
     },
   });

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

@@ -101,7 +101,7 @@ define([
         that.get('_selectedPosts').reset(); // Empty out the collection
         that.trigger('change:_availablePosts');
       }).fail(function() {
-        console.log('Posts fetchPosts error', arguments);
+        MailPoet.Notice.error(MailPoet.I18n.t('failedToFetchAvailablePosts'));
       });
     },
     _refreshTransformedPosts: function() {
@@ -118,7 +118,7 @@ define([
       CommunicationComponent.getTransformedPosts(data).done(function(posts) {
         that.get('_transformedPosts').get('blocks').reset(posts, {parse: true});
       }).fail(function() {
-        console.log('Posts _refreshTransformedPosts error', arguments);
+        MailPoet.Notice.error(MailPoet.I18n.t('failedToFetchRenderedPosts'));
       });
     },
     _insertSelectedPosts: function() {
@@ -134,7 +134,7 @@ define([
       CommunicationComponent.getTransformedPosts(data).done(function(posts) {
         collection.add(posts, { at: index });
       }).fail(function() {
-        console.log('Posts fetchPosts error', arguments);
+        MailPoet.Notice.error(MailPoet.I18n.t('failedToFetchRenderedPosts'));
       });
     },
   });

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

@@ -77,7 +77,7 @@ define([
           },
 
           mailpoet_custom_fields: App.getConfig().get('customFields').toJSON(),
-          mailpoet_custom_fields_window_title: App.getConfig().get('translations.customFieldsWindowTitle'),
+          mailpoet_custom_fields_window_title: MailPoet.I18n.t('customFieldsWindowTitle'),
         });
       }
     },

assets/js/src/newsletter_editor/components/config.js

@@ -10,7 +10,6 @@ define([
       availableStyles: {},
       socialIcons: {},
       blockDefaults: {},
-      translations: {},
       sidepanelWidth: '331px',
       validation: {},
       urls: {},

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

@@ -191,7 +191,7 @@ define([
 
       if (templateName === '') {
         MailPoet.Notice.error(
-          App.getConfig().get('translations.templateNameMissing'),
+          MailPoet.I18n.t('templateNameMissing'),
           {
             positionAfter: that.$el,
             scroll: true,
@@ -199,30 +199,27 @@ define([
         );
       } else if (templateDescription === '') {
         MailPoet.Notice.error(
-          App.getConfig().get('translations.templateDescriptionMissing'),
+          MailPoet.I18n.t('templateDescriptionMissing'),
           {
             positionAfter: that.$el,
             scroll: true,
           }
         );
       } else {
-        console.log('Saving template with ', templateName, templateDescription);
         Module.saveTemplate({
           name: templateName,
           description: templateDescription,
         }).done(function() {
-          console.log('Template saved', arguments);
           MailPoet.Notice.success(
-            App.getConfig().get('translations.templateSaved'),
+            MailPoet.I18n.t('templateSaved'),
             {
               positionAfter: that.$el,
               scroll: true,
             }
           );
         }).fail(function() {
-          console.log('Template save failed', arguments);
           MailPoet.Notice.error(
-            App.getConfig().get('translations.templateSaveFailed'),
+            MailPoet.I18n.t('templateSaveFailed'),
             {
               positionAfter: that.$el,
               scroll: true,
@@ -247,7 +244,7 @@ define([
 
       if (templateName === '') {
         MailPoet.Notice.error(
-          App.getConfig().get('translations.templateNameMissing'),
+          MailPoet.I18n.t('templateNameMissing'),
           {
             positionAfter: that.$el,
             scroll: true,
@@ -255,14 +252,13 @@ define([
         );
       } else if (templateDescription === '') {
         MailPoet.Notice.error(
-          App.getConfig().get('translations.templateDescriptionMissing'),
+          MailPoet.I18n.t('templateDescriptionMissing'),
           {
             positionAfter: that.$el,
             scroll: true,
           }
         );
       } else {
-        console.log('Exporting template with ', templateName, templateDescription);
         Module.exportTemplate({
           name: templateName,
           description: templateDescription,
@@ -278,7 +274,6 @@ define([
     next: function() {
       this.hideOptionContents();
       if(!this.$('.mailpoet_save_next').hasClass('button-disabled')) {
-        console.log('Next');
         window.location.href = App.getConfig().get('urls.send');
       }
     },
@@ -289,8 +284,8 @@ define([
       }
 
       if (App.getConfig().get('validation.validateUnsubscribeLinkPresent') &&
-          JSON.stringify(jsonObject).indexOf("[unsubscribeUrl]") < 0) {
+          JSON.stringify(jsonObject).indexOf("[subscription:unsubscribe_url]") < 0) {
-        this.showValidationError(App.getConfig().get('translations.unsubscribeLinkMissing'));
+        this.showValidationError(MailPoet.I18n.t('unsubscribeLinkMissing'));
         return;
       }
 

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

@@ -1,13 +1,24 @@
 define([
     'newsletter_editor/App',
     'newsletter_editor/components/communication',
+    'mailpoet',
     'backbone',
     'backbone.marionette',
     'backbone.supermodel',
     'underscore',
     'jquery',
     'sticky-kit'
-  ], function(App, CommunicationComponent, Backbone, Marionette, SuperModel, _, jQuery, StickyKit) {
+  ], function(
+    App,
+    CommunicationComponent,
+    MailPoet,
+    Backbone,
+    Marionette,
+    SuperModel,
+    _,
+    jQuery,
+    StickyKit
+  ) {
 
   "use strict";
 
@@ -245,8 +256,6 @@ define([
       });
     },
     sendPreview: function() {
-      // testing sending method
-      console.log('trying to send a preview');
       // get form data
       var $emailField = this.$('#mailpoet_preview_to_email');
       var data = {
@@ -256,7 +265,7 @@ define([
 
       if (data.subscriber.length <= 0) {
         MailPoet.Notice.error(
-          App.getConfig().get('translations.newsletterPreviewEmailMissing'),
+          MailPoet.I18n.t('newsletterPreviewEmailMissing'),
           {
             positionAfter: $emailField,
             scroll: true,
@@ -270,7 +279,7 @@ define([
 
       CommunicationComponent.previewNewsletter(data).done(function(response) {
         if(response.result !== undefined && response.result === true) {
-          MailPoet.Notice.success(App.getConfig().get('translations.newsletterPreviewSent'), { scroll: true });
+          MailPoet.Notice.success(MailPoet.I18n.t('newsletterPreviewSent'), { scroll: true });
         } else {
           if (_.isArray(response.errors)) {
             response.errors.map(function(error) {
@@ -278,7 +287,7 @@ define([
             });
           } else {
             MailPoet.Notice.error(
-              App.getConfig().get('translations.newsletterPreviewFailedToSend'),
+              MailPoet.I18n.t('newsletterPreviewFailedToSend'),
               {
                 scroll: true,
                 static: true,

assets/js/src/newsletters/breadcrumb.jsx

@@ -2,12 +2,14 @@ define(
   [
     'react',
     'react-router',
-    'classnames'
+    'classnames',
+    'mailpoet'
   ],
   function(
     React,
     Router,
-    classNames
+    classNames,
+    MailPoet
   ) {
     var Link = Router.Link;
 
@@ -21,20 +23,20 @@ define(
           steps: [
             {
               name: 'type',
-              label: 'Select type',
+              label: MailPoet.I18n.t('selectType'),
               link: '/new'
             },
             {
               name: 'template',
-              label: 'Template'
+              label: MailPoet.I18n.t('template')
             },
             {
               name: 'editor',
-              label: 'Designer'
+              label: MailPoet.I18n.t('designer')
             },
             {
               name: 'send',
-              label: 'Send'
+              label: MailPoet.I18n.t('send')
             }
           ]
         };
@@ -73,4 +75,4 @@ define(
 
     return Breadcrumb;
   }
-);
+);

assets/js/src/newsletters/list.jsx

@@ -4,39 +4,41 @@ define(
     'react-router',
     'listing/listing.jsx',
     'classnames',
-    'jquery'
+    'jquery',
+    'mailpoet'
   ],
   function(
     React,
     Router,
     Listing,
     classNames,
-    jQuery
+    jQuery,
+    MailPoet
   ) {
     var Link = Router.Link;
 
     var columns = [
       {
         name: 'subject',
-        label: 'Subject',
+        label: MailPoet.I18n.t('subject'),
         sortable: true
       },
       {
         name: 'status',
-        label: 'Status'
+        label: MailPoet.I18n.t('status')
       },
       {
         name: 'segments',
-        label: 'Lists'
+        label: MailPoet.I18n.t('lists')
       },
       {
         name: 'created_at',
-        label: 'Created on',
+        label: MailPoet.I18n.t('createdOn'),
         sortable: true
       },
       {
         name: 'updated_at',
-        label: 'Last modified on',
+        label: MailPoet.I18n.t('lastModifiedOn'),
         sortable: true
       }
     ];
@@ -48,11 +50,11 @@ define(
 
         if(count === 1) {
           message = (
-            '1 newsletter was moved to the trash.'
+            MailPoet.I18n.t('oneNewsletterTrashed')
           );
         } else {
           message = (
-            '%$1d newsletters were moved to the trash.'
+            MailPoet.I18n.t('multipleNewslettersTrashed')
           ).replace('%$1d', count);
         }
         MailPoet.Notice.success(message);
@@ -63,11 +65,11 @@ define(
 
         if(count === 1) {
           message = (
-            '1 newsletter was permanently deleted.'
+            MailPoet.I18n.t('oneNewsletterDeleted')
           );
         } else {
           message = (
-            '%$1d newsletters were permanently deleted.'
+            MailPoet.I18n.t('multipleNewslettersDeleted')
           ).replace('%$1d', count);
         }
         MailPoet.Notice.success(message);
@@ -78,11 +80,11 @@ define(
 
         if(count === 1) {
           message = (
-            '1 newsletter has been restored from the trash.'
+            MailPoet.I18n.t('oneNewsletterRestored')
           );
         } else {
           message = (
-            '%$1d newsletters have been restored from the trash.'
+            MailPoet.I18n.t('multipleNewslettersRestored')
           ).replace('%$1d', count);
         }
         MailPoet.Notice.success(message);
@@ -92,7 +94,7 @@ define(
     var bulk_actions = [
       {
         name: 'trash',
-        label: 'Trash',
+        label: MailPoet.I18n.t('trash'),
         onSuccess: messages.onTrash
       }
     ];
@@ -103,7 +105,7 @@ define(
         link: function(item) {
           return (
             <a href={ `?page=mailpoet-newsletter-editor&id=${ item.id }` }>
-              Edit
+              {MailPoet.I18n.t('edit')}
             </a>
           );
         }
@@ -137,7 +139,7 @@ define(
       renderStatus: function(item) {
         if(!item.queue) {
           return (
-            <span>Not sent yet.</span>
+            <span>{MailPoet.I18n.t('notSentYet')}</span>
           );
         } else {
           var progressClasses = classNames(
@@ -155,9 +157,11 @@ define(
           if(item.queue.status === 'completed') {
             label = (
               <span>
-                Sent to {
+                {
-                  item.queue.count_processed - item.queue.count_failed
+                  MailPoet.I18n.t('newsletterQueueCompleted')
-                } out of { item.queue.count_total }.
+                  .replace("%$1d", item.queue.count_processed - item.queue.count_failed)
+                  .replace("%$2d", item.queue.count_total)
+                }
               </span>
             );
           } else {
@@ -171,14 +175,14 @@ define(
                   style={{ display: (item.queue.status === 'paused') ? 'inline-block': 'none' }}
                   href="javascript:;"
                   onClick={ this.resumeSending.bind(null, item) }
-                >Resume</a>
+                >{MailPoet.I18n.t('resume')}</a>
                 <a
                   id={ 'pause_'+item.id }
                   className="button mailpoet_pause"
                   style={{ display: (item.queue.status === null) ? 'inline-block': 'none' }}
                   href="javascript:;"
                   onClick={ this.pauseSending.bind(null, item) }
-                >Pause</a>
+                >{MailPoet.I18n.t('pause')}</a>
               </span>
             );
           }
@@ -239,7 +243,7 @@ define(
         return (
           <div>
             <h2 className="title">
-              Newsletters <Link className="add-new-h2" to="/new">New</Link>
+              {MailPoet.I18n.t('pageTitle')} <Link className="add-new-h2" to="/new">{MailPoet.I18n.t('new')}</Link>
             </h2>
 
             <Listing
@@ -258,4 +262,4 @@ define(
 
     return NewsletterList;
   }
-);
+);

assets/js/src/newsletters/send.jsx

@@ -21,21 +21,20 @@ define(
     var fields = [
       {
         name: 'subject',
-        label: 'Subject line',
+        label: MailPoet.I18n.t('subjectLine'),
-        tip: "Be creative! It's the first thing your subscribers see."+
+        tip: MailPoet.I18n.t('subjectLineTip'),
-             "Tempt them to open your email.",
         type: 'text',
         validation: {
           'data-parsley-required': true,
-          'data-parsley-required-message': 'You need to specify a subject.'
+          'data-parsley-required-message': MailPoet.I18n.t('emptySubjectLineError')
         }
       },
       {
         name: 'segments',
-        label: 'Segments',
+        label: MailPoet.I18n.t('segments'),
-        tip: "The subscriber segment that will be used for this campaign.",
+        tip: MailPoet.I18n.t('segmentsTip'),
         type: 'selection',
-        placeholder: "Select a segment",
+        placeholder: MailPoet.I18n.t('selectSegmentPlaceholder'),
         id: "mailpoet_segments",
         endpoint: "segments",
         multiple: true,
@@ -44,18 +43,18 @@ define(
         },
         validation: {
           'data-parsley-required': true,
-          'data-parsley-required-message': 'You need to select a segment.'
+          'data-parsley-required-message': MailPoet.I18n.t('noSegmentsSelectedError')
         }
       },
       {
         name: 'sender',
-        label: 'Sender',
+        label: MailPoet.I18n.t('sender'),
-        tip: "Name & email of yourself or your company.",
+        tip: MailPoet.I18n.t('senderTip'),
         fields: [
           {
             name: 'sender_name',
             type: 'text',
-            placeholder: 'John Doe',
+            placeholder: MailPoet.I18n.t('senderNamePlaceholder'),
             defaultValue: (settings.sender !== undefined) ? settings.sender.name : '',
             validation: {
               'data-parsley-required': true
@@ -64,7 +63,7 @@ define(
           {
             name: 'sender_address',
             type: 'text',
-            placeholder: 'john.doe@email.com',
+            placeholder: MailPoet.I18n.t('senderAddressPlaceholder'),
             defaultValue: (settings.sender !== undefined) ? settings.sender.address : '',
             validation: {
               'data-parsley-required': true,
@@ -75,21 +74,20 @@ define(
       },
       {
         name: 'reply-to',
-        label: 'Reply-to',
+        label: MailPoet.I18n.t('replyTo'),
-        tip: 'When the subscribers hit "reply" this is who will receive their '+
+        tip: MailPoet.I18n.t('replyToTip'),
-             'email.',
         inline: true,
         fields: [
           {
             name: 'reply_to_name',
             type: 'text',
-            placeholder: 'John Doe',
+            placeholder: MailPoet.I18n.t('replyToNamePlaceholder'),
             defaultValue: (settings.reply_to !== undefined) ? settings.reply_to.name : '',
           },
           {
             name: 'reply_to_address',
             type: 'text',
-            placeholder: 'john.doe@email.com',
+            placeholder: MailPoet.I18n.t('replyToAddressPlaceholder'),
             defaultValue: (settings.reply_to !== undefined) ? settings.reply_to.address : ''
           },
         ]
@@ -98,10 +96,10 @@ define(
 
     var messages = {
       onUpdate: function() {
-        MailPoet.Notice.success('Newsletter successfully updated!');
+        MailPoet.Notice.success(MailPoet.I18n.t('newsletterUpdated'));
       },
       onCreate: function() {
-        MailPoet.Notice.success('Newsletter successfully added!');
+        MailPoet.Notice.success(MailPoet.I18n.t('newsletterAdded'));
       }
     };
 
@@ -138,15 +136,14 @@ define(
             if(response.result === true) {
               this.history.pushState(null, '/');
               MailPoet.Notice.success(
-                'The newsletter is being sent...'
+                MailPoet.I18n.t('newsletterIsBeingSent')
               );
             } else {
               if(response.errors) {
                 MailPoet.Notice.error(response.errors);
               } else {
                 MailPoet.Notice.error(
-                  'An error occurred while trying to send. '+
+                  MailPoet.I18n.t('newsletterSendingError').replace("%$1s", '?page=mailpoet-settings')
-                  '<a href="?page=mailpoet-settings">Check your settings.</a>'
                 );
               }
             }
@@ -157,7 +154,7 @@ define(
       render: function() {
         return (
           <div>
-            <h1>Final step: last details</h1>
+            <h1>{MailPoet.I18n.t('finalNewsletterStep')}</h1>
 
             <Breadcrumb step="send" />
 
@@ -174,18 +171,18 @@ define(
                   className="button button-primary"
                   type="button"
                   onClick={ this.handleSend }
-                  value="Send" />
+                  value={MailPoet.I18n.t('send')} />
                 &nbsp;
                 <input
                   className="button button-secondary"
                   type="submit"
-                  value="Save as draft and close" />
+                  value={MailPoet.I18n.t('saveDraftAndClose')} />
-                &nbsp;or simply&nbsp;
+                &nbsp;{MailPoet.I18n.t('orSimply')}&nbsp;
                 <a
                   href={
                     '?page=mailpoet-newsletter-editor&id='+this.props.params.id
                   }>
-                  go back to design
+                  {MailPoet.I18n.t('goBackToDesign')}
                 </a>.
               </p>
             </Form>
@@ -196,4 +193,4 @@ define(
 
     return NewsletterSend;
   }
-);
+);

assets/js/src/newsletters/templates.jsx

@@ -54,7 +54,7 @@ define(
           try {
             saveTemplate(JSON.parse(e.target.result));
           } catch (err) {
-            MailPoet.Notice.error('This template file appears to be malformed. Please try another one.');
+            MailPoet.Notice.error(MailPoet.I18n.t('templateFileMalformedError'));
           }
         }.bind(this);
 
@@ -63,15 +63,15 @@ define(
       render: function() {
         return (
           <div>
-            <h2>Import a template</h2>
+            <h2>{MailPoet.I18n.t('importTemplateTitle')}</h2>
             <form onSubmit={this.handleSubmit}>
-              <input type="file" placeholder="Select a .json file to upload" ref="templateFile" />
+              <input type="file" placeholder={MailPoet.I18n.t('selectJsonFileToUpload')} ref="templateFile" />
 
               <p className="submit">
                 <input
                   className="button button-primary"
                   type="submit"
-                  value="Upload" />
+                  value={MailPoet.I18n.t('upload')} />
               </p>
             </form>
           </div>
@@ -108,9 +108,9 @@ define(
               response = [
                 {
                   name:
-                    "MailPoet's Guide",
+                    MailPoet.I18n.t('mailpoetGuideTemplateTitle'),
                   description:
-                    "This is the standard template that comes with MailPoet.",
+                    MailPoet.I18n.t('mailpoetGuideTemplateDescription'),
                   readonly: "1"
                 }
               ]
@@ -155,7 +155,9 @@ define(
         this.setState({ loading: true });
         if(
           window.confirm(
-            'You are about to delete the template named "'+ template.name +'"'
+            (
+              MailPoet.I18n.t('confirmTemplateDeletion')
+            ).replace("%$1s", template.name)
           )
         ) {
           MailPoet.Ajax.post({
@@ -187,7 +189,7 @@ define(
                 href="javascript:;"
                 onClick={ this.handleDeleteTemplate.bind(null, template) }
               >
-                Delete
+                {MailPoet.I18n.t('delete')}
               </a>
             </div>
           ), thumbnail = '';
@@ -218,7 +220,7 @@ define(
                     className="button button-primary"
                     onClick={ this.handleSelectTemplate.bind(null, template) }
                   >
-                    Select
+                    {MailPoet.I18n.t('select')}
                   </a>
                   &nbsp;
                   <a
@@ -226,7 +228,7 @@ define(
                     className="button button-secondary"
                     onClick={ this.handlePreviewTemplate.bind(null, template) }
                   >
-                    Preview
+                    {MailPoet.I18n.t('preview')}
                   </a>
               </div>
               { (template.readonly === "1") ? false : deleteLink }
@@ -242,7 +244,7 @@ define(
 
         return (
           <div>
-            <h1>Select a template</h1>
+            <h1>{MailPoet.I18n.t('selectTemplateTitle')}</h1>
 
             <Breadcrumb step="template" />
 

assets/js/src/newsletters/types.jsx

@@ -26,7 +26,7 @@ define(
           action: 'create',
           data: {
             type: type,
-            subject: 'Draft newsletter',
+            subject: MailPoet.I18n.t('draftNewsletterTitle'),
           }
         }).done(function(response) {
           if(response.result && response.newsletter.id) {
@@ -43,7 +43,7 @@ define(
       render: function() {
         return (
           <div>
-            <h1>Pick a type of campaign</h1>
+            <h1>{MailPoet.I18n.t('pickCampaignType')}</h1>
 
             <Breadcrumb step="type" />
 
@@ -52,10 +52,9 @@ define(
                 <div className="mailpoet_thumbnail"></div>
 
                 <div className="mailpoet_description">
-                  <h3>Newsletter</h3>
+                  <h3>{MailPoet.I18n.t('regularNewsletterTypeTitle')}</h3>
                   <p>
-                    Send a newsletter with images, buttons, dividers,
+                    {MailPoet.I18n.t('regularNewsletterTypeDescription')}
-                    and social bookmarks. Or a simple email.
                   </p>
                 </div>
 
@@ -64,7 +63,7 @@ define(
                     className="button button-primary"
                     onClick={ this.createNewsletter.bind(null, 'standard') }
                   >
-                    Create
+                    {MailPoet.I18n.t('create')}
                   </a>
                 </div>
               </li>
@@ -73,9 +72,9 @@ define(
                 <div className="mailpoet_thumbnail"></div>
 
                 <div className="mailpoet_description">
-                  <h3>Welcome email</h3>
+                  <h3>{MailPoet.I18n.t('welcomeNewsletterTypeTitle')}</h3>
                   <p>
-                    Send an email for new users.
+                    {MailPoet.I18n.t('welcomeNewsletterTypeDescription')}
                   </p>
                 </div>
 
@@ -84,7 +83,7 @@ define(
                     className="button button-primary"
                     onClick={ this.setupNewsletter.bind(null, 'welcome') }
                   >
-                    Set up
+                    {MailPoet.I18n.t('setUp')}
                   </a>
                 </div>
               </li>
@@ -93,9 +92,9 @@ define(
                 <div className="mailpoet_thumbnail"></div>
 
                 <div className="mailpoet_description">
-                  <h3>Post notifications</h3>
+                  <h3>{MailPoet.I18n.t('postNotificationNewsletterTypeTitle')}</h3>
                   <p>
-                    Automatically send posts immediately, daily, weekly or monthly. Filter by categories, if you like.
+                    {MailPoet.I18n.t('postNotificationsNewsletterTypeDescription')}
                   </p>
                 </div>
 
@@ -104,7 +103,7 @@ define(
                     className="button button-primary"
                     onClick={ this.setupNewsletter.bind(null, 'notification') }
                   >
-                    Set up
+                    {MailPoet.I18n.t('setUp')}
                   </a>
                 </div>
               </li>

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

@@ -25,11 +25,11 @@ define(
     var intervalField = {
       name: 'interval',
       values: {
-        'daily': 'Once a day at...',
+        'daily': MailPoet.I18n.t('daily'),
-        'weekly': 'Weekly on...',
+        'weekly': MailPoet.I18n.t('weekly'),
-        'monthly': 'Monthly on the...',
+        'monthly': MailPoet.I18n.t('monthly'),
-        'nthWeekDay': 'Monthly every...',
+        'nthWeekDay': MailPoet.I18n.t('monthlyEvery'),
-        'immediately': 'Immediately.',
+        'immediately': MailPoet.I18n.t('immediately'),
       },
     };
 
@@ -53,13 +53,13 @@ define(
     var weekDayField = {
       name: 'weekDay',
       values: {
-        0: 'Monday',
+        0: MailPoet.I18n.t('sunday'),
-        1: 'Tuesday',
+        1: MailPoet.I18n.t('monday'),
-        2: 'Wednesday',
+        2: MailPoet.I18n.t('tuesday'),
-        3: 'Thursday',
+        3: MailPoet.I18n.t('wednesday'),
-        4: 'Friday',
+        4: MailPoet.I18n.t('thursday'),
-        5: 'Saturday',
+        5: MailPoet.I18n.t('friday'),
-        6: 'Sunday',
+        6: MailPoet.I18n.t('saturday')
       },
     };
 
@@ -69,14 +69,19 @@ define(
       values: _.object(_.map(
         _.times(NUMBER_OF_DAYS_IN_MONTH, function(day) { return day; }),
         function(day) {
-          var suffixes = {
+          var labels = {
-            0: 'st',
+            0: MailPoet.I18n.t('first'),
-            1: 'nd',
+            1: MailPoet.I18n.t('second'),
-            2: 'rd'
+            2: MailPoet.I18n.t('third')
-          };
+          },
-          var suffix = suffixes[day] || 'th';
+            label;
+          if (labels[day] !== undefined) {
+            label = labels[day];
+          } else {
+            label = MailPoet.I18n.t('nth').replace("%$1d", day + 1);
+          }
 
-          return [day, (day + 1).toString() + suffix];
+          return [day, label];
         },
       )),
     };
@@ -84,10 +89,10 @@ define(
     var nthWeekDayField = {
       name: 'nthWeekDay',
       values: {
-        '0': '1st',
+        '1': MailPoet.I18n.t('first'),
-        '1': '2nd',
+        '2': MailPoet.I18n.t('second'),
-        '2': '3rd',
+        '3': MailPoet.I18n.t('third'),
-        '3': 'last',
+        'L': MailPoet.I18n.t('last'),
       },
     };
 
@@ -99,9 +104,9 @@ define(
         return {
           intervalType: 'immediate', // 'immediate'|'daily'|'weekly'|'monthly'
           timeOfDay: 0,
-          weekDay: 0,
+          weekDay: 1,
           monthDay: 0,
-          nthWeekDay: 0,
+          nthWeekDay: 1,
         };
       },
       handleIntervalChange: function(event) {
@@ -197,7 +202,7 @@ define(
 
         return (
           <div>
-            <h1>Post notifications</h1>
+            <h1>{MailPoet.I18n.t('postNotificationNewsletterTypeTitle')}</h1>
             <Breadcrumb step="type" />
 
             <Select
@@ -215,7 +220,7 @@ define(
                 className="button button-primary"
                 type="button"
                 onClick={ this.handleNext }
-                value="Next" />
+                value={MailPoet.I18n.t('next')} />
             </p>
           </div>
         );

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

@@ -47,7 +47,7 @@ define(
       render: function() {
         return (
           <div>
-            <h1>Newsletter</h1>
+            <h1>{MailPoet.I18n.t('regularNewsletterTypeTitle')}</h1>
             <Breadcrumb step="type" />
           </div>
         );

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

@@ -28,8 +28,8 @@ define(
     var events = {
       name: 'event',
       values: {
-        'segment': 'When someone subscribes to the list...',
+        'segment': MailPoet.I18n.t('onSubscriptionToList'),
-        'user': 'When a new Wordrpess user is added to your site...',
+        'user': MailPoet.I18n.t('onWordpressUserRegistration'),
       }
     };
 
@@ -57,10 +57,10 @@ define(
     var afterTimeTypeField = {
       name: 'afterTimeType',
       values: {
-        'immediate': 'immediately',
+        'immediate': MailPoet.I18n.t('delayImmediately'),
-        'hours': 'hour(s) after',
+        'hours': MailPoet.I18n.t('delayHoursAfter'),
-        'days': 'day(s) after',
+        'days': MailPoet.I18n.t('delayDaysAfter'),
-        'weeks': 'week(s) after',
+        'weeks': MailPoet.I18n.t('delayWeeksAfter'),
       }
     };
 
@@ -152,9 +152,11 @@ define(
         }
         return (
           <div>
-            <h1>Welcome email</h1>
+            <h1>{MailPoet.I18n.t('welcomeNewsletterTypeTitle')}</h1>
             <Breadcrumb step="type" />
 
+            <h3>{MailPoet.I18n.t('selectEventToSendWelcomeEmail')}</h3>
+
             <Select
               field={events}
               item={this.state}
@@ -174,7 +176,7 @@ define(
                 className="button button-primary"
                 type="button"
                 onClick={ this.handleNext }
-                value="Next" />
+                value={MailPoet.I18n.t('next')} />
             </p>
           </div>
         );

assets/js/src/public.js

@@ -20,13 +20,18 @@ function(
       $('form.mailpoet_form').each(function() {
         var form = $(this);
 
-        form.parsley().on('form:submit', function(parsley) {
+        form.parsley().on('form:validated', function(parsley) {
-
-          var data = form.serializeObject() || {};
-
           // clear messages
           form.find('.mailpoet_message').html('');
 
+          // resize iframe
+          if(window.frameElement !== null) {
+            MailPoet.Iframe.autoSize(window.frameElement);
+          }
+        });
+
+        form.parsley().on('form:submit', function(parsley) {
+          var data = form.serializeObject() || {};
           // check if we're on the same domain
           if(isSameDomain(MailPoetForm.ajax_url) === false) {
             // non ajax post request
@@ -68,6 +73,11 @@ function(
                 // reset validation
                 parsley.reset();
               }
+
+              // resize iframe
+              if(window.frameElement !== null) {
+                MailPoet.Iframe.autoSize(window.frameElement);
+              }
             });
           }
           return false;

assets/js/src/segments/form.jsx

@@ -15,22 +15,22 @@ define(
     let fields = [
       {
         name: 'name',
-        label: 'Name',
+        label: MailPoet.I18n.t('name'),
         type: 'text'
       },
       {
         name: 'description',
-        label: 'Description',
+        label: MailPoet.I18n.t('description'),
         type: 'textarea'
       }
     ];
 
     const messages = {
       onUpdate: function() {
-        MailPoet.Notice.success('Segment successfully updated!');
+        MailPoet.Notice.success(MailPoet.I18n.t('segmentUpdated'));
       },
       onCreate: function() {
-        MailPoet.Notice.success('Segment successfully added!');
+        MailPoet.Notice.success(MailPoet.I18n.t('segmentAdded'));
       }
     };
 
@@ -42,7 +42,7 @@ define(
         return (
           <div>
             <h2 className="title">
-              Segment
+              {MailPoet.I18n.t('segment')}
             </h2>
 
             <Form

assets/js/src/segments/list.jsx

@@ -10,32 +10,32 @@ import Listing from 'listing/listing.jsx'
 var columns = [
   {
     name: 'name',
-    label: 'Name',
+    label: MailPoet.I18n.t('name'),
     sortable: true
   },
   {
     name: 'description',
-    label: 'Description',
+    label: MailPoet.I18n.t('description'),
     sortable: false
   },
   {
     name: 'subscribed',
-    label: 'Subscribed',
+    label: MailPoet.I18n.t('subscribed'),
     sortable: false
   },
   {
     name: 'unconfirmed',
-    label: 'Unconfirmed',
+    label: MailPoet.I18n.t('unconfirmed'),
     sortable: false
   },
   {
     name: 'unsubscribed',
-    label: 'Unsubscribed',
+    label: MailPoet.I18n.t('unsubscribed'),
     sortable: false
   },
   {
     name: 'created_at',
-    label: 'Created on',
+    label: MailPoet.I18n.t('createdOn'),
     sortable: true
   }
 ];
@@ -47,11 +47,11 @@ const messages = {
 
     if(count === 1) {
       message = (
-        '1 segment was moved to the trash.'
+        MailPoet.I18n.t('oneSegmentTrashed')
       );
     } else {
       message = (
-        '%$1d segments were moved to the trash.'
+        MailPoet.I18n.t('multipleSegmentsTrashed')
       ).replace('%$1d', count);
     }
     MailPoet.Notice.success(message);
@@ -62,11 +62,11 @@ const messages = {
 
     if(count === 1) {
       message = (
-        '1 segment was permanently deleted.'
+        MailPoet.I18n.t('oneSegmentDeleted')
       );
     } else {
       message = (
-        '%$1d segments were permanently deleted.'
+        MailPoet.I18n.t('multipleSegmentsDeleted')
       ).replace('%$1d', count);
     }
     MailPoet.Notice.success(message);
@@ -77,11 +77,11 @@ const messages = {
 
     if(count === 1) {
       message = (
-        '1 segment has been restored from the trash.'
+        MailPoet.I18n.t('oneSegmentRestored')
       );
     } else {
       message = (
-        '%$1d segments have been restored from the trash.'
+        MailPoet.I18n.t('multipleSegmentsRestored')
       ).replace('%$1d', count);
     }
     MailPoet.Notice.success(message);
@@ -91,10 +91,10 @@ const messages = {
 const item_actions = [
   {
     name: 'edit',
-    label: 'Edit',
+    label: MailPoet.I18n.t('edit'),
     link: function(item) {
       return (
-        <Link to={ `/edit/${item.id}` }>Edit</Link>
+        <Link to={ `/edit/${item.id}` }>{MailPoet.I18n.t('edit')}</Link>
       );
     },
     display: function(segment) {
@@ -111,7 +111,7 @@ const item_actions = [
         data: item.id
       }).done(function(response) {
         MailPoet.Notice.success(
-          ('List "%$1s" has been duplicated.').replace('%$1s', response.name)
+          (MailPoet.I18n.t('listDuplicated')).replace('%$1s', response.name)
         );
         refresh();
       });
@@ -122,7 +122,7 @@ const item_actions = [
   },
   {
     name: 'synchronize_segment',
-    label: 'Update',
+    label: MailPoet.I18n.t('update'),
     className: 'update',
     onClick: function(item, refresh) {
       MailPoet.Modal.loading(true);
@@ -133,7 +133,7 @@ const item_actions = [
         MailPoet.Modal.loading(false);
         if(response === true) {
           MailPoet.Notice.success(
-            ('List "%$1s" has been synchronized.').replace('%$1s', item.name)
+            (MailPoet.I18n.t('listSynchronized')).replace('%$1s', item.name)
           );
           refresh();
         }
@@ -147,7 +147,7 @@ const item_actions = [
     name: 'view_subscribers',
     link: function(item) {
       return (
-        <a href={ item.subscribers_url }>View subscribers</a>
+        <a href={ item.subscribers_url }>{MailPoet.I18n.t('viewSubscribers')}</a>
       );
     }
   },
@@ -199,7 +199,7 @@ const SegmentList = React.createClass({
     return (
       <div>
         <h2 className="title">
-          Segments <Link className="add-new-h2" to="/new">New</Link>
+          {MailPoet.I18n.t('pageTitle')} <Link className="add-new-h2" to="/new">{MailPoet.I18n.t('new')}</Link>
         </h2>
 
         <Listing
@@ -219,4 +219,4 @@ const SegmentList = React.createClass({
   }
 });
 
-module.exports = SegmentList;
+module.exports = SegmentList;

assets/js/src/settings/tabs.js

@@ -34,13 +34,16 @@ define(
           // show sending methods
           jQuery('.mailpoet_sending_methods').fadeIn();
         } else {
-          // hide DKIM option when using MailPoet's API
+          // toggle SPF/DKIM (hidden if the sending method is MailPoet)
-          jQuery('#mailpoet_mta_dkim')[
+          jQuery('#mailpoet_mta_spf')[
             (group === 'mailpoet')
             ? 'hide'
             : 'show'
           ]();
 
+          // (HIDDEN FOR BETA)
+          jQuery('#mailpoet_mta_dkim').hide();
+
           // hide sending methods
           jQuery('.mailpoet_sending_methods').hide();
 

assets/js/src/subscribers/form.jsx

@@ -14,34 +14,34 @@ define(
     var fields = [
       {
         name: 'email',
-        label: 'E-mail',
+        label: MailPoet.I18n.t('email'),
         type: 'text'
       },
       {
         name: 'first_name',
-        label: 'Firstname',
+        label: MailPoet.I18n.t('firstname'),
         type: 'text'
       },
       {
         name: 'last_name',
-        label: 'Lastname',
+        label: MailPoet.I18n.t('lastname'),
         type: 'text'
       },
       {
         name: 'status',
-        label: 'Status',
+        label: MailPoet.I18n.t('status'),
         type: 'select',
         values: {
-          'unconfirmed': 'Unconfirmed',
+          'unconfirmed': MailPoet.I18n.t('unconfirmed'),
-          'subscribed': 'Subscribed',
+          'subscribed': MailPoet.I18n.t('subscribed'),
-          'unsubscribed': 'Unsubscribed'
+          'unsubscribed': MailPoet.I18n.t('unsubscribed')
         }
       },
       {
         name: 'segments',
-        label: 'Lists',
+        label: MailPoet.I18n.t('lists'),
         type: 'selection',
-        placeholder: "Select a list",
+        placeholder: MailPoet.I18n.t('selectList'),
         endpoint: "segments",
         multiple: true,
         selected: function(subscriber) {
@@ -69,7 +69,13 @@ define(
                 if (subscription.status === 'unsubscribed') {
                   const unsubscribed_at = MailPoet.Date
                     .format(subscription.updated_at);
-                  label += ' (Unsubscribed on '+unsubscribed_at+')';
+                  label += ' (%$1s)'.replace(
+                    '%$1s',
+                    MailPoet.I18n.t('unsubscribedOn').replace(
+                      '%$1s',
+                      unsubscribed_at
+                    )
+                  );
                 }
               }
             });
@@ -99,10 +105,10 @@ define(
 
     var messages = {
       onUpdate: function() {
-        MailPoet.Notice.success('Subscriber successfully updated!');
+        MailPoet.Notice.success(MailPoet.I18n.t('subscriberUpdated'));
       },
       onCreate: function() {
-        MailPoet.Notice.success('Subscriber successfully added!');
+        MailPoet.Notice.success(MailPoet.I18n.t('subscriberAdded'));
       }
     };
 
@@ -116,7 +122,7 @@ define(
         return (
           <div>
             <h2 className="title">
-              Subscriber
+              {MailPoet.I18n.t('subscriber')}
             </h2>
 
             <Form

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

@@ -150,7 +150,7 @@ define(
           if (response.result === false) {
             MailPoet.Notice.error(response.errors);
           } else {
-            resultMessage = MailPoetI18n.exportMessage
+            resultMessage = MailPoet.I18n.t('exportMessage')
              .replace('%1$s', '<strong>' + response.data.totalExported + '</strong>')
              .replace('[link]', '<a href="' + response.data.exportFileURL + '" target="_blank" >')
              .replace('[/link]', '</a>');
@@ -162,7 +162,7 @@ define(
         .error(function (error) {
           MailPoet.Modal.loading(false);
           MailPoet.Notice.error(
-           MailPoetI18n.serverError + error.statusText.toLowerCase() + '.'
+           MailPoet.I18n.t('serverError') + error.statusText.toLowerCase() + '.'
           );
         });
      });

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

@@ -7,7 +7,8 @@ define(
       'handlebars',
       'papaparse',
       'select2',
-      'asyncqueue'
+      'asyncqueue',
+      'xss'
     ],
     function (
       Backbone,
@@ -16,7 +17,8 @@ define(
       MailPoet,
       Handlebars,
       Papa,
-      AsyncQueue
+      AsyncQueue,
+      xss
     ) {
       if (!jQuery('#mailpoet_subscribers_import').length) {
         return;
@@ -126,7 +128,7 @@ define(
             // get an approximate size of textarea paste in bytes
             var pasteSize = encodeURI(pasteInputElement.val()).split(/%..|./).length - 1;
             if (pasteSize > maxPostSizeBytes) {
-              MailPoet.Notice.error(MailPoetI18n.maxPostSizeNotice, {
+              MailPoet.Notice.error(MailPoet.I18n.t('maxPostSizeNotice'), {
                 timeout: noticeTimeout,
               });
               return;
@@ -146,7 +148,7 @@ define(
               var ext = this.value.match(/\.(.+)$/);
               if (ext === null || ext[1].toLowerCase() !== 'csv') {
                 this.value = '';
-                MailPoet.Notice.error(MailPoetI18n.wrongFileFormat, {
+                MailPoet.Notice.error(MailPoet.I18n.t('wrongFileFormat'), {
                   timeout: noticeTimeout,
                 });
               }
@@ -210,7 +212,7 @@ define(
                     .removeClass()
                     .addClass('mailpoet_mailchimp-key-status mailpoet_mailchimp-ok');
                 if (!response.data) {
-                  jQuery('.mailpoet_mailchimp-key-status').html(MailPoetI18n.noMailChimpLists);
+                  jQuery('.mailpoet_mailchimp-key-status').html(MailPoet.I18n.t('noMailChimpLists'));
                   mailChimpListsContainerElement.hide();
                   toggleNextStepButton(mailChimpProcessButtonElement, 'off');
                 } else {
@@ -221,7 +223,7 @@ define(
             }).error(function (error) {
               MailPoet.Modal.loading(false);
               MailPoet.Notice.error(
-                  MailPoetI18n.serverError + error.statusText.toLowerCase() + '.', {
+                  MailPoet.I18n.t('serverError') + error.statusText.toLowerCase() + '.', {
                     timeout: noticeTimeout,
                   }
               );
@@ -256,7 +258,7 @@ define(
             }).error(function () {
               MailPoet.Modal.loading(false);
               MailPoet.Notice.error(
-                  MailPoetI18n.serverError + result.statusText.toLowerCase() + '.', {
+                  MailPoet.I18n.t('serverError') + result.statusText.toLowerCase() + '.', {
                     timeout: noticeTimeout,
                   }
               );
@@ -348,14 +350,14 @@ define(
               comments: advancedOptionComments,
               error: function () {
                 MailPoet.Notice.hide();
-                MailPoet.Notice.error(MailPoetI18n.dataProcessingError, {
+                MailPoet.Notice.error(MailPoet.I18n.t('dataProcessingError'), {
                   timeout: noticeTimeout,
                 });
               },
               complete: function (CSV) {
                 for (var rowCount in CSV.data) {
                   var rowData = CSV.data[rowCount].map(function (el) {
-                        return el.trim();
+                        return filterXSS(el.trim());
                       }),
                       rowColumnCount = rowData.length;
                   // set the number of row elements based on the first non-empty row
@@ -429,8 +431,8 @@ define(
                 }
                 else {
                   MailPoet.Modal.loading(false);
-                  var errorNotice = MailPoetI18n.noValidRecords;
+                  var errorNotice = MailPoet.I18n.t('noValidRecords');
-                  errorNotice = errorNotice.replace('[link]', MailPoetI18n.csvKBLink);
+                  errorNotice = errorNotice.replace('[link]', MailPoet.I18n.t('csvKBLink'));
                   errorNotice = errorNotice.replace('[/link]', '</a>');
                   MailPoet.Notice.error(errorNotice, {
                     timeout: noticeTimeout,
@@ -499,17 +501,17 @@ define(
             }
 
             var import_results = {
-              notice: MailPoetI18n.importNoticeSkipped.replace(
+              notice: MailPoet.I18n.t('importNoticeSkipped').replace(
                   '%1$s',
                   '<strong>' + (subscribers.invalid.length + subscribers.duplicate.length) + '</strong>'
               ),
               invalid: (subscribers.invalid.length)
-                  ? MailPoetI18n.importNoticeInvalid
+                  ? MailPoet.I18n.t('importNoticeInvalid')
                   .replace('%1$s', '<strong>' + subscribers.invalid.length + '</strong>')
                   .replace('%2$s', subscribers.invalid.join(', '))
                   : null,
               duplicate: (subscribers.duplicate.length)
-                  ? MailPoetI18n.importNoticeDuplicate
+                  ? MailPoet.I18n.t('importNoticeDuplicate')
                   .replace('%1$s', '<strong>' + subscribers.duplicate.length + '</strong>')
                   .replace('%2$s', subscribers.duplicate.join(', '))
                   : null
@@ -525,8 +527,8 @@ define(
                 jQuery(details).toggle();
                 this.text =
                     (jQuery(details).is(":visible"))
-                        ? MailPoetI18n.hideDetails
+                        ? MailPoet.I18n.t('hideDetails')
-                        : MailPoetI18n.showDetails;
+                        : MailPoet.I18n.t('showDetails');
               });
 
           // show available segments
@@ -562,7 +564,7 @@ define(
                   var segmentSelectionNotice = jQuery('[data-id="notice_segmentSelection"]');
                   if (!this.value) {
                     if (!segmentSelectionNotice.length) {
-                      MailPoet.Notice.error(MailPoetI18n.segmentSelectionRequired, {
+                      MailPoet.Notice.error(MailPoet.I18n.t('segmentSelectionRequired'), {
                         static: true,
                         timeout: noticeTimeout,
                         scroll: true,
@@ -582,7 +584,7 @@ define(
 
           jQuery('.mailpoet_create_segment').click(function () {
             MailPoet.Modal.popup({
-              title: MailPoetI18n.addNewList,
+              title: MailPoet.I18n.t('addNewList'),
               template: jQuery('#new_segment_template').html()
             })
             jQuery('#new_segment_name').keypress(function (e) {
@@ -642,7 +644,7 @@ define(
                       else {
                         MailPoet.Modal.close();
                         MailPoet.Notice.error(
-                            MailPoetI18n.segmentCreateError + response.message + '.', {
+                            MailPoet.I18n.t('segmentCreateError') + response.message + '.', {
                               timeout: noticeTimeout,
                             }
                         );
@@ -651,7 +653,7 @@ define(
                     .error(function (error) {
                       MailPoet.Modal.close();
                       MailPoet.Notice.error(
-                          MailPoetI18n.serverError + error.statusText.toLowerCase() + '.', {
+                          MailPoet.I18n.t('serverError') + error.statusText.toLowerCase() + '.', {
                             timeout: noticeTimeout
                           }
                       );
@@ -768,7 +770,7 @@ define(
                   selectEvent.preventDefault();
                   jQuery(selectElement).select2('close');
                   MailPoet.Modal.popup({
-                    title: MailPoetI18n.addNewColumn,
+                    title: MailPoet.I18n.t('addNewColumn'),
                     template: jQuery('#new_column_template').html()
                   });
                   jQuery('#new_column_name').keypress(function (e) {
@@ -832,7 +834,7 @@ define(
                               // if this is the first custom column, create an "optgroup"
                               if (mailpoetColumnsSelect2.length === 2) {
                                 mailpoetColumnsSelect2.push({
-                                  'name': MailPoetI18n.userColumns,
+                                  'name': MailPoet.I18n.t('userColumns'),
                                   'children': []
                                 });
                               }
@@ -858,7 +860,7 @@ define(
                               filterSubscribers();
                             }
                             else {
-                              MailPoet.Notice.error(MailPoetI18n.customFieldCreateError, {
+                              MailPoet.Notice.error(MailPoet.I18n.t('customFieldCreateError'), {
                                 timeout: noticeTimeout,
                               });
                             }
@@ -867,7 +869,7 @@ define(
                           .error(function (error) {
                             MailPoet.Modal.loading(false);
                             MailPoet.Notice.error(
-                                MailPoetI18n.serverError + error.statusText.toLowerCase() + '.', {
+                                MailPoet.I18n.t('serverError') + error.statusText.toLowerCase() + '.', {
                                   timeout: noticeTimeout,
                                 }
                             );
@@ -888,7 +890,7 @@ define(
                         // if another column has the same value and it's not an 'ignore', prompt user
                         if (elementId === selectedOptionId
                             && elementId !== 'ignore') {
-                          if (confirm(MailPoetI18n.selectedValueAlreadyMatched + ' ' + MailPoetI18n.confirmCorrespondingColumn)) {
+                          if (confirm(MailPoet.I18n.t('selectedValueAlreadyMatched') + ' ' + MailPoet.I18n.t('confirmCorrespondingColumn'))) {
                             jQuery(element).data('column-id', 'ignore');
                           }
                           else {
@@ -931,7 +933,7 @@ define(
                 if (!emailRegex.test(subscribersClone.subscribers[0][matchedColumn])) {
                   preventNextStep = true;
                   if (!jQuery('[data-id="notice_invalidEmail"]').length) {
-                    MailPoet.Notice.error(MailPoetI18n.columnContainsInvalidElement, {
+                    MailPoet.Notice.error(MailPoet.I18n.t('columnContainsInvalidElement'), {
                       static: true,
                       timeout: noticeTimeout,
                       scroll: true,
@@ -951,18 +953,18 @@ define(
                       date = new Date(rowData.replace(/-/g, '/')), // IE doesn't like
                   // dashes as date separators
                       month_name = [
-                        MailPoetI18n.january,
+                        MailPoet.I18n.t('january'),
-                        MailPoetI18n.february,
+                        MailPoet.I18n.t('february'),
-                        MailPoetI18n.march,
+                        MailPoet.I18n.t('march'),
-                        MailPoetI18n.april,
+                        MailPoet.I18n.t('april'),
-                        MailPoetI18n.may,
+                        MailPoet.I18n.t('may'),
-                        MailPoetI18n.june,
+                        MailPoet.I18n.t('june'),
-                        MailPoetI18n.july,
+                        MailPoet.I18n.t('july'),
-                        MailPoetI18n.august,
+                        MailPoet.I18n.t('august'),
-                        MailPoetI18n.september,
+                        MailPoet.I18n.t('september'),
-                        MailPoetI18n.october,
+                        MailPoet.I18n.t('october'),
-                        MailPoetI18n.november,
+                        MailPoet.I18n.t('november'),
-                        MailPoetI18n.december
+                        MailPoet.I18n.t('december')
                       ];
 
                   if (position !== fillterPosition) {
@@ -975,8 +977,8 @@ define(
                     if (rowData.trim() === '') {
                       data[matchedColumn] =
                           '<span class="mailpoet_data_match mailpoet_import_error" title="'
-                          + MailPoetI18n.noDateFieldMatch + '">'
+                          + MailPoet.I18n.t('noDateFieldMatch') + '">'
-                          + MailPoetI18n.emptyDate
+                          + MailPoet.I18n.t('emptyDate')
                           + '</span>';
                       preventNextStep = true;
                       return;
@@ -993,25 +995,25 @@ define(
                           + ((date.getMinutes() < 10 ? '0' : '')
                           + date.getMinutes()) + ' '
                           + ((date.getHours() >= 12)
-                                  ? MailPoetI18n.pm
+                                  ? MailPoet.I18n.t('pm')
-                                  : MailPoetI18n.am
+                                  : MailPoet.I18n.t('am')
                           );
                       data[matchedColumn] +=
                           '<span class="mailpoet_data_match" title="'
-                          + MailPoetI18n.verifyDateMatch + '">'
+                          + MailPoet.I18n.t('verifyDateMatch') + '">'
                           + date + '</span>';
                     }
                     else {
                       data[matchedColumn] +=
                           '<span class="mailpoet_data_match mailpoet_import_error" title="'
-                          + MailPoetI18n.noDateFieldMatch + '">'
+                          + MailPoet.I18n.t('noDateFieldMatch') + '">'
-                          + MailPoetI18n.dateMatchError + '</span>';
+                          + MailPoet.I18n.t('dateMatchError') + '</span>';
                       preventNextStep = true;
                     }
                   }
                 });
                 if (preventNextStep && !jQuery('.mailpoet_invalidDate').length) {
-                  MailPoet.Notice.error(MailPoetI18n.columnContainsInvalidDate, {
+                  MailPoet.Notice.error(MailPoet.I18n.t('columnContainsInvalidDate'), {
                     static: true,
                     timeout: noticeTimeout,
                     scroll: true,
@@ -1112,7 +1114,7 @@ define(
                   })
                   .error(function (error) {
                     importResults.errors.push(
-                      MailPoetI18n.serverError + error.statusText.toLowerCase() + '.'
+                      MailPoet.I18n.t('serverError') + error.statusText.toLowerCase() + '.'
                     );
                     queue.run();
                   });
@@ -1169,12 +1171,12 @@ define(
               exportMenuElement = jQuery('span.mailpoet_export'),
               importResults = {
                 created: (importData.step2.created)
-                    ? MailPoetI18n.subscribersCreated
+                    ? MailPoet.I18n.t('subscribersCreated')
                     .replace('%1$s', '<strong>' + importData.step2.created + '</strong>')
                     .replace('%2$s', '"' + importData.step2.segments.join('", "') + '"')
                     : false,
                 updated: (importData.step2.updated)
-                    ? MailPoetI18n.subscribersUpdated
+                    ? MailPoet.I18n.t('subscribersUpdated')
                     .replace('%1$s', '<strong>' + importData.step2.updated + '</strong>')
                     .replace('%2$s', '"' + importData.step2.segments.join('", "') + '"')
                     : false,
@@ -1210,4 +1212,4 @@ define(
           Backbone.history.start();
         }
       });
-    });
+    });

assets/js/src/subscribers/list.jsx

@@ -11,28 +11,28 @@ import Selection from 'form/fields/selection.jsx'
 const columns = [
   {
     name: 'email',
-    label: 'Subscriber',
+    label: MailPoet.I18n.t('subscriber'),
     sortable: true
   },
   {
     name: 'status',
-    label: 'Status',
+    label: MailPoet.I18n.t('status'),
     sortable: true
   },
   {
     name: 'segments',
-    label: 'Lists',
+    label: MailPoet.I18n.t('lists'),
     sortable: false
   },
 
   {
     name: 'created_at',
-    label: 'Subscribed on',
+    label: MailPoet.I18n.t('subscribedOn'),
     sortable: true
   },
   {
     name: 'updated_at',
-    label: 'Last modified on',
+    label: MailPoet.I18n.t('lastModifiedOn'),
     sortable: true
   },
 ];
@@ -43,11 +43,11 @@ const messages = {
       var message = null;
       if(~~response === 1) {
         message = (
-          '1 subscriber was moved to the trash.'
+          MailPoet.I18n.t('oneSubscriberTrashed')
         );
       } else if(~~response > 1) {
         message = (
-          '%$1d subscribers were moved to the trash.'
+          MailPoet.I18n.t('multipleSubscribersTrashed')
         ).replace('%$1d', ~~response);
       }
 
@@ -61,11 +61,11 @@ const messages = {
       var message = null;
       if(~~response === 1) {
         message = (
-          '1 subscriber was permanently deleted.'
+          MailPoet.I18n.t('oneSubscriberDeleted')
         );
       } else if(~~response > 1) {
         message = (
-          '%$1d subscribers were permanently deleted.'
+          MailPoet.I18n.t('multipleSubscribersDeleted')
         ).replace('%$1d', ~~response);
       }
 
@@ -79,11 +79,11 @@ const messages = {
       var message = null;
       if(~~response === 1) {
         message = (
-          '1 subscriber has been restored from the trash.'
+          MailPoet.I18n.t('oneSubscriberRestored')
         );
       } else if(~~response > 1) {
         message = (
-          '%$1d subscribers have been restored from the trash.'
+          MailPoet.I18n.t('multipleSubscribersRestored')
         ).replace('%$1d', ~~response);
       }
 
@@ -97,7 +97,7 @@ const messages = {
 const bulk_actions = [
   {
     name: 'moveToList',
-    label: 'Move to list...',
+    label: MailPoet.I18n.t('moveToList'),
     onSelect: function() {
       let field = {
         id: 'move_to_segment',
@@ -120,7 +120,7 @@ const bulk_actions = [
     },
     onSuccess: function(response) {
       MailPoet.Notice.success(
-        '%$1d subscribers were moved to list <strong>%$2s</strong>.'
+        MailPoet.I18n.t('multipleSubscribersMovedToList')
         .replace('%$1d', ~~response.subscribers)
         .replace('%$2s', response.segment)
       );
@@ -128,7 +128,7 @@ const bulk_actions = [
   },
   {
     name: 'addToList',
-    label: 'Add to list...',
+    label: MailPoet.I18n.t('addToList'),
     onSelect: function() {
       let field = {
         id: 'add_to_segment',
@@ -151,7 +151,7 @@ const bulk_actions = [
     },
     onSuccess: function(response) {
       MailPoet.Notice.success(
-        '%$1d subscribers were added to list <strong>%$2s</strong>.'
+        MailPoet.I18n.t('multipleSubscribersAddedToList')
         .replace('%$1d', ~~response.subscribers)
         .replace('%$2s', response.segment)
       );
@@ -159,7 +159,7 @@ const bulk_actions = [
   },
   {
     name: 'removeFromList',
-    label: 'Remove from list...',
+    label: MailPoet.I18n.t('removeFromList'),
     onSelect: function() {
       let field = {
         id: 'remove_from_segment',
@@ -182,7 +182,7 @@ const bulk_actions = [
     },
     onSuccess: function(response) {
       MailPoet.Notice.success(
-        '%$1d subscribers were removed from list <strong>%$2s</strong>.'
+        MailPoet.I18n.t('multipleSubscribersRemovedFromList')
         .replace('%$1d', ~~response.subscribers)
         .replace('%$2s', response.segment)
       );
@@ -190,37 +190,37 @@ const bulk_actions = [
   },
   {
     name: 'removeFromAllLists',
-    label: 'Remove from all lists',
+    label: MailPoet.I18n.t('removeFromAllLists'),
     onSuccess: function(response) {
       MailPoet.Notice.success(
-        '%$1d subscribers were removed from all lists.'
+        MailPoet.I18n.t('multipleSubscribersRemovedFromAllLists')
         .replace('%$1d', ~~response)
       );
     }
   },
   {
     name: 'confirmUnconfirmed',
-    label: 'Confirm unconfirmed',
+    label: MailPoet.I18n.t('confirmUnconfirmed'),
     onSuccess: function(response) {
       MailPoet.Notice.success(
-        '%$1d subscribers have been confirmed.'
+        MailPoet.I18n.t('multipleSubscribersConfirmed')
         .replace('%$1d', ~~response)
       );
     }
   },
   {
     name: 'sendConfirmationEmail',
-    label: 'Resend confirmation email',
+    label: MailPoet.I18n.t('resendConfirmationEmail'),
     onSuccess: function(response) {
       MailPoet.Notice.success(
-        '%$1d confirmation emails have been sent.'
+        MailPoet.I18n.t('multipleConfirmationEmailsSent')
         .replace('%$1d', ~~response)
       );
     }
   },
   {
     name: 'trash',
-    label: 'Trash',
+    label: MailPoet.I18n.t('trash'),
     onSuccess: messages.onTrash
   }
 ];
@@ -228,10 +228,10 @@ const bulk_actions = [
 const item_actions = [
   {
     name: 'edit',
-    label: 'Edit',
+    label: MailPoet.I18n.t('edit'),
     link: function(item) {
       return (
-        <Link to={ `/edit/${item.id}` }>Edit</Link>
+        <Link to={ `/edit/${item.id}` }>{MailPoet.I18n.t('edit')}</Link>
       );
     }
   },
@@ -262,15 +262,15 @@ const SubscriberList = React.createClass({
 
     switch(subscriber.status) {
       case 'subscribed':
-        status = 'Subscribed';
+        status = MailPoet.I18n.t('subscribed');
       break;
 
       case 'unconfirmed':
-        status = 'Unconfirmed';
+        status = MailPoet.I18n.t('unconfirmed');
       break;
 
       case 'unsubscribed':
-        status = 'Unsubscribed';
+        status = MailPoet.I18n.t('unsubscribed');
       break;
     }
 
@@ -302,7 +302,7 @@ const SubscriberList = React.createClass({
           </span>
           <span
             className="mailpoet_segments_unsubscribed"
-            title="Lists to which the subscriber was subscribed."
+            title={MailPoet.I18n.t('listsToWhichSubscriberWasSubscribed')}
           >
             { unsubscribed_segments.join(', ') }
           </span>
@@ -334,16 +334,16 @@ const SubscriberList = React.createClass({
           </p>
           { actions }
         </td>
-        <td className="column" data-colname="Status">
+        <td className="column" data-colname={MailPoet.I18n.t('status')}>
           { status }
         </td>
-        <td className="column" data-colname="Lists">
+        <td className="column" data-colname={MailPoet.I18n.t('lists')}>
           { segments }
         </td>
-        <td className="column-date" data-colname="Subscribed on">
+        <td className="column-date" data-colname={MailPoet.I18n.t('subscribedOn')}>
           <abbr>{ MailPoet.Date.full(subscriber.created_at) }</abbr>
         </td>
-        <td className="column-date" data-colname="Last modified on">
+        <td className="column-date" data-colname={MailPoet.I18n.t('lastModifiedOn')}>
           <abbr>{ MailPoet.Date.full(subscriber.updated_at) }</abbr>
         </td>
       </div>
@@ -356,9 +356,9 @@ const SubscriberList = React.createClass({
     return (
       <div>
         <h2 className="title">
-          Subscribers <Link className="add-new-h2" to="/new">New</Link>
+          {MailPoet.I18n.t('pageTitle')} <Link className="add-new-h2" to="/new">{MailPoet.I18n.t('new')}</Link>
-          <a className="add-new-h2" href="?page=mailpoet-import#step1">Import</a>
+          <a className="add-new-h2" href="?page=mailpoet-import#step1">{MailPoet.I18n.t('import')}</a>
-          <a id="mailpoet_export_button" className="add-new-h2" href="?page=mailpoet-export">Export</a>
+          <a id="mailpoet_export_button" className="add-new-h2" href="?page=mailpoet-export">{MailPoet.I18n.t('export')}</a>
         </h2>
 
         <Listing
@@ -378,4 +378,4 @@ const SubscriberList = React.createClass({
   }
 });
 
-module.exports = SubscriberList;
+module.exports = SubscriberList;

codeception.yml

@@ -9,6 +9,7 @@ settings:
     bootstrap: _bootstrap.php
     colors: true
     memory_limit: 1024M
+    log: true
 extensions:
     enabled:
         - Codeception\Extension\RunFailed

composer.json

@@ -9,7 +9,7 @@
     "j4mie/paris": "1.5.4",
     "swiftmailer/swiftmailer": "^5.4",
     "phpseclib/phpseclib": "*",
-    "mtdowling/cron-expression": "^1.0",
+    "mtdowling/cron-expression": "^1.1",
     "nesbot/carbon": "^1.21",
     "soundasleep/html2text": "^0.3.0"
   },

composer.lock

@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "db2edea5fb720fcb8013ac470e924c19",
+    "hash": "2bed8395d84740d7c0ae644a6c6216fd",
-    "content-hash": "85119d1ccd5193b6b08fda305a2427e7",
+    "content-hash": "7b66e221814f3d5839ed4faabd2f50ad",
     "packages": [
         {
             "name": "cerdic/css-tidy",
@@ -401,16 +401,16 @@
         },
         {
             "name": "soundasleep/html2text",
-            "version": "0.3.0",
+            "version": "0.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/soundasleep/html2text.git",
-                "reference": "55be17ddbb7234650722f66816ba2b10f66e565f"
+                "reference": "2a5fd94bf58b653a5a9d777ac6a5593f82d087db"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/soundasleep/html2text/zipball/55be17ddbb7234650722f66816ba2b10f66e565f",
+                "url": "https://api.github.com/repos/soundasleep/html2text/zipball/2a5fd94bf58b653a5a9d777ac6a5593f82d087db",
-                "reference": "55be17ddbb7234650722f66816ba2b10f66e565f",
+                "reference": "2a5fd94bf58b653a5a9d777ac6a5593f82d087db",
                 "shasum": ""
             },
             "require": {
@@ -447,7 +447,7 @@
                 "php",
                 "text"
             ],
-            "time": "2015-12-18 02:30:26"
+            "time": "2016-02-25 00:00:36"
         },
         {
             "name": "sunra/php-simple-html-dom-parser",
@@ -547,7 +547,7 @@
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.1.0",
+            "version": "v1.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
@@ -606,16 +606,16 @@
         },
         {
             "name": "symfony/translation",
-            "version": "v2.8.2",
+            "version": "v2.8.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "bc0b666903944858f4ffec01c4e50c63e5c276c0"
+                "reference": "b7b4ebadd2b5e614ff7d2d6fc63e0ed0578909c7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/bc0b666903944858f4ffec01c4e50c63e5c276c0",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/b7b4ebadd2b5e614ff7d2d6fc63e0ed0578909c7",
-                "reference": "bc0b666903944858f4ffec01c4e50c63e5c276c0",
+                "reference": "b7b4ebadd2b5e614ff7d2d6fc63e0ed0578909c7",
                 "shasum": ""
             },
             "require": {
@@ -666,7 +666,7 @@
             ],
             "description": "Symfony Translation Component",
             "homepage": "https://symfony.com",
-            "time": "2016-01-03 15:33:41"
+            "time": "2016-02-02 09:49:18"
         },
         {
             "name": "tburry/pquery",
@@ -785,41 +785,42 @@
     "packages-dev": [
         {
             "name": "codeception/codeception",
-            "version": "2.1.6",
+            "version": "2.1.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/Codeception.git",
-                "reference": "b199941f5e59d1e7fd32d78296c8ab98db873d89"
+                "reference": "65971b0dee4972710365b6102154cd412a9bf7b1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/b199941f5e59d1e7fd32d78296c8ab98db873d89",
+                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/65971b0dee4972710365b6102154cd412a9bf7b1",
-                "reference": "b199941f5e59d1e7fd32d78296c8ab98db873d89",
+                "reference": "65971b0dee4972710365b6102154cd412a9bf7b1",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
                 "ext-mbstring": "*",
-                "facebook/webdriver": ">=1.0.1",
+                "facebook/webdriver": ">=1.0.1 <2.0",
                 "guzzlehttp/guzzle": ">=4.1.4 <7.0",
                 "guzzlehttp/psr7": "~1.0",
-                "php": ">=5.4.0",
+                "php": ">=5.4.0 <8.0",
-                "phpunit/phpunit": "~4.8.0",
+                "phpunit/php-code-coverage": ">=2.1.3",
-                "symfony/browser-kit": ">=2.4|<3.1",
+                "phpunit/phpunit": ">4.8.20 <6.0",
-                "symfony/console": ">=2.4|<3.1",
+                "symfony/browser-kit": ">=2.5 <3.1",
-                "symfony/css-selector": ">=2.4|<3.1",
+                "symfony/console": ">=2.5 <3.1",
-                "symfony/dom-crawler": ">=2.4|<3.1",
+                "symfony/css-selector": ">=2.5 <3.1",
-                "symfony/event-dispatcher": ">=2.4|<3.1",
+                "symfony/dom-crawler": ">=2.5 <3.1",
-                "symfony/finder": ">=2.4|<3.1",
+                "symfony/event-dispatcher": ">=2.5 <3.1",
-                "symfony/yaml": ">=2.4|<3.1"
+                "symfony/finder": ">=2.5 <3.1",
+                "symfony/yaml": ">=2.5 <3.1"
             },
             "require-dev": {
                 "codeception/specify": "~0.3",
-                "facebook/php-sdk-v4": "~4.0",
+                "facebook/php-sdk-v4": "~5.0",
                 "flow/jsonpath": "~0.2",
                 "monolog/monolog": "~1.8",
                 "pda/pheanstalk": "~2.0",
-                "videlalvaro/php-amqplib": "~2.4"
+                "php-amqplib/php-amqplib": "~2.4"
             },
             "suggest": {
                 "codeception/phpbuiltinserver": "Extension to start and stop PHP built-in web server for your tests",
@@ -861,7 +862,7 @@
                 "functional testing",
                 "unit testing"
             ],
-            "time": "2016-02-09 22:27:48"
+            "time": "2016-03-12 01:15:25"
         },
         {
             "name": "codeception/verify",
@@ -898,33 +899,36 @@
         },
         {
             "name": "codegyre/robo",
-            "version": "0.6.0",
+            "version": "0.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codegyre/Robo.git",
-                "reference": "d18185f0494c854d36aa5ee0ad931ee23bbef552"
+                "reference": "1f4e0621fdc37521e2eaca67f33d1c4e240dc7d8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codegyre/Robo/zipball/d18185f0494c854d36aa5ee0ad931ee23bbef552",
+                "url": "https://api.github.com/repos/Codegyre/Robo/zipball/1f4e0621fdc37521e2eaca67f33d1c4e240dc7d8",
-                "reference": "d18185f0494c854d36aa5ee0ad931ee23bbef552",
+                "reference": "1f4e0621fdc37521e2eaca67f33d1c4e240dc7d8",
                 "shasum": ""
             },
             "require": {
-                "henrikbjorn/lurker": "1.0.*@dev",
+                "henrikbjorn/lurker": "~1.0",
                 "php": ">=5.4.0",
-                "symfony/console": "~2.5",
+                "symfony/console": "~2.5|~3.0",
-                "symfony/filesystem": "~2.5",
+                "symfony/filesystem": "~2.5|~3.0",
-                "symfony/finder": "~2.5",
+                "symfony/finder": "~2.5|~3.0",
-                "symfony/process": "~2.5"
+                "symfony/process": "~2.5|~3.0"
             },
             "require-dev": {
-                "codeception/aspect-mock": "0.5.*",
+                "codeception/aspect-mock": "0.5.4",
-                "codeception/base": "~2.1",
+                "codeception/base": "~2.1.5",
-                "codeception/codeception": "2.1",
                 "codeception/verify": "0.2.*",
                 "natxet/cssmin": "~3.0",
-                "patchwork/jsqueeze": "~1.0"
+                "patchwork/jsqueeze": "~1.0",
+                "pear/archive_tar": "~1.0"
+            },
+            "suggest": {
+                "pear/archive_tar": "Allows tar archives to be created and extracted in taskPack and taskExtract, respectively."
             },
             "bin": [
                 "robo"
@@ -946,7 +950,7 @@
                 }
             ],
             "description": "Modern task runner",
-            "time": "2015-10-30 11:29:52"
+            "time": "2016-02-25 19:28:51"
         },
         {
             "name": "doctrine/instantiator",
@@ -1109,16 +1113,16 @@
         },
         {
             "name": "guzzlehttp/promises",
-            "version": "1.0.3",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/promises.git",
-                "reference": "b1e1c0d55f8083c71eda2c28c12a228d708294ea"
+                "reference": "bb9024c526b22f3fe6ae55a561fd70653d470aa8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/b1e1c0d55f8083c71eda2c28c12a228d708294ea",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/bb9024c526b22f3fe6ae55a561fd70653d470aa8",
-                "reference": "b1e1c0d55f8083c71eda2c28c12a228d708294ea",
+                "reference": "bb9024c526b22f3fe6ae55a561fd70653d470aa8",
                 "shasum": ""
             },
             "require": {
@@ -1156,20 +1160,20 @@
             "keywords": [
                 "promise"
             ],
-            "time": "2015-10-15 22:28:00"
+            "time": "2016-03-08 01:15:46"
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "1.2.2",
+            "version": "1.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "f5d04bdd2881ac89abde1fb78cc234bce24327bb"
+                "reference": "2e89629ff057ebb49492ba08e6995d3a6a80021b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/f5d04bdd2881ac89abde1fb78cc234bce24327bb",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/2e89629ff057ebb49492ba08e6995d3a6a80021b",
-                "reference": "f5d04bdd2881ac89abde1fb78cc234bce24327bb",
+                "reference": "2e89629ff057ebb49492ba08e6995d3a6a80021b",
                 "shasum": ""
             },
             "require": {
@@ -1214,20 +1218,20 @@
                 "stream",
                 "uri"
             ],
-            "time": "2016-01-23 01:23:02"
+            "time": "2016-02-18 21:54:00"
         },
         {
             "name": "henrikbjorn/lurker",
-            "version": "1.0.0",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/flint/Lurker.git",
-                "reference": "a020d45b3bc37810aeafe27343c51af8a74c9419"
+                "reference": "ab45f9cefe600065cc3137a238217598d3a1d062"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/flint/Lurker/zipball/a020d45b3bc37810aeafe27343c51af8a74c9419",
+                "url": "https://api.github.com/repos/flint/Lurker/zipball/ab45f9cefe600065cc3137a238217598d3a1d062",
-                "reference": "a020d45b3bc37810aeafe27343c51af8a74c9419",
+                "reference": "ab45f9cefe600065cc3137a238217598d3a1d062",
                 "shasum": ""
             },
             "require": {
@@ -1255,18 +1259,16 @@
             ],
             "authors": [
                 {
-                    "name": "Henrik Bjornskov",
+                    "name": "Yaroslav Kiliba",
-                    "email": "henrik@bjrnskov.dk",
+                    "email": "om.dattaya@gmail.com"
-                    "homepage": "http://henrik.bjrnskov.dk"
                 },
                 {
                     "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
+                    "email": "ever.zet@gmail.com"
-                    "homepage": "http://everzet.com"
                 },
                 {
-                    "name": "Yaroslav Kiliba",
+                    "name": "Henrik Bjrnskov",
-                    "email": "om.dattaya@gmail.com"
+                    "email": "henrik@bjrnskov.dk"
                 }
             ],
             "description": "Resource Watcher.",
@@ -1275,7 +1277,7 @@
                 "resource",
                 "watching"
             ],
-            "time": "2013-05-24 06:47:29"
+            "time": "2015-10-27 09:19:19"
         },
         {
             "name": "phpdocumentor/reflection-docblock",
@@ -1630,16 +1632,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "4.8.23",
+            "version": "4.8.24",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "6e351261f9cd33daf205a131a1ba61c6d33bd483"
+                "reference": "a1066c562c52900a142a0e2bbf0582994671385e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/6e351261f9cd33daf205a131a1ba61c6d33bd483",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a1066c562c52900a142a0e2bbf0582994671385e",
-                "reference": "6e351261f9cd33daf205a131a1ba61c6d33bd483",
+                "reference": "a1066c562c52900a142a0e2bbf0582994671385e",
                 "shasum": ""
             },
             "require": {
@@ -1698,7 +1700,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2016-02-11 14:56:33"
+            "time": "2016-03-14 06:16:08"
         },
         {
             "name": "phpunit/phpunit-mock-objects",
@@ -1974,16 +1976,16 @@
         },
         {
             "name": "sebastian/environment",
-            "version": "1.3.3",
+            "version": "1.3.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "6e7133793a8e5a5714a551a8324337374be209df"
+                "reference": "dc7a29032cf72b54f36dac15a1ca5b3a1b6029bf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6e7133793a8e5a5714a551a8324337374be209df",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/dc7a29032cf72b54f36dac15a1ca5b3a1b6029bf",
-                "reference": "6e7133793a8e5a5714a551a8324337374be209df",
+                "reference": "dc7a29032cf72b54f36dac15a1ca5b3a1b6029bf",
                 "shasum": ""
             },
             "require": {
@@ -2020,7 +2022,7 @@
                 "environment",
                 "hhvm"
             ],
-            "time": "2015-12-02 08:37:27"
+            "time": "2016-02-26 18:40:46"
         },
         {
             "name": "sebastian/exporter",
@@ -2229,7 +2231,7 @@
         },
         {
             "name": "symfony/browser-kit",
-            "version": "v3.0.2",
+            "version": "v3.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/browser-kit.git",
@@ -2286,22 +2288,25 @@
         },
         {
             "name": "symfony/config",
-            "version": "v2.8.2",
+            "version": "v2.8.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/config.git",
-                "reference": "41ee6c70758f40fa1dbf90d019ae0a66c4a09e74"
+                "reference": "0f8f94e6a32b5c480024eed5fa5cbd2790d0ad19"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/41ee6c70758f40fa1dbf90d019ae0a66c4a09e74",
+                "url": "https://api.github.com/repos/symfony/config/zipball/0f8f94e6a32b5c480024eed5fa5cbd2790d0ad19",
-                "reference": "41ee6c70758f40fa1dbf90d019ae0a66c4a09e74",
+                "reference": "0f8f94e6a32b5c480024eed5fa5cbd2790d0ad19",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.9",
                 "symfony/filesystem": "~2.3|~3.0.0"
             },
+            "suggest": {
+                "symfony/yaml": "To use the yaml reference dumper"
+            },
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -2332,30 +2337,30 @@
             ],
             "description": "Symfony Config Component",
             "homepage": "https://symfony.com",
-            "time": "2016-01-03 15:33:41"
+            "time": "2016-02-22 16:12:45"
         },
         {
             "name": "symfony/console",
-            "version": "v2.8.2",
+            "version": "v3.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "d0239fb42f98dd02e7d342f793c5d2cdee0c478d"
+                "reference": "2ed5e2706ce92313d120b8fe50d1063bcfd12e04"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/d0239fb42f98dd02e7d342f793c5d2cdee0c478d",
+                "url": "https://api.github.com/repos/symfony/console/zipball/2ed5e2706ce92313d120b8fe50d1063bcfd12e04",
-                "reference": "d0239fb42f98dd02e7d342f793c5d2cdee0c478d",
+                "reference": "2ed5e2706ce92313d120b8fe50d1063bcfd12e04",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.9",
+                "php": ">=5.5.9",
                 "symfony/polyfill-mbstring": "~1.0"
             },
             "require-dev": {
                 "psr/log": "~1.0",
-                "symfony/event-dispatcher": "~2.1|~3.0.0",
+                "symfony/event-dispatcher": "~2.8|~3.0",
-                "symfony/process": "~2.1|~3.0.0"
+                "symfony/process": "~2.8|~3.0"
             },
             "suggest": {
                 "psr/log": "For using the console logger",
@@ -2365,7 +2370,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.8-dev"
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
@@ -2392,11 +2397,11 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2016-01-14 08:33:16"
+            "time": "2016-02-28 16:24:34"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v3.0.2",
+            "version": "v3.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
@@ -2449,16 +2454,16 @@
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "v3.0.2",
+            "version": "v3.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "b693a9650aa004576b593ff2e91ae749dc90123d"
+                "reference": "981c8edb4538f88ba976ed44bdcaa683fce3d6c6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/b693a9650aa004576b593ff2e91ae749dc90123d",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/981c8edb4538f88ba976ed44bdcaa683fce3d6c6",
-                "reference": "b693a9650aa004576b593ff2e91ae749dc90123d",
+                "reference": "981c8edb4538f88ba976ed44bdcaa683fce3d6c6",
                 "shasum": ""
             },
             "require": {
@@ -2501,20 +2506,20 @@
             ],
             "description": "Symfony DomCrawler Component",
             "homepage": "https://symfony.com",
-            "time": "2016-01-25 09:56:57"
+            "time": "2016-02-28 16:24:34"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v2.8.2",
+            "version": "v2.8.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "ee278f7c851533e58ca307f66305ccb9188aceda"
+                "reference": "78c468665c9568c3faaa9c416a7134308f2d85c3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/ee278f7c851533e58ca307f66305ccb9188aceda",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/78c468665c9568c3faaa9c416a7134308f2d85c3",
-                "reference": "ee278f7c851533e58ca307f66305ccb9188aceda",
+                "reference": "78c468665c9568c3faaa9c416a7134308f2d85c3",
                 "shasum": ""
             },
             "require": {
@@ -2561,20 +2566,20 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
-            "time": "2016-01-13 10:28:07"
+            "time": "2016-01-27 05:14:19"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v2.8.2",
+            "version": "v2.8.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "637b64d0ee10f44ae98dbad651b1ecdf35a11e8c"
+                "reference": "65cb36b6539b1d446527d60457248f30d045464d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/637b64d0ee10f44ae98dbad651b1ecdf35a11e8c",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/65cb36b6539b1d446527d60457248f30d045464d",
-                "reference": "637b64d0ee10f44ae98dbad651b1ecdf35a11e8c",
+                "reference": "65cb36b6539b1d446527d60457248f30d045464d",
                 "shasum": ""
             },
             "require": {
@@ -2610,29 +2615,29 @@
             ],
             "description": "Symfony Filesystem Component",
             "homepage": "https://symfony.com",
-            "time": "2016-01-13 10:28:07"
+            "time": "2016-02-22 15:02:30"
         },
         {
             "name": "symfony/finder",
-            "version": "v2.8.2",
+            "version": "v3.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "c90fabdd97e431ee19b6383999cf35334dff27da"
+                "reference": "623bda0abd9aa29e529c8e9c08b3b84171914723"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/c90fabdd97e431ee19b6383999cf35334dff27da",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/623bda0abd9aa29e529c8e9c08b3b84171914723",
-                "reference": "c90fabdd97e431ee19b6383999cf35334dff27da",
+                "reference": "623bda0abd9aa29e529c8e9c08b3b84171914723",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.9"
+                "php": ">=5.5.9"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.8-dev"
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
@@ -2659,20 +2664,20 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "time": "2016-01-14 08:26:52"
+            "time": "2016-01-27 05:14:46"
         },
         {
             "name": "symfony/form",
-            "version": "v2.8.2",
+            "version": "v2.8.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/form.git",
-                "reference": "7fd5e4034cb8e215887136f5e176430bbf5ef085"
+                "reference": "25b71aec36879b4a84c2ea06603dbe7498b31f06"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/form/zipball/7fd5e4034cb8e215887136f5e176430bbf5ef085",
+                "url": "https://api.github.com/repos/symfony/form/zipball/25b71aec36879b4a84c2ea06603dbe7498b31f06",
-                "reference": "7fd5e4034cb8e215887136f5e176430bbf5ef085",
+                "reference": "25b71aec36879b4a84c2ea06603dbe7498b31f06",
                 "shasum": ""
             },
             "require": {
@@ -2733,20 +2738,20 @@
             ],
             "description": "Symfony Form Component",
             "homepage": "https://symfony.com",
-            "time": "2016-01-12 17:46:01"
+            "time": "2016-02-28 15:05:09"
         },
         {
             "name": "symfony/intl",
-            "version": "v3.0.2",
+            "version": "v3.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/intl.git",
-                "reference": "7fa23b8f2ddd96260f0154946b69eb0f2c2ce7bc"
+                "reference": "cafee6f65148dab9058cdb6de5631222aca820d0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/intl/zipball/7fa23b8f2ddd96260f0154946b69eb0f2c2ce7bc",
+                "url": "https://api.github.com/repos/symfony/intl/zipball/cafee6f65148dab9058cdb6de5631222aca820d0",
-                "reference": "7fa23b8f2ddd96260f0154946b69eb0f2c2ce7bc",
+                "reference": "cafee6f65148dab9058cdb6de5631222aca820d0",
                 "shasum": ""
             },
             "require": {
@@ -2808,20 +2813,20 @@
                 "l10n",
                 "localization"
             ],
-            "time": "2016-01-27 05:14:46"
+            "time": "2016-02-23 15:16:06"
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v2.8.2",
+            "version": "v2.8.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "b98ca04f85240531b9ea8a0f00a21f2ecfbdfa51"
+                "reference": "d1e6e9182d9e5af6367bf85175e708f8b4a828c0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/b98ca04f85240531b9ea8a0f00a21f2ecfbdfa51",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/d1e6e9182d9e5af6367bf85175e708f8b4a828c0",
-                "reference": "b98ca04f85240531b9ea8a0f00a21f2ecfbdfa51",
+                "reference": "d1e6e9182d9e5af6367bf85175e708f8b4a828c0",
                 "shasum": ""
             },
             "require": {
@@ -2862,26 +2867,29 @@
                 "configuration",
                 "options"
             ],
-            "time": "2016-01-03 15:33:41"
+            "time": "2016-01-21 09:05:51"
         },
         {
             "name": "symfony/polyfill-intl-icu",
-            "version": "v1.1.0",
+            "version": "v1.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-icu.git",
-                "reference": "66b0bb4abda229bc073eff6bbc8f2685bdaac165"
+                "reference": "8328069d9f5322f0e7b3c3518485acfdc94c3942"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/66b0bb4abda229bc073eff6bbc8f2685bdaac165",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/8328069d9f5322f0e7b3c3518485acfdc94c3942",
-                "reference": "66b0bb4abda229bc073eff6bbc8f2685bdaac165",
+                "reference": "8328069d9f5322f0e7b3c3518485acfdc94c3942",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3",
                 "symfony/intl": "~2.3|~3.0"
             },
+            "suggest": {
+                "ext-intl": "For best performance"
+            },
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -2917,29 +2925,29 @@
                 "portable",
                 "shim"
             ],
-            "time": "2016-01-20 09:13:37"
+            "time": "2016-02-26 16:18:12"
         },
         {
             "name": "symfony/process",
-            "version": "v2.8.2",
+            "version": "v3.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "6f1979c3b0f4c22c77a8a8971afaa7dd07f082ac"
+                "reference": "dfecef47506179db2501430e732adbf3793099c8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/6f1979c3b0f4c22c77a8a8971afaa7dd07f082ac",
+                "url": "https://api.github.com/repos/symfony/process/zipball/dfecef47506179db2501430e732adbf3793099c8",
-                "reference": "6f1979c3b0f4c22c77a8a8971afaa7dd07f082ac",
+                "reference": "dfecef47506179db2501430e732adbf3793099c8",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.9"
+                "php": ">=5.5.9"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.8-dev"
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
@@ -2966,20 +2974,20 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
-            "time": "2016-01-06 09:59:23"
+            "time": "2016-02-02 13:44:19"
         },
         {
             "name": "symfony/property-access",
-            "version": "v3.0.2",
+            "version": "v3.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/property-access.git",
-                "reference": "95363dbabd606e404b6c75095669993bf7ddae4b"
+                "reference": "f138bcc0cdaf6a6aba99ecab20d235b394f46eba"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/property-access/zipball/95363dbabd606e404b6c75095669993bf7ddae4b",
+                "url": "https://api.github.com/repos/symfony/property-access/zipball/f138bcc0cdaf6a6aba99ecab20d235b394f46eba",
-                "reference": "95363dbabd606e404b6c75095669993bf7ddae4b",
+                "reference": "f138bcc0cdaf6a6aba99ecab20d235b394f46eba",
                 "shasum": ""
             },
             "require": {
@@ -3026,20 +3034,20 @@
                 "property path",
                 "reflection"
             ],
-            "time": "2016-01-03 15:35:16"
+            "time": "2016-02-13 09:23:44"
         },
         {
             "name": "symfony/routing",
-            "version": "v2.8.2",
+            "version": "v2.8.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "5451a8a1874fd4e6a4dd347ea611d86cd8441735"
+                "reference": "ae38e64bae52753c0f4a1a6583f5ba9bb2b742ab"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/5451a8a1874fd4e6a4dd347ea611d86cd8441735",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/ae38e64bae52753c0f4a1a6583f5ba9bb2b742ab",
-                "reference": "5451a8a1874fd4e6a4dd347ea611d86cd8441735",
+                "reference": "ae38e64bae52753c0f4a1a6583f5ba9bb2b742ab",
                 "shasum": ""
             },
             "require": {
@@ -3062,6 +3070,7 @@
                 "symfony/config": "For using the all-in-one router or any loader",
                 "symfony/dependency-injection": "For loading routes from a service",
                 "symfony/expression-language": "For using expression matching",
+                "symfony/http-foundation": "For using a Symfony Request object",
                 "symfony/yaml": "For using the YAML loader"
             },
             "type": "library",
@@ -3100,20 +3109,20 @@
                 "uri",
                 "url"
             ],
-            "time": "2016-01-11 16:43:36"
+            "time": "2016-02-04 13:53:00"
         },
         {
             "name": "symfony/twig-bridge",
-            "version": "v2.8.2",
+            "version": "v2.8.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/twig-bridge.git",
-                "reference": "e33b512de4b769a1c728cd6775e22668ae89fca9"
+                "reference": "ba898e4714734948dc00c4d776e1d6be165ff8c4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/e33b512de4b769a1c728cd6775e22668ae89fca9",
+                "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/ba898e4714734948dc00c4d776e1d6be165ff8c4",
-                "reference": "e33b512de4b769a1c728cd6775e22668ae89fca9",
+                "reference": "ba898e4714734948dc00c4d776e1d6be165ff8c4",
                 "shasum": ""
             },
             "require": {
@@ -3181,20 +3190,20 @@
             ],
             "description": "Symfony Twig Bridge",
             "homepage": "https://symfony.com",
-            "time": "2016-01-12 17:46:01"
+            "time": "2016-02-22 15:02:30"
         },
         {
             "name": "symfony/yaml",
-            "version": "v3.0.2",
+            "version": "v3.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "3cf0709d7fe936e97bee9e954382e449003f1d9a"
+                "reference": "b5ba64cd67ecd6887f63868fa781ca094bd1377c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/3cf0709d7fe936e97bee9e954382e449003f1d9a",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/b5ba64cd67ecd6887f63868fa781ca094bd1377c",
-                "reference": "3cf0709d7fe936e97bee9e954382e449003f1d9a",
+                "reference": "b5ba64cd67ecd6887f63868fa781ca094bd1377c",
                 "shasum": ""
             },
             "require": {
@@ -3230,7 +3239,7 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "time": "2016-02-02 13:44:19"
+            "time": "2016-02-23 15:16:06"
         },
         {
             "name": "twig/extensions",

lib/Config/Env.php

@@ -13,7 +13,7 @@ class Env {
   static $assets_path;
   static $assets_url;
   static $temp_path;
-  static $temp_URL;
+  static $temp_url;
   static $languages_path;
   static $lib_path;
   static $plugin_prefix;
@@ -26,6 +26,7 @@ class Env {
   static $db_username;
   static $db_password;
   static $db_charset;
+  static $db_timezone_offset;
 
   static function init($file, $version) {
     global $wpdb;
@@ -38,7 +39,7 @@ class Env {
     self::$assets_url = plugins_url('/assets', $file);
     $wp_upload_dir = wp_upload_dir();
     self::$temp_path = $wp_upload_dir['path'];
-    self::$temp_URL = $wp_upload_dir['url'];
+    self::$temp_url = $wp_upload_dir['url'];
     self::$languages_path = self::$path . '/lang';
     self::$lib_path = self::$path . '/lib';
     self::$plugin_prefix = 'mailpoet_';
@@ -58,6 +59,7 @@ class Env {
     self::$db_password = DB_PASSWORD;
     self::$db_charset = $wpdb->get_charset_collate();
     self::$db_source_name = self::dbSourceName(self::$db_host, self::$db_socket, self::$db_port);
+    self::$db_timezone_offset = self::getDbTimezoneOffset();
   }
 
   private static function dbSourceName($host, $socket, $port) {
@@ -73,4 +75,13 @@ class Env {
     );
     return implode('', $source_name);
   }
+
+  private static function getDbTimezoneOffset() {
+    $mins = get_option('gmt_offset') * 60;
+    $sgn = ($mins < 0 ? -1 : 1);
+    $mins = abs($mins);
+    $hrs = floor($mins / 60);
+    $mins -= $hrs * 60;
+    return sprintf('%+d:%02d', $hrs * $sgn, $mins);
+  }
 }

lib/Config/Hooks.php

@@ -13,7 +13,6 @@ class Hooks {
     $this->setupWPUsers();
     $this->setupImageSize();
     $this->setupListing();
-    $this->setupCronWorkers();
   }
 
   function setupSubscribe() {
@@ -98,7 +97,7 @@ class Hooks {
     add_action(
       'profile_update',
       '\MailPoet\Segments\WP::synchronizeUser',
-      1
+      1,2
     );
     add_action(
       'delete_user',
@@ -147,19 +146,4 @@ class Hooks {
       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

@@ -65,7 +65,8 @@ class Initializer {
 
     \ORM::configure('driver_options', array(
       \PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8',
-      \PDO::MYSQL_ATTR_INIT_COMMAND => 'SET TIME_ZONE = "+00:00"'
+      \PDO::MYSQL_ATTR_INIT_COMMAND =>
+        'SET TIME_ZONE = "' . Env::$db_timezone_offset. '"'
     ));
 
     $subscribers = Env::$db_prefix . 'subscribers';
@@ -130,7 +131,7 @@ class Initializer {
   }
 
   function setupWidget() {
-    $widget = new Widget();
+    $widget = new Widget($this->renderer);
     $widget->init();
   }
 

lib/Config/Menu.php

@@ -367,6 +367,8 @@ class Menu {
     $data['segments'] = Segment::findArray();
     $data['settings'] = Setting::getAll();
     $data['roles'] = $wp_roles->get_names();
+    $data['roles']['mailpoet_all'] = __('In any WordPress role');
+
     echo $this->renderer->render('newsletters.html', $data);
   }
 
@@ -385,7 +387,7 @@ class Menu {
     wp_enqueue_media();
     wp_enqueue_script('tinymce-wplink', includes_url('js/tinymce/plugins/wplink/plugin.js'));
     wp_enqueue_style('editor', includes_url('css/editor.css'));
-    echo $this->renderer->render('newsletter/form.html', $data);
+    echo $this->renderer->render('newsletter/editor.html', $data);
   }
 
   function import() {

lib/Config/Migrator.php

@@ -214,6 +214,9 @@ class Migrator {
     $attributes = array(
       'id mediumint(9) NOT NULL AUTO_INCREMENT,',
       'newsletter_id mediumint(9) NOT NULL,',
+      'newsletter_rendered_body longtext,',
+      'newsletter_rendered_body_hash varchar(250) NULL DEFAULT NULL,',
+      'newsletter_rendered_subject varchar(250) NULL DEFAULT NULL,',
       'subscribers longtext,',
       'status varchar(12) NULL DEFAULT NULL,',
       'priority mediumint(9) NOT NULL DEFAULT 0,',
@@ -221,6 +224,7 @@ class Migrator {
       'count_processed mediumint(9) NOT NULL DEFAULT 0,',
       'count_to_process mediumint(9) NOT NULL DEFAULT 0,',
       'count_failed mediumint(9) NOT NULL DEFAULT 0,',
+      'scheduled_at TIMESTAMP NOT NULL DEFAULT 0,',
       'processed_at TIMESTAMP NOT NULL DEFAULT 0,',
       'created_at TIMESTAMP NOT NULL DEFAULT 0,',
       'updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,',
@@ -267,4 +271,4 @@ class Migrator {
 
     return implode("\n", $sql);
   }
-}
+}

lib/Config/Populator.php

@@ -70,35 +70,36 @@ class Populator {
 
     if($page === null) {
       $mailpoet_page_id = Pages::createMailPoetPage();
-      Setting::setValue('subscription.page', $mailpoet_page_id);
+    } else {
+      $mailpoet_page_id = (int)$page->ID;
     }
+
+    Setting::setValue('subscription.unsubscribe_page', $mailpoet_page_id);
+    Setting::setValue('subscription.manage_page', $mailpoet_page_id);
+    Setting::setValue('subscription.confirmation_page', $mailpoet_page_id);
   }
 
   private function createDefaultSettings() {
     $current_user = wp_get_current_user();
 
-    // user name
+    // default sender info based on current user
-    $user_name = '';
+    $sender = array(
-    if($current_user->user_firstname) {
+      'name' => $current_user->display_name,
-      $user_name = $current_user->user_firstname;
+      'address' => $current_user->user_email
-    }
+    );
-    if($current_user->user_lastname) {
-      if($user_name) {
-        $user_name .= ' '.$current_user->user_lastname;
-      }
-    }
-    if(!$user_name) {
-      $user_name = $current_user->display_name;
-    }
 
     // default from name & address
-    Setting::setValue('sender', array(
+    Setting::setValue('sender', $sender);
-      'name' => $user_name,
-      'address' => $current_user->user_email
-    ));
 
     // enable signup confirmation by default
-    Setting::setValue('signup_confirmation.enabled', true);
+    Setting::setValue('signup_confirmation', array(
+      'enabled' => true,
+      'from' => array(
+        'name' => get_option('blogname'),
+        'address' => get_option('admin_email')
+      ),
+      'reply_to' => $sender
+    ));
   }
 
   private function createDefaultSegments() {
@@ -175,6 +176,14 @@ class Populator {
         'name' => 'nthWeekDay',
         'newsletter_type' => 'notification',
       ),
+      array(
+        'name' => 'schedule',
+        'newsletter_type' => 'notification',
+      ),
+      array(
+        'name' => 'segments',
+        'newsletter_type' => 'notification',
+      )
     );
   }
 

lib/Config/PopulatorData/Templates/BlankTemplate.php

@@ -142,7 +142,7 @@ class BlankTemplate {
                 "blocks" => array(
                   array(
                     "type" => "footer",
-                    "text" => "<a href=\"[unsubscribeUrl]\">Unsubscribe</a> | <a href=\"[manageSubscriptionUrl]\">Manage subscription</a><br /><b>Add your postal address here!</b>",
+                    "text" => "<a href=\"[subscription:unsubscribe_url]\">Unsubscribe</a> | <a href=\"[subscription:manage_url]\">Manage subscription</a><br /><b>Add your postal address here!</b>",
                     "styles" => array(
                       "block" => array(
                         "backgroundColor" => "transparent"

lib/Config/PopulatorData/Templates/FranksRoastHouseTemplate.php

@@ -46,7 +46,7 @@ class FranksRoastHouseTemplate {
                 "blocks" => array(
                   array(
                     "type" => "header",
-                    "text" => __("Display problems?&nbsp;<a href=\"[viewInBrowserUrl]\">View it in your browser</a>"),
+                    "text" => __("Display problems?&nbsp;<a href=\"[newsletter:view_in_browser_url]\">View it in your browser</a>"),
                     "styles" => array(
                       "block" => array(
                         "backgroundColor" => "#ccc6c6"
@@ -280,7 +280,7 @@ class FranksRoastHouseTemplate {
                 "blocks" => array(
                   array(
                     "type" => "footer",
-                    "text" => __("<p><a href=\"[unsubscribeUrl]\">Unsubscribe</a> | <a href=\"[manageSubscriptionUrl]\">Manage subscription</a><br />12345 MailPoet Drive, EmailVille, 76543</p>"),
+                    "text" => __("<p><a href=\"[subscription:unsubscribe_url]\">Unsubscribe</a> | <a href=\"[subscription:manage_url]\">Manage subscription</a><br />12345 MailPoet Drive, EmailVille, 76543</p>"),
                     "styles" => array(
                       "block" => array(
                         "backgroundColor" => "#a9a7a7"

lib/Config/PopulatorData/Templates/PostNotificationsBlankTemplate.php

@@ -242,7 +242,7 @@ class PostNotificationsBlankTemplate {
                 "blocks" => array(
                   array(
                     "type" => "footer",
-                    "text" => __("<a href=\"[unsubscribeUrl]\">Unsubscribe</a> | <a href=\"[manageSubscriptionUrl]\">Manage subscription</a><br /><b>Add your postal address here!</b>"),
+                    "text" => __("<a href=\"[subscription:unsubscribe_url]\">Unsubscribe</a> | <a href=\"[subscription:manage_url]\">Manage subscription</a><br /><b>Add your postal address here!</b>"),
                     "styles" => array(
                       "block" => array(
                         "backgroundColor" => "transparent"

lib/Config/PopulatorData/Templates/WelcomeTemplate.php

@@ -46,7 +46,7 @@ class WelcomeTemplate {
                 "blocks" => array(
                   array(
                     "type" => "header",
-                    "text" => __("Display problems?&nbsp;<a href=\"[viewInBrowserUrl]\">View it in your browser</a>"),
+                    "text" => __("Display problems?&nbsp;<a href=\"[newsletter:view_in_browser_url]\">View it in your browser</a>"),
                     "styles" => array(
                       "block" => array(
                         "backgroundColor" => "transparent"
@@ -224,7 +224,7 @@ class WelcomeTemplate {
                 "blocks" => array(
                   array(
                     "type" => "footer",
-                    "text" => __("<a href=\"[unsubscribeUrl]\">Unsubscribe</a> | <a href=\"[manageSubscriptionUrl]\">Manage subscription</a><br /><b>Add your postal address here!</b>"),
+                    "text" => __("<a href=\"[subscription:unsubscribe_url]\">Unsubscribe</a> | <a href=\"[subscription:manage_url]\">Manage subscription</a><br /><b>Add your postal address here!</b>"),
                     "styles" => array(
                       "block" => array(
                         "backgroundColor" => "transparent"

lib/Config/PublicAPI.php

@@ -8,38 +8,38 @@ if(!defined('ABSPATH')) exit;
 
 class PublicAPI {
   public $api;
-  public $section;
+  public $endpoint;
   public $action;
-  public $request_payload;
+  public $data;
 
   function __construct() {
-    # http://example.com/?mailpoet-api&section=&action=&request_payload=
+    # http://example.com/?mailpoet&endpoint=&action=&data=
-    $this->api = isset($_GET['mailpoet-api']) ? true : false;
+    $this->api = isset($_GET['mailpoet']) ? true : false;
-    $this->section = isset($_GET['section']) ? $_GET['section'] : false;
+    $this->endpoint = isset($_GET['endpoint']) ?
+      Helpers::underscoreToCamelCase($_GET['endpoint']) :
+      false;
     $this->action = isset($_GET['action']) ?
       Helpers::underscoreToCamelCase($_GET['action']) :
       false;
-    $this->request_payload = isset($_GET['request_payload']) ?
+    $this->data = isset($_GET['data']) ? $_GET['data'] : false;
-      unserialize(base64_decode($_GET['request_payload'])) :
-      false;
   }
 
   function init() {
-    if(!$this->api && !$this->section) return;
+    if(!$this->api && !$this->endpoint) return;
-    $this->_checkAndCallMethod($this, $this->section, $terminate = true);
+    $this->_checkAndCallMethod($this, $this->endpoint, $terminate_request = true);
   }
 
   function queue() {
     try {
-      $queue = new Daemon($this->request_payload);
+      $queue = new Daemon($this->data);
       $this->_checkAndCallMethod($queue, $this->action);
     } catch(\Exception $e) {
     }
   }
 
-  private function _checkAndCallMethod($class, $method, $terminate = false) {
+  private function _checkAndCallMethod($class, $method, $terminate_request = false) {
     if(!method_exists($class, $method)) {
-      if(!$terminate) return;
+      if(!$terminate_request) return;
       header('HTTP/1.0 404 Not Found');
       exit;
     }

lib/Config/Renderer.php

@@ -59,7 +59,7 @@ class Renderer {
   }
 
   function detectCache() {
-    $cache_path = Env::$views_path . '/cache';
+    $cache_path = Env::$temp_path . '/cache';
     if(WP_DEBUG === false) {
       return $cache_path;
     }

lib/Config/Widget.php

@@ -1,11 +1,17 @@
 <?php
 namespace MailPoet\Config;
 use \MailPoet\Util\Security;
+use \MailPoet\Models\Form;
 
 if(!defined('ABSPATH')) exit;
 
 class Widget {
-  function __construct() {
+  private $renderer = null;
+
+  function __construct($renderer = null) {
+    if($renderer !== null) {
+      $this->renderer = $renderer;
+    }
   }
 
   function init() {
@@ -13,11 +19,67 @@ class Widget {
 
     if(!is_admin()) {
       $this->setupDependencies();
+      $this->setupIframe();
     } else {
       $this->setupAdminDependencies();
     }
   }
 
+  function setupIframe() {
+    $form_id = (isset($_GET['mailpoet_form_iframe']) ? (int)$_GET['mailpoet_form_iframe'] : 0);
+    if($form_id > 0) {
+      $form = Form::findOne($form_id);
+
+      if($form !== false) {
+        $form_widget = new \MailPoet\Form\Widget();
+        $form_html = $form_widget->widget(array(
+          'form' => $form_id,
+          'form_type' => 'iframe'
+        ));
+
+        // capture javascripts
+        ob_start();
+        wp_print_scripts('jquery');
+        wp_print_scripts('mailpoet_vendor');
+        wp_print_scripts('mailpoet_public');
+        $scripts = ob_get_contents();
+        ob_end_clean();
+
+        // language attributes
+        $language_attributes = array();
+        $is_rtl = (bool)(function_exists('is_rtl') && is_rtl());
+
+        if($is_rtl) {
+          $language_attributes[] = 'dir="rtl"';
+        }
+
+        if($lang = get_bloginfo('language')) {
+          if(get_option('html_type') === 'text/html') {
+            $language_attributes[] = "lang=\"$lang\"";
+          }
+        }
+
+        $language_attributes = apply_filters(
+          'language_attributes', implode(' ', $language_attributes)
+        );
+
+        $data = array(
+          'language_attributes' => $language_attributes,
+          'scripts' => $scripts,
+          'form' => $form_html,
+          'mailpoet_form' => array(
+            'ajax_url' => admin_url('admin-ajax.php', 'absolute'),
+            'is_rtl' => $is_rtl,
+            'token' => Security::generateToken()
+          )
+        );
+
+        echo $this->renderer->render('form/iframe.html', $data);
+      }
+      exit();
+    }
+  }
+
   function registerWidget() {
     register_widget('\MailPoet\Form\Widget');
   }

lib/Cron/CronHelper.php

@@ -38,9 +38,9 @@ class CronHelper {
   }
 
   static function accessDaemon($token, $timeout = self::daemon_request_timeout) {
-    $payload = serialize(array('token' => $token));
+    $data = serialize(array('token' => $token));
-    $url = '/?mailpoet-api&section=queue&action=run&request_payload=' .
+    $url = '/?mailpoet&endpoint=queue&action=run&data=' .
-      base64_encode($payload);
+      base64_encode($data);
     $args = array(
       'timeout' => $timeout,
       'user-agent' => 'MailPoet (www.mailpoet.com) Cron'

lib/Cron/Daemon.php

@@ -3,7 +3,6 @@ namespace MailPoet\Cron;
 
 use MailPoet\Cron\Workers\Scheduler;
 use MailPoet\Cron\Workers\SendingQueue;
-use MailPoet\Models\Newsletter;
 
 require_once(ABSPATH . 'wp-includes/pluggable.php');
 
@@ -11,17 +10,18 @@ if(!defined('ABSPATH')) exit;
 
 class Daemon {
   public $daemon;
-  public $request_payload;
+  public $data;
   public $refreshed_token;
   const daemon_request_timeout = 5;
   private $timer;
 
-  function __construct($request_payload = array()) {
+  function __construct($data) {
+    if (!$data) $this->abortWithError(__('Invalid or missing cron data.'));
     set_time_limit(0);
     ignore_user_abort();
     $this->daemon = CronHelper::getDaemon();
     $this->token = CronHelper::createToken();
-    $this->request_payload = $request_payload;
+    $this->data = unserialize(base64_decode($data));
     $this->timer = microtime(true);
   }
 
@@ -30,14 +30,17 @@ class Daemon {
     if(!$daemon) {
       $this->abortWithError(__('Daemon does not exist.'));
     }
-    if(!isset($this->request_payload['token']) ||
+    if(!isset($this->data['token']) ||
-      $this->request_payload['token'] !== $daemon['token']
+      $this->data['token'] !== $daemon['token']
     ) {
       $this->abortWithError(__('Invalid or missing token.'));
     }
     $this->abortIfStopped($daemon);
     try {
-      do_action('mailpoet_cron_worker', $this->timer);
+      $scheduler = new Scheduler();
+      $scheduler->process($this->timer);
+      $queue = new SendingQueue();
+      $queue->process($this->timer);
     } catch(\Exception $e) {
     }
     $elapsed_time = microtime(true) - $this->timer;
@@ -47,7 +50,7 @@ class Daemon {
     // 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']) {
+    if(!$daemon || $daemon['token'] !== $this->data['token']) {
       exit;
     }
     $daemon['counter']++;

lib/Cron/Workers/Scheduler.php

@@ -1,9 +1,17 @@
 <?php
 namespace MailPoet\Cron\Workers;
 
+use Carbon\Carbon;
+use Cron\CronExpression as Cron;
 use MailPoet\Cron\CronHelper;
-use MailPoet\Models\Setting;
+use MailPoet\Models\Newsletter;
-use MailPoet\Util\Security;
+use MailPoet\Models\SendingQueue;
+use MailPoet\Models\Subscriber;
+use MailPoet\Models\SubscriberSegment;
+use MailPoet\Newsletter\Renderer\Renderer;
+use MailPoet\Util\Helpers;
+
+require_once(ABSPATH . 'wp-includes/pluggable.php');
 
 if(!defined('ABSPATH')) exit;
 
@@ -16,12 +24,125 @@ class Scheduler {
   }
 
   function process() {
-  }
+    $scheduled_queues = SendingQueue::where('status', 'scheduled')
-
+      ->whereLte('scheduled_at', Carbon::createFromTimestamp(current_time('timestamp')))
-  function checkExecutionTimer() {
+      ->findMany();
-    $elapsed_time = microtime(true) - $this->timer;
+    if(!count($scheduled_queues)) return;
-    if($elapsed_time >= CronHelper::daemon_execution_limit) {
+    foreach($scheduled_queues as $queue) {
-      throw new \Exception(__('Maximum execution time reached.'));
+      $newsletter = Newsletter::filter('filterWithOptions')
+        ->findOne($queue->newsletter_id);
+      if(!$newsletter || $newsletter->deleted_at !== null) {
+        $queue->delete();
+      }
+      else if($newsletter->type === 'welcome') {
+        $this->processWelcomeNewsletter($newsletter, $queue);
+      }
+      else if($newsletter->type === 'notification') {
+        $this->processPostNotificationNewsletter($newsletter, $queue);
+      }
+      CronHelper::checkExecutionTimer($this->timer);
     }
   }
+
+  function processWelcomeNewsletter($newsletter, $queue) {
+    $subscriber = unserialize($queue->subscribers);
+    $subscriber_id = $subscriber['to_process'][0];
+    if($newsletter->event === 'segment') {
+      if ($this->verifyMailPoetSubscriber($subscriber_id, $newsletter, $queue) === false) {
+        return;
+      }
+    }
+    else if($newsletter->event === 'user') {
+      if ($this->verifyWPSubscriber($subscriber_id, $newsletter) === false) {
+        $queue->delete();
+        return;
+      }
+    }
+    $queue->status = null;
+    $queue->save();
+  }
+
+  function processPostNotificationNewsletter($newsletter, $queue) {
+    $next_run_date = $this->getQueueNextRunDate($newsletter->schedule);
+    $segments = unserialize($newsletter->segments);
+    $subscribers = SubscriberSegment::whereIn('segment_id', $segments)
+      ->findArray();
+    $subscribers = Helpers::arrayColumn($subscribers, 'subscriber_id');
+    $subscribers = array_unique($subscribers);
+    if(!count($subscribers) || !$this->checkIfNewsletterChanged($newsletter)) {
+      $queue->scheduled_at = $next_run_date;
+      $queue->save();
+      return;
+    }
+    // update current queue
+    $queue->subscribers = serialize(
+      array(
+        'to_process' => $subscribers
+      )
+    );
+    $queue->count_total = $queue->count_to_process = count($subscribers);
+    $queue->status = null;
+    $queue->save();
+    // schedule newsletter for next delivery
+    $new_queue = SendingQueue::create();
+    $new_queue->newsletter_id = $newsletter->id;
+    $new_queue->scheduled_at = $next_run_date;
+    $new_queue->status = 'scheduled';
+    $new_queue->save();
+  }
+
+  private function verifyMailPoetSubscriber($subscriber_id, $newsletter, $queue) {
+    // check if subscriber is in proper segment
+    $subscriber_in_segment =
+      SubscriberSegment::where('subscriber_id', $subscriber_id)
+        ->where('segment_id', $newsletter->segment)
+        ->where('status', 'subscribed')
+        ->findOne();
+    if (!$subscriber_in_segment) {
+      $queue->delete();
+      return false;
+    }
+    // check if subscriber is confirmed (subscribed)
+    $subscriber = $subscriber_in_segment->subscriber()->findOne();
+    if ($subscriber->status !== 'subscribed') {
+      // reschedule delivery in 5 minutes
+      $scheduled_at = Carbon::createFromTimestamp(current_time('timestamp'));
+      $queue->scheduled_at = $scheduled_at->addMinutes(5);
+      $queue->save();
+      return false;
+    }
+    return true;
+  }
+
+  private function verifyWPSubscriber($subscriber_id, $newsletter) {
+    // check if user has the proper role
+    $subscriber = Subscriber::findOne($subscriber_id);
+    if(!$subscriber || $subscriber->wp_user_id === null) {
+      return false;
+    }
+    $wp_user = (array) get_userdata($subscriber->wp_user_id);
+    if(!in_array($newsletter->role, $wp_user['roles'])) {
+      return false;
+    }
+    return true;
+  }
+
+  private function checkIfNewsletterChanged($newsletter) {
+    $last_run_queue = SendingQueue::where('status', 'completed')
+      ->where('newsletter_id', $newsletter->id)
+      ->orderByDesc('id')
+      ->findOne();
+    if(!$last_run_queue) return true;
+    $renderer = new Renderer($newsletter->asArray());
+    $rendered_newsletter = $renderer->render();
+    $new_hash = md5($rendered_newsletter['html']);
+    $old_hash = $last_run_queue->newsletter_rendered_body_hash;
+    return $new_hash === $old_hash;
+  }
+
+  private function getQueueNextRunDate($schedule) {
+    $schedule = Cron::factory($schedule);
+    return $schedule->getNextRunDate(current_time('mysql'))
+      ->format('Y-m-d H:i:s');
+  }
 }

lib/Cron/Workers/SendingQueue.php

@@ -10,7 +10,6 @@ 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;
 
@@ -35,8 +34,11 @@ class SendingQueue {
     foreach($this->getQueues() as $queue) {
       $newsletter = Newsletter::findOne($queue->newsletter_id);
       if(!$newsletter) {
+        $queue->delete();
         continue;
       }
+      $newsletter = $newsletter->asArray();
+      $newsletter['body'] = $this->getNewsletterBodyAndSubject($queue, $newsletter);
       $queue->subscribers = (object) unserialize($queue->subscribers);
       if(!isset($queue->subscribers->processed)) {
         $queue->subscribers->processed = array();
@@ -44,8 +46,6 @@ class SendingQueue {
       if(!isset($queue->subscribers->failed)) {
         $queue->subscribers->failed = array();
       }
-      $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) {
@@ -67,6 +67,20 @@ class SendingQueue {
     }
   }
 
+  function getNewsletterBodyAndSubject($queue, $newsletter) {
+    // check if newsletter has been rendered, in which case return its contents
+    // or render & and for future use
+    if($queue->newsletter_rendered_body === null) {
+      $newsletter['body'] = $this->renderNewsletter($newsletter);
+      $queue->newsletter_rendered_body = json_encode($newsletter['body']);
+      $queue->newsletter_rendered_body_hash = md5($newsletter['body']['text']);
+      $queue->save();
+    } else {
+      $newsletter['body'] = json_decode($queue->newsletter_rendered_body);
+    }
+    return (array) $newsletter['body'];
+  }
+
   function processBulkSubscribers($mailer, $newsletter, $subscribers, $queue) {
     foreach($subscribers as $subscriber) {
       $processed_newsletters[] =
@@ -87,7 +101,7 @@ class SendingQueue {
       );
     } else {
       $newsletter_statistics =
-        array_map(function ($data) use ($newsletter, $subscribers_ids, $queue) {
+        array_map(function($data) use ($newsletter, $subscribers_ids, $queue) {
           return array(
             $newsletter['id'],
             $subscribers_ids[$data],
@@ -112,6 +126,9 @@ class SendingQueue {
     foreach($subscribers as $subscriber) {
       $this->checkSendingLimit();
       $processed_newsletter = $this->processNewsletter($newsletter, $subscriber);
+      if (!$queue->newsletter_rendered_subject) {
+        $queue->newsletter_rendered_subject = $processed_newsletter['subject'];
+      }
       $transformed_subscriber = $mailer->transformSubscriber($subscriber);
       $result = $this->sendNewsletter(
         $mailer,
@@ -119,7 +136,7 @@ class SendingQueue {
         $transformed_subscriber
       );
       if(!$result) {
-        $queue->subscribers->failed[] = $subscriber['id'];;
+        $queue->subscribers->failed[] = $subscriber['id'];
       } else {
         $queue->subscribers->processed[] = $subscriber['id'];
         $newsletter_statistics = array(
@@ -147,13 +164,17 @@ class SendingQueue {
 
   function processNewsletter($newsletter, $subscriber = false) {
     $divider = '***MailPoet***';
+    $data_for_shortcodes =
+      array_merge(array($newsletter['subject']), $newsletter['body']);
+    $body = implode($divider, $data_for_shortcodes);
     $shortcodes = new Shortcodes(
-      implode($divider, $newsletter['body']),
       $newsletter,
       $subscriber
     );
-    list($newsletter['body']['html'], $newsletter['body']['text']) =
+    list($newsletter['subject'],
-      explode($divider, $shortcodes->replace());
+      $newsletter['body']['html'],
+      $newsletter['body']['text']
+      ) = explode($divider, $shortcodes->replace($body));
     return $newsletter;
   }
 
@@ -203,7 +224,9 @@ class SendingQueue {
         $queue->subscribers->failed
       )
     );
-    $queue->subscribers->to_process = array_values($queue->subscribers->to_process);
+    $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);

lib/Form/Block/Base.php

@@ -112,4 +112,17 @@ abstract class Base {
             && strlen(trim($block['params']['value'])) > 0)
             ? esc_attr(trim($block['params']['value'])) : '';
   }
+
+  protected static function getInputModifiers($block = array()) {
+    $modifiers = array();
+
+    if(isset($block['params']['readonly'])) {
+      $modifiers[] = 'readonly';
+    }
+
+    if(isset($block['params']['disabled'])) {
+      $modifiers[] = 'disabled';
+    }
+    return join(' ', $modifiers);
+  }
 }

lib/Form/Block/Radio.php

@@ -25,18 +25,24 @@ class Radio extends Base {
 
       $html .= 'name="'.$field_name.'" ';
 
-      $html .= 'value="'.esc_attr($option['value']).'" ';
+      if(is_array($option['value'])) {
+        $value = key($option['value']);
+        $label = reset($option['value']);
+      } else {
+        $value = $option['value'];
+        $label = $option['value'];
+      }
+
+      $html .= 'value="'.esc_attr($value).'" ';
 
       $html .= (
         (isset($option['is_checked']) && $option['is_checked'])
         ||
-        (self::getFieldValue($block) === $option['value'])
+        (self::getFieldValue($block) === $value)
       ) ? 'checked="checked"' : '';
 
       $html .= $field_validation;
-
+      $html .= ' /> '.esc_attr($label);
-      $html .= ' /> '.esc_attr($option['value']);
-
       $html .= '</label>';
     }
 

lib/Form/Block/Select.php

@@ -18,7 +18,12 @@ class Select extends Base {
       $html .= '<option value="">'.static::getFieldLabel($block).'</option>';
     }
 
-    foreach($block['params']['values'] as $option) {
+    $options = (!empty($block['params']['values'])
+      ? $block['params']['values']
+      : array()
+    );
+
+    foreach($options as $option) {
       $is_selected = (
         (isset($option['is_checked']) && $option['is_checked'])
         ||

lib/Form/Block/Text.php

@@ -6,7 +6,7 @@ class Text extends Base {
   static function render($block) {
     $type = 'text';
     if($block['id'] === 'email') {
-        $type = 'email';
+      $type = 'email';
     }
 
     $html = '';
@@ -27,6 +27,8 @@ class Text extends Base {
 
     $html .= static::getInputValidation($block);
 
+    $html .= static::getInputModifiers($block);
+
     $html .= '/>';
 
     $html .= '</p>';

lib/Form/Block/Textarea.php

@@ -19,6 +19,8 @@ class Textarea extends Base {
 
     $html .= static::getInputValidation($block);
 
+    $html .= static::getInputModifiers($block);
+
     $html .= '></textarea>';
 
     $html .= '</p>';

lib/Form/Util/Export.php

@@ -17,8 +17,7 @@ class Export {
       case 'iframe':
         // generate url to load iframe's content
         $iframe_url = add_query_arg(array(
-          'mailpoet_page' => 'mailpoet_form_iframe',
+          'mailpoet_form_iframe' => $form['id']
-          'mailpoet_form' => $form['id']
         ), site_url());
 
         // generate iframe
@@ -31,7 +30,7 @@ class Export {
           'class="mailpoet_form_iframe"',
           'vspace="0"',
           'tabindex="0"',
-          'onload="javascript:(this.style.height = this.contentWindow.document.body.scrollHeight + \'px\');"',
+          'onload="MailPoet.Iframe.autoSize(this);"',
           'marginwidth="0"',
           'marginheight="0"',
           'hspace="0"',

lib/Form/Widget.php

@@ -154,7 +154,7 @@ class Widget extends \WP_Widget {
       $output = '';
 
       if(!empty($body)) {
-        $form_id = $this->id_base.'_'.$this->number;
+        $form_id = $this->id_base.'_'.$form['id'];
 
         $data = array(
           'form_id' => $form_id,

lib/Models/Setting.php

@@ -8,6 +8,11 @@ class Setting extends Model {
 
   public static $defaults = null;
 
+  const DEFAULT_SENDING_METHOD_GROUP = 'website';
+  const DEFAULT_SENDING_METHOD = 'PHPMail';
+  const DEFAULT_SENDING_FREQUENCY_EMAILS = 25;
+  const DEFAULT_SENDING_FREQUENCY_INTERVAL = 5; // in minutes
+
   function __construct() {
     parent::__construct();
 
@@ -25,10 +30,18 @@ class Setting extends Model {
 
   public static function loadDefaults() {
     self::$defaults = array(
+      'mta_group' => self::DEFAULT_SENDING_METHOD_GROUP,
+      'mta' => array(
+        'method' => self::DEFAULT_SENDING_METHOD,
+        'frequency' => array(
+          'emails' => self::DEFAULT_SENDING_FREQUENCY_EMAILS,
+          'interval' => self::DEFAULT_SENDING_FREQUENCY_INTERVAL
+        )
+      ),
       'signup_confirmation' => array(
         'enabled' => true,
         'subject' => sprintf(__('Confirm your subscription to %1$s'), get_option('blogname')),
-        'body' => __("Hello!\n\nHurray! You've subscribed to our site.\nWe need you to activate your subscription to the list(s): [lists_to_confirm] by clicking the link below: \n\n[activation_link]Click here to confirm your subscription.[/activation_link]\n\nThank you,\n\nThe team!")
+        'body' => __("Hello!\n\nHurray! You've subscribed to our site.\n\nWe need you to activate your subscription to the list(s): [lists_to_confirm] by clicking the link below: \n\n[activation_link]Click here to confirm your subscription.[/activation_link]\n\nThank you,\n\nThe team!")
       )
     );
   }

lib/Models/Subscriber.php

@@ -1,7 +1,9 @@
 <?php
 namespace MailPoet\Models;
 use MailPoet\Mailer\Mailer;
+use MailPoet\Newsletter\Scheduler\Scheduler;
 use MailPoet\Util\Helpers;
+use MailPoet\Subscription;
 
 if(!defined('ABSPATH')) exit;
 
@@ -70,42 +72,6 @@ class Subscriber extends Model {
     }
   }
 
-  function getConfirmationUrl() {
-    $post = get_post(Setting::getValue('signup_confirmation.page'));
-    return $this->getSubscriptionUrl($post, 'confirm');
-  }
-
-  function getEditSubscriptionUrl() {
-    $post = get_post(Setting::getValue('subscription.page'));
-    return $this->getSubscriptionUrl($post, 'edit');
-  }
-
-  function getUnsubscribeUrl() {
-    $post = get_post(Setting::getValue('subscription.page'));
-    return $this->getSubscriptionUrl($post, 'unsubscribe');
-  }
-
-  private function getSubscriptionUrl($post = null, $action = null) {
-    if($post === null || $action === null) return;
-
-    $url = get_permalink($post);
-
-    $params = array(
-      'mailpoet_action='.$action,
-      'mailpoet_token='.self::generateToken($this->email),
-      'mailpoet_email='.$this->email
-    );
-    // add parameters
-    $url .= (parse_url($url, PHP_URL_QUERY) ? '&' : '?').join('&', $params);
-
-    $url_params = parse_url($url);
-    if(empty($url_params['scheme'])) {
-      $url = get_bloginfo('url').$url;
-    }
-
-    return $url;
-  }
-
   function sendConfirmationEmail() {
     if($this->status === self::STATUS_UNCONFIRMED) {
       $signup_confirmation = Setting::getValue('signup_confirmation');
@@ -131,7 +97,7 @@ class Subscriber extends Model {
           '[/activation_link]'
         ),
         array(
-          '<a href="'.htmlentities($this->getConfirmationUrl()).'">',
+          '<a href="'.esc_attr(Subscription\Url::getConfirmationUrl($this)).'">',
           '</a>'
         ),
         $body
@@ -152,14 +118,14 @@ class Subscriber extends Model {
       // set from
       $from = (
         !empty($signup_confirmation['from'])
-        && !empty($signup_confirmation['from']['email'])
+        && !empty($signup_confirmation['from']['address'])
       ) ? $signup_confirmation['from']
         : false;
 
       // set reply to
       $reply_to = (
         !empty($signup_confirmation['reply_to'])
-        && !empty($signup_confirmation['reply_to']['email'])
+        && !empty($signup_confirmation['reply_to']['address'])
       ) ? $signup_confirmation['reply_to']
         : false;
 
@@ -187,6 +153,10 @@ class Subscriber extends Model {
       return false;
     }
 
+    $signup_confirmation_enabled = (bool)Setting::getValue(
+      'signup_confirmation.enabled'
+    );
+
     $subscriber = self::createOrUpdate($subscriber_data);
     $errors = $subscriber->getErrors();
 
@@ -198,16 +168,22 @@ class Subscriber extends Model {
         $subscriber->setExpr('deleted_at', 'NULL');
       }
 
-      if((bool)Setting::getValue('signup_confirmation.enabled')) {
+      // auto subscribe when signup confirmation is disabled
-        if($subscriber->status !== self::STATUS_SUBSCRIBED) {
+      if($signup_confirmation_enabled === false) {
-          $subscriber->sendConfirmationEmail();
-        }
-      } else {
         $subscriber->set('status', self::STATUS_SUBSCRIBED);
       }
 
       if($subscriber->save()) {
+        // link subscriber to segments
         $subscriber->addToSegments($segment_ids);
+
+        // signup confirmation
+        if($subscriber->status !== self::STATUS_SUBSCRIBED) {
+          $subscriber->sendConfirmationEmail();
+        }
+
+        // welcome email
+        Scheduler::welcomeForSegmentSubscription($subscriber->id, $segment_ids);
       }
     }
 
@@ -371,6 +347,9 @@ class Subscriber extends Model {
 
   static function createOrUpdate($data = array()) {
     $subscriber = false;
+    if(is_array($data) && !empty($data)) {
+      $data = stripslashes_deep($data);
+    }
 
     if(isset($data['id']) && (int)$data['id'] > 0) {
       $subscriber = self::findOne((int)$data['id']);
@@ -396,16 +375,25 @@ class Subscriber extends Model {
 
     foreach($data as $key => $value) {
       if(strpos($key, 'cf_') === 0) {
+        if(is_array($value)) {
+          $value = array_filter($value);
+          $value = reset($value);
+        }
         $custom_fields[(int)substr($key, 3)] = $value;
         unset($data[$key]);
       }
     }
 
+    $old_status = false;
+    $new_status = false;
+
     if($subscriber === false) {
       $subscriber = self::create();
       $subscriber->hydrate($data);
     } else {
+      $old_status = $subscriber->status;
       $subscriber->set($data);
+      $new_status = $subscriber->status;
     }
 
     if($subscriber->save()) {
@@ -414,8 +402,19 @@ class Subscriber extends Model {
           $subscriber->setCustomField($custom_field_id, $value);
         }
       }
-      if($segment_ids !== false) {
+
-        SubscriberSegment::setSubscriptions($subscriber, $segment_ids);
+      // check for status change
+      if(
+          ($old_status === self::STATUS_SUBSCRIBED)
+          &&
+          ($new_status === self::STATUS_UNSUBSCRIBED)
+      ) {
+        // make sure we unsubscribe the user from all lists
+        SubscriberSegment::setSubscriptions($subscriber, array());
+      } else {
+        if($segment_ids !== false) {
+          SubscriberSegment::setSubscriptions($subscriber, $segment_ids);
+        }
       }
     }
     return $subscriber;

lib/Models/SubscriberSegment.php

@@ -12,22 +12,27 @@ class SubscriberSegment extends Model {
     parent::__construct();
   }
 
+  function subscriber() {
+    return $this->has_one(__NAMESPACE__.'\Subscriber', 'id', 'subscriber_id');
+  }
+
   static function setSubscriptions($subscriber, $segment_ids = array()) {
     if($subscriber->id > 0) {
       // unsubscribe from current subscriptions
       SubscriberSegment::where('subscriber_id', $subscriber->id)
-        ->whereNotIn('segment_id', $segment_ids)
         ->findResultSet()
         ->set('status', Subscriber::STATUS_UNSUBSCRIBED)
         ->save();
 
       // subscribe to segments
       foreach($segment_ids as $segment_id) {
-        self::createOrUpdate(array(
+        if((int)$segment_id > 0) {
-          'subscriber_id' => $subscriber->id,
+          self::createOrUpdate(array(
-          'segment_id' => $segment_id,
+            'subscriber_id' => $subscriber->id,
-          'status' => Subscriber::STATUS_SUBSCRIBED
+            'segment_id' => $segment_id,
-        ));
+            'status' => Subscriber::STATUS_SUBSCRIBED
+          ));
+        }
       }
     }
 

lib/Newsletter/Editor/PostTransformer.php

@@ -169,6 +169,6 @@ class PostTransformer {
 
     $alignment = (in_array($this->args['titleAlignment'], array('left', 'right', 'center'))) ? $this->args['titleAlignment'] : 'left';
 
-    return '<' . $tag . ' style="text-align: ' . $alignment . '">' . $title . '</' . $tag . '>';
+    return '<' . $tag . ' data-post-id="' . $post->ID . '" style="text-align: ' . $alignment . '">' . $title . '</' . $tag . '>';
   }
 }

lib/Newsletter/Renderer/Blocks/Button.php

@@ -9,18 +9,18 @@ class Button {
     $element['styles']['block']['width'] = self::calculateWidth($element, $column_count);
     $template = '
       <tr>
-        <td class="mailpoet_padded" valign="top">
+        <td class="mailpoet_padded_bottom mailpoet_padded_side" valign="top">
           <div>
             <table width="100%" cellpadding="0" cellspacing="0" border="0" style="border-spacing:0;mso-table-lspace:0;mso-table-rspace:0;">
               <tr>
-                <td class="mailpoet_button-container" style="padding:8px 0;text-align:' . $element['styles']['block']['textAlign'] . ';"><!--[if mso]>
+                <td class="mailpoet_button-container" style="text-align:' . $element['styles']['block']['textAlign'] . ';"><!--[if mso]>
                   <v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word"
                     href="' . $element['url'] . '"
                     style="height:' . $element['styles']['block']['lineHeight'] . ';
                            width:' . $element['styles']['block']['width'] . ';
                            v-text-anchor:middle;"
                     arcsize="' . round($element['styles']['block']['borderRadius'] / $element['styles']['block']['lineHeight'] * 100) . '%"
-                    strokeweight="1px"
+                    strokeweight="' . $element['styles']['block']['borderWidth'] . '"
                     strokecolor="' . $element['styles']['block']['borderColor'] . '"
                     fillcolor="' . $element['styles']['block']['backgroundColor'] . '">
                   <w:anchorlock/>
@@ -43,9 +43,12 @@ class Button {
   static function calculateWidth($element, $column_count) {
     $column_width = ColumnsHelper::columnWidth($column_count);
     $column_width = $column_width - (StylesHelper::$padding_width * 2);
-    $column_width = ((int) $element['styles']['block']['width'] > $column_width) ?
+    $border_width = (int) $element['styles']['block']['borderWidth'];
-      $column_width . 'px' :
+    $button_width = (int) $element['styles']['block']['width'];
-      $element['styles']['block']['width'];
+    $button_width = ($button_width > $column_width) ?
-    return $column_width;
+      $column_width :
+      $button_width;
+    $button_width = $button_width - (2 * $border_width) . 'px';
+    return $button_width;
   }
 }

lib/Newsletter/Renderer/Blocks/Footer.php

@@ -7,6 +7,9 @@ class Footer {
   static function render($element) {
     $element['text'] = preg_replace('/\n/', '<br /><br />', $element['text']);
     $element['text'] = preg_replace('/(<\/?p.*?>)/i', '', $element['text']);
+    $line_height = sprintf(
+      '%spx', StylesHelper::$line_height_multiplier * (int) $element['styles']['text']['fontSize']
+    );
     $DOM_parser = new \pQuery();
     $DOM = $DOM_parser->parseStr($element['text']);
     if(isset($element['styles']['link'])) {
@@ -17,10 +20,15 @@ class Footer {
         }
       }
     }
+    $background_color = $element['styles']['block']['backgroundColor'];
+    $background_color = ($background_color !== 'transparent') ?
+      'bgcolor="' . $background_color . '"' :
+      false;
+    if(!$background_color) unset($element['styles']['block']['backgroundColor']);
     $template = '
       <tr>
-        <td class="mailpoet_header_footer_padded mailpoet_footer" bgcolor="' . $element['styles']['block']['backgroundColor'] . '"
+        <td class="mailpoet_header_footer_padded mailpoet_footer" ' . $background_color . '
-        style="' . StylesHelper::getBlockStyles($element) . StylesHelper::getStyles($element['styles'], 'text') . '">
+        style="line-height: ' . $line_height  . ';' . StylesHelper::getBlockStyles($element) . StylesHelper::getStyles($element['styles'], 'text') . '">
           ' . $DOM->html() . '
         </td>
       </tr>';

lib/Newsletter/Renderer/Blocks/Header.php

@@ -6,7 +6,10 @@ use MailPoet\Newsletter\Renderer\StylesHelper;
 class Header {
   static function render($element) {
     $element['text'] = preg_replace('/\n/', '<br /><br />', $element['text']);
-    $element['text'] = preg_replace('/(<\/?p.*?>)/', '', $element['text']);
+    $element['text'] = preg_replace('/(<\/?p.*?>)/i', '', $element['text']);
+    $line_height = sprintf(
+      '%spx', StylesHelper::$line_height_multiplier * (int) $element['styles']['text']['fontSize']
+    );
     $DOM_parser = new \pQuery();
     $DOM = $DOM_parser->parseStr($element['text']);
     if(isset($element['styles']['link'])) {
@@ -17,11 +20,16 @@ class Header {
         }
       }
     }
+    $background_color = $element['styles']['block']['backgroundColor'];
+    $background_color = ($background_color !== 'transparent') ?
+      'bgcolor="' . $background_color . '"' :
+      false;
+    if(!$background_color) unset($element['styles']['block']['backgroundColor']);
     $template = '
       <tr>
-        <td class="mailpoet_header_footer_padded mailpoet_header" bgcolor="' . $element['styles']['block']['backgroundColor'] . '"
+        <td class="mailpoet_header_footer_padded mailpoet_header" ' . $background_color . '
-        style="' . StylesHelper::getBlockStyles($element) . StylesHelper::getStyles($element['styles'], 'text') . '">
+        style="line-height: ' . $line_height  . ';' . StylesHelper::getBlockStyles($element) . StylesHelper::getStyles($element['styles'], 'text') . '">
-        ' . $DOM->html() . '
+          ' . $DOM->html() . '
         </td>
       </tr>';
     return $template;

lib/Newsletter/Renderer/Blocks/Image.php

@@ -11,14 +11,14 @@ class Image {
     $element = self::adjustImageDimensions($element, $column_count);
     $image_template = '
       <img style="max-width:' . $element['width'] . 'px;" src="' . $element['src'] . '"
-      width="' . $element['width'] . '" height="' . $element['height'] . '" alt="' . $element['alt'] . '"/>
+      width="' . $element['width'] . '" alt="' . $element['alt'] . '"/>
       ';
     if(!empty($element['link'])) {
       $image_template = '<a href="' . $element['link'] . '">' . $image_template . '</a>';
     }
     $template = '
       <tr>
-        <td class="mailpoet_image ' . (($element['fullWidth'] === false) ? 'mailpoet_padded' : '') . '" align="center" valign="top">
+        <td class="mailpoet_image ' . (($element['fullWidth'] === false) ? 'mailpoet_padded_bottom mailpoet_padded_side' : 'mailpoet_padded_bottom') . '" align="center" valign="top">
           ' . $image_template . '
         </td>
       </tr>';

lib/Newsletter/Renderer/Blocks/Renderer.php

@@ -1,10 +1,12 @@
 <?php
 namespace MailPoet\Newsletter\Renderer\Blocks;
 
+use MailPoet\Newsletter\Renderer\StylesHelper;
+
 class Renderer {
   function render($data, $column_count) {
     $block_content = '';
-    array_map(function ($block) use (&$block_content, &$columns, $column_count) {
+    array_map(function($block) use (&$block_content, &$columns, $column_count) {
       $block_content .= $this->createElementFromBlockType($block, $column_count);
       if(isset($block['blocks'])) {
         $block_content = $this->render($block, $column_count);
@@ -18,6 +20,7 @@ class Renderer {
   }
 
   function createElementFromBlockType($block, $column_count) {
+    $block = StylesHelper::setTextAlign($block);
     $block_class = __NAMESPACE__ . '\\' . ucfirst($block['type']);
     return (class_exists($block_class)) ? $block_class::render($block, $column_count) : '';
   }

lib/Newsletter/Renderer/Blocks/Social.php

@@ -13,7 +13,7 @@ class Social {
       }
       $template = '
       <tr>
-        <td class="mailpoet_padded" valign="top" align="center">
+        <td class="mailpoet_padded_side maipoet_padded_bottom" valign="top" align="center">
           ' . $icons_block . '
         </td>
       </tr>';

lib/Newsletter/Renderer/Blocks/Text.php

@@ -1,6 +1,8 @@
 <?php
 namespace MailPoet\Newsletter\Renderer\Blocks;
 
+use MailPoet\Newsletter\Renderer\StylesHelper;
+
 class Text {
   static function render($element) {
     $html = $element['text'];
@@ -8,10 +10,10 @@ class Text {
     $html = self::convertParagraphsToTables($html);
     $html = self::styleLists($html);
     $html = self::styleHeadings($html);
-    $html = self::addLineBreakAfterTags($html);
+    $html = self::removeLastLineBreak($html);
     $template = '
       <tr>
-        <td class="mailpoet_text mailpoet_padded" valign="top" style="word-break:break-word;word-wrap:break-word;">
+        <td class="mailpoet_text mailpoet_padded_bottom mailpoet_padded_side" valign="top" style="word-break:break-word;word-wrap:break-word;">
           ' . $html . '
         </td>
       </tr>';
@@ -54,6 +56,14 @@ class Text {
           </tr>
         </tbody>'
       );
+      $blockquote->parent->insertChild(
+        array(
+          'tag_name' => 'br',
+          'self_close' => true,
+          'attributes' => array()
+        ),
+        $blockquote->index() + 1
+      );
     }
     return $DOM->__toString();
   }
@@ -70,16 +80,23 @@ class Text {
         continue;
       }
       $style = $paragraph->style;
+      if(!preg_match('/text-align/i', $style)) {
+        $style = 'text-align: left;' . $style;
+      }
       $contents = $paragraph->html();
       $paragraph->setTag('table');
       $paragraph->style = 'border-spacing:0;mso-table-lspace:0;mso-table-rspace:0;';
       $paragraph->width = '100%';
       $paragraph->cellpadding = 0;
+      $next_element = $paragraph->getNextSibling();
+      // unless this is the last element in column, add double line breaks
+      $line_breaks = ($next_element && !empty($next_element->getInnerText())) ? '<br /><br />' : '';
+      // if this element is followed by a list, add single line break
+      $line_breaks = ($next_element && preg_match('/<li>/i', $next_element->getInnerText())) ? '<br />' : $line_breaks;
       $paragraph->html('
         <tr>
           <td class="mailpoet_paragraph" style="word-break:break-word;word-wrap:break-word;' . $style . '">
-            ' . $contents . '
+            ' . $contents . $line_breaks . '
-            <br /><br />
           </td>
          </tr>'
       );
@@ -94,11 +111,13 @@ class Text {
     if(!$lists->count()) return $html;
     foreach($lists as $list) {
       if($list->tag === 'li') {
+        $list->setInnertext($list->text());
         $list->class = 'mailpoet_paragraph';
       } else {
         $list->class = 'mailpoet_paragraph';
-        $list->style .= 'padding-top:0;padding-bottom:0;margin-top:0;margin-bottom:0;';
+        $list->style .= 'padding-top:0;padding-bottom:0;margin-top:10px;';
       }
+      $list->style .= 'margin-bottom:10px;';
     }
     return $DOM->__toString();
   }
@@ -109,27 +128,12 @@ class Text {
     $headings = $DOM->query('h1, h2, h3, h4');
     if(!$headings->count()) return $html;
     foreach($headings as $heading) {
-      $heading->style .= 'margin:0;font-style:normal;font-weight:normal;';
+      $heading->style .= 'padding:0;font-style:normal;font-weight:normal;';
     }
     return $DOM->__toString();
   }
 
-  static function addLineBreakAfterTags($html) {
+  static function removeLastLineBreak($html) {
-    $DOM_parser = new \pQuery();
+    return preg_replace('/(^)?(<br.*?\/?>)+$/i', '', $html);
-    $DOM = $DOM_parser->parseStr($html);
-    $tags = $DOM->query('ul, ol, h1, h2, h3, h4, table.mailpoet_blockquote');
-    if(!$tags->count()) return $html;
-    foreach($tags as $tag) {
-      $tag->parent->insertChild(
-        array(
-          'tag_name' => 'br',
-          'self_close' => true,
-          'attributes' => array()
-        ),
-        $tag->index() + 1
-      );
-    }
-    // remove last line break
-    return preg_replace('/(^)?(<br.*?\/?>)+$/i', '', $DOM->__toString());
   }
 }

lib/Newsletter/Renderer/Columns/Renderer.php

@@ -22,6 +22,7 @@ class Renderer {
   }
 
   function getOneColumnTemplate($styles, $class) {
+    $background_color = $this->getBackgroundColor($styles);
     $template['content_start'] = '
       <tr>
         <td class="mailpoet_content" align="center" style="border-collapse:collapse">
@@ -29,7 +30,7 @@ class Renderer {
             <tbody>
               <tr>
                 <td style="padding-left:0;padding-right:0">
-                  <table width="100%" border="0" cellpadding="0" cellspacing="0" class="mailpoet_' . $class . '" style="border-spacing:0;mso-table-lspace:0;mso-table-rspace:0;table-layout:fixed;margin-left:auto;margin-right:auto;padding-left:0;padding-right:0;background-color:' . $styles['backgroundColor'] . '!important;" bgcolor="' . $styles['backgroundColor'] . '">
+                  <table width="100%" border="0" cellpadding="0" cellspacing="0" class="mailpoet_' . $class . '" style="border-spacing:0;mso-table-lspace:0;mso-table-rspace:0;table-layout:fixed;margin-left:auto;margin-right:auto;padding-left:0;padding-right:0;' . $background_color . '">
                     <tbody>';
     $template['content_end'] = '
                     </tbody>
@@ -44,9 +45,10 @@ class Renderer {
   }
 
   function getMultipleColumnsTemplate($styles, $width, $alignment, $class) {
+    $background_color = $this->getBackgroundColor($styles);
     $template['container_start'] = '
       <tr>
-        <td class="mailpoet_content-' . $class . '" align="left" style="border-collapse:collapse;background-color:' . $styles['backgroundColor'] . '!important;" bgcolor="' . $styles['backgroundColor'] . '">
+        <td class="mailpoet_content-' . $class . '" align="left" style="border-collapse:collapse;' . $background_color . '">
           <table width="100%" border="0" cellpadding="0" cellspacing="0" style="border-spacing:0;mso-table-lspace:0;mso-table-rspace:0">
             <tbody>
               <tr>
@@ -78,6 +80,14 @@ class Renderer {
   }
 
   function removePaddingFromLastElement($element) {
-    return preg_replace('/mailpoet_padded(?!.*mailpoet_padded)/ism', '', $element);
+    return preg_replace('/mailpoet_padded_bottom(?!.*mailpoet_padded_bottom)/ism', '', $element);
+  }
+
+  function getBackgroundColor($styles) {
+    if(!isset($styles['backgroundColor'])) return false;
+    $background_color = $styles['backgroundColor'];
+    return ($background_color !== 'transparent') ?
+      sprintf('background-color:%s!important;" bgcolor="%s', $background_color, $background_color) :
+      false;
   }
 }

lib/Newsletter/Renderer/Renderer.php

@@ -43,9 +43,12 @@ class Renderer {
   }
 
   function renderBody($content) {
-    $content = array_map(function ($content_block) {
+    $content = array_map(function($content_block) {
       $column_count = count($content_block['blocks']);
-      $column_data = $this->blocks_renderer->render($content_block, $column_count);
+      $column_data = $this->blocks_renderer->render(
+        $content_block,
+        $column_count
+      );
       return $this->columns_renderer->render(
         $content_block['styles'],
         $column_count,
@@ -59,41 +62,18 @@ class Renderer {
     $css = '';
     foreach($styles as $selector => $style) {
       switch($selector) {
-      case 'h1':
+        case 'text':
-        $selector = 'h1';
+          $selector = 'td.mailpoet_paragraph, td.mailpoet_blockquote, li.mailpoet_paragraph';
-      break;
+          break;
-      case 'h2':
+        case 'body':
-        $selector = 'h2';
+          $selector = 'body, .mailpoet-wrapper';
-      break;
+          break;
-      case 'h3':
+        case 'link':
-        $selector = 'h3';
+          $selector = '.mailpoet-wrapper a';
-      break;
+          break;
-      case 'text':
+        case 'wrapper':
-        $selector = '.mailpoet_paragraph, td.mailpoet_blockquote';
+          $selector = '.mailpoet_content-wrapper';
-      break;
+          break;
-      case 'body':
-        $selector = 'body, .mailpoet-wrapper';
-      break;
-      case 'link':
-        $selector = '.mailpoet-wrapper a';
-      break;
-      case 'wrapper':
-        $selector = '.mailpoet_content-wrapper';
-      break;
-      }
-      if(isset($style['fontSize'])) {
-        $css .= StylesHelper::setFontAndLineHeight(
-          (int) $style['fontSize'],
-          $selector
-        );
-        unset($style['fontSize']);
-      }
-      if(isset($style['fontFamily'])) {
-        $css .= StylesHelper::setFontFamily(
-          $style['fontFamily'],
-          $selector
-        );
-        unset($style['fontFamily']);
       }
       $css .= StylesHelper::setStyle($style, $selector);
     }
@@ -101,7 +81,7 @@ class Renderer {
   }
 
   function injectContentIntoTemplate($template, $data) {
-    return preg_replace_callback('/{{\w+}}/', function ($matches) use (&$data) {
+    return preg_replace_callback('/{{\w+}}/', function($matches) use (&$data) {
       return array_shift($data);
     }, $template);
   }

lib/Newsletter/Renderer/StylesHelper.php

@@ -1,8 +1,6 @@
 <?php
 namespace MailPoet\Newsletter\Renderer;
 
-use MailPoet\Newsletter\Renderer\Columns\ColumnsHelper;
-
 class StylesHelper {
   static $css_attributes = array(
     'backgroundColor' => 'background-color',
@@ -29,174 +27,8 @@ class StylesHelper {
     'Trebuchet MS' => "'Trebuchet MS', 'Lucida Grande', 'Lucida Sans Unicode', 'Lucida Sans', Tahoma, sans-serif",
     'Verdana' => 'Verdana, Geneva, sans-serif'
   );
-  static $font_size = array(
+  static $line_height_multiplier = 1.6;
-    // font_size => array(columnCount => lineHeight);
+  static $heading_margin_multiplier = 0.3;
-    8 => array(
-      1 => "20",
-      2 => "15",
-      3 => "13"
-    ),
-    9 => array(
-      1 => "20",
-      2 => "16",
-      3 => "14"
-    ),
-    10 => array(
-      1 => "20",
-      2 => "17",
-      3 => "15"
-    ),
-    11 => array(
-      1 => "21",
-      2 => "18",
-      3 => "16"
-    ),
-    12 => array(
-      1 => "22",
-      2 => "19",
-      3 => "17"
-    ),
-    13 => array(
-      1 => "23",
-      2 => "20",
-      3 => "19"
-    ),
-    14 => array(
-      1 => "24",
-      2 => "21",
-      3 => "20"
-    ),
-    15 => array(
-      1 => "25",
-      2 => "22",
-      3 => "21"
-    ),
-    16 => array(
-      1 => "26",
-      2 => "23",
-      3 => "22"
-    ),
-    17 => array(
-      1 => "27",
-      2 => "24",
-      3 => "24"
-    ),
-    18 => array(
-      1 => "28",
-      2 => "25",
-      3 => "25"
-    ),
-    19 => array(
-      1 => "29",
-      2 => "27",
-      3 => "26"
-    ),
-    20 => array(
-      1 => "30",
-      2 => "28",
-      3 => "27"
-    ),
-    21 => array(
-      1 => "31",
-      2 => "29",
-      3 => "29"
-    ),
-    22 => array(
-      1 => "32",
-      2 => "30",
-      3 => "30"
-    ),
-    23 => array(
-      1 => "33",
-      2 => "32",
-      3 => "31"
-    ),
-    24 => array(
-      1 => "34",
-      2 => "33",
-      3 => "32"
-    ),
-    25 => array(
-      1 => "36",
-      2 => "34",
-      3 => "34"
-    ),
-    26 => array(
-      1 => "37",
-      2 => "35",
-      3 => "35"
-    ),
-    27 => array(
-      1 => "38",
-      2 => "37",
-      3 => "36"
-    ),
-    28 => array(
-      1 => "39",
-      2 => "38",
-      3 => "37"
-    ),
-    29 => array(
-      1 => "40",
-      2 => "39",
-      3 => "39"
-    ),
-    30 => array(
-      1 => "42",
-      2 => "40",
-      3 => "40"
-    ),
-    31 => array(
-      1 => "43",
-      2 => "42",
-      3 => "41"
-    ),
-    32 => array(
-      1 => "44",
-      2 => "43",
-      3 => "43"
-    ),
-    33 => array(
-      1 => "45",
-      2 => "44",
-      3 => "44"
-    ),
-    34 => array(
-      1 => "47",
-      2 => "46",
-      3 => "45"
-    ),
-    35 => array(
-      1 => "48",
-      2 => "47",
-      3 => "46"
-    ),
-    36 => array(
-      1 => "49",
-      2 => "48",
-      3 => "48"
-    ),
-    37 => array(
-      1 => "50",
-      2 => "49",
-      3 => "49"
-    ),
-    38 => array(
-      1 => "52",
-      2 => "51",
-      3 => "50"
-    ),
-    39 => array(
-      1 => "53",
-      2 => "52",
-      3 => "52"
-    ),
-    40 => array(
-      1 => "54",
-      2 => "53",
-      3 => "53"
-    )
-  );
   static $padding_width = 20;
 
   static function getBlockStyles($element, $ignore_specific_styles = false) {
@@ -207,7 +39,7 @@ class StylesHelper {
   }
 
   static function getStyles($data, $type, $ignore_specific_styles = false) {
-    $styles = array_map(function ($attribute, $style) use ($ignore_specific_styles) {
+    $styles = array_map(function($attribute, $style) use ($ignore_specific_styles) {
       if(!$ignore_specific_styles || !in_array($attribute, $ignore_specific_styles)) {
         return self::translateCSSAttribute($attribute) . ': ' . $style . ' !important;';
       }
@@ -221,33 +53,52 @@ class StylesHelper {
       $attribute;
   }
 
-  static function setFontFamily($font_family, $selector) {
-    $font_family = (isset(self::$font[$font_family])) ?
-      self::$font[$font_family] :
-      self::$font['Arial'];
-    $css = $selector . '{' . PHP_EOL;
-    $css .= 'font-family:' . $font_family . ';' . PHP_EOL;
-    $css .= '}' . PHP_EOL;
-    return $css;
-  }
-
-  static function setFontAndLineHeight($font_size, $selector) {
-    $css = '';
-    foreach(ColumnsHelper::columnClasses() as $column_count => $column_class) {
-      $css .= '.mailpoet_content-' . $column_class . ' ' . $selector . '{' . PHP_EOL;
-      $css .= 'font-size:' . $font_size . 'px;' . PHP_EOL;
-      $css .= 'line-height:' . StylesHelper::$font_size[$font_size][$column_count] . 'px;' . PHP_EOL;
-      $css .= '}' . PHP_EOL;
-    }
-    return $css;
-  }
-
   static function setStyle($style, $selector) {
     $css = $selector . '{' . PHP_EOL;
+    $style = self::applyHeadingMargin($style, $selector);
+    $style = self::applyLineHeight($style, $selector);
     foreach($style as $attribute => $individual_style) {
+      $individual_style = self::applyFontFamily($attribute, $individual_style);
       $css .= self::translateCSSAttribute($attribute) . ':' . $individual_style . ';' . PHP_EOL;
     }
     $css .= '}' . PHP_EOL;
     return $css;
   }
+
+  static function setTextAlign($block) {
+    $alignments = array(
+      'center',
+      'right',
+      'justify'
+    );
+    $text_alignment = isset($block['styles']['block']['textAlign']) ?
+      strtolower($block['styles']['block']['textAlign']) :
+      false;
+    if(in_array($text_alignment, $alignments)) {
+      return $block;
+    }
+    $block['styles']['block']['textAlign'] = 'left';
+    return $block;
+  }
+
+  static function applyFontFamily($attribute, $style) {
+    if($attribute !== 'fontFamily') return $style;
+    return (isset(self::$font[$style])) ?
+        self::$font[$style] :
+        self::$font['Arial'];
+  }
+
+  static function applyHeadingMargin($style, $selector) {
+    if (!preg_match('/h[1-4]/i', $selector)) return $style;
+    $font_size = (int) $style['fontSize'];
+    $style['margin'] = sprintf('0 0 %spx 0', self::$heading_margin_multiplier * $font_size);
+    return $style;
+  }
+
+  static function applyLineHeight($style, $selector) {
+    if (!preg_match('/mailpoet_paragraph|h[1-4]/i', $selector)) return $style;
+    $font_size = (int) $style['fontSize'];
+    $style['lineHeight'] = sprintf('%spx', self::$line_height_multiplier * $font_size);
+    return $style;
+  }
 }

lib/Newsletter/Renderer/Template.html

@@ -35,22 +35,27 @@
             outline: none;
             text-align: center;
         }
-        .mailpoet_padded {
+        .mailpoet_padded_bottom {
+            padding-bottom: 20px;
+        }
+        .mailpoet_padded_side {
             padding-left: 20px;
             padding-right: 20px;
-            padding-bottom: 20px;
         }
         .mailpoet_header_footer_padded {
             padding: 10px 20px;
         }
+        @media screen and (max-width: 480px) and (-webkit-min-device-pixel-ratio: 1) {
+            .mailpoet_button {width:100% !important;}
+        }
         @media screen and (max-width: 599px) and (-webkit-min-device-pixel-ratio: 1) {
             .mailpoet_header {
                 padding: 10px 20px;
             }
             .mailpoet_button {
                 width: 100% !important;
-                max-width: 100% !important;
                 padding: 5px 0 !important;
+                box-sizing:border-box !important;
             }
             div, .mailpoet_cols-two, .mailpoet_cols-three {
                 max-width: 100% !important;

lib/Newsletter/Scheduler/Scheduler.php

@@ -0,0 +1,131 @@
+<?php
+namespace MailPoet\Newsletter\Scheduler;
+
+use Carbon\Carbon;
+use MailPoet\Models\Newsletter;
+use MailPoet\Models\NewsletterOption;
+use MailPoet\Models\NewsletterOptionField;
+use MailPoet\Models\SendingQueue;
+
+class Scheduler {
+  const seconds_in_hour = 3600;
+  const last_weekday_format = 'L';
+
+  static function postNotification($newsletter_id) {
+    $newsletter = Newsletter::filter('filterWithOptions')
+      ->findOne($newsletter_id)
+      ->asArray();
+    $interval_type = $newsletter['intervalType'];
+    $hour = (int) $newsletter['timeOfDay'] / self::seconds_in_hour;
+    $week_day = $newsletter['weekDay'];
+    $month_day = $newsletter['monthDay'];
+    $nth_week_day = ($newsletter['nthWeekDay'] === self::last_weekday_format) ?
+      $newsletter['nthWeekDay'] :
+      '#' . $newsletter['nthWeekDay'];
+    switch($interval_type) {
+      case 'immediately':
+        $schedule = '* * * * *';
+        break;
+      case 'immediate':
+      case 'daily':
+        $schedule = sprintf('0 %s * * *', $hour);
+        break;
+      case 'weekly':
+        $schedule = sprintf('0 %s * * %s', $hour, $week_day);
+        break;
+      case 'monthly':
+        $schedule = sprintf('0 %s %s * *', $hour, $month_day);
+        break;
+      case 'nthWeekDay':
+        $schedule = sprintf('0 %s ? * %s%s', $hour, $week_day, $nth_week_day);
+        break;
+    }
+    $option_field = NewsletterOptionField::where('name', 'schedule')
+      ->findOne()
+      ->asArray();
+    $relation = NewsletterOption::where('newsletter_id', $newsletter_id)
+      ->where('option_field_id', $option_field['id'])
+      ->findOne();
+    if(!$relation) {
+      $relation = NewsletterOption::create();
+      $relation->newsletter_id = $newsletter['id'];
+      $relation->option_field_id = $option_field['id'];
+    }
+    $relation->value = $schedule;
+    $relation->save();
+  }
+
+  static function welcomeForSegmentSubscription($subscriber_id, array $segments) {
+    $newsletters = self::getWelcomeNewsletters();
+    if(!count($newsletters)) return;
+    foreach($newsletters as $newsletter) {
+      if($newsletter['event'] === 'segment' &&
+        in_array($newsletter['segment'], $segments)
+      ) {
+        self::createSendingQueueEntry($newsletter, $subscriber_id);
+      }
+    }
+  }
+
+  static function welcomeForNewWPUser($subscriber_id, array $wp_user, $old_user_data) {
+    $newsletters = self::getWelcomeNewsletters();
+    if(!count($newsletters)) return;
+    foreach($newsletters as $newsletter) {
+      if($newsletter['event'] === 'user') {
+        if($old_user_data) {
+          // do not schedule welcome newsletter if roles have not changed
+          $old_role = (array) $old_user_data->roles;
+          $new_role = (array) $wp_user->roles;
+          if($newsletter['role'] === 'mailpoet_all' ||
+            !array_diff($old_role, $new_role)
+          ) {
+            continue;
+          }
+        }
+        if($newsletter['role'] === 'mailpoet_all' ||
+          in_array($newsletter['role'], $wp_user['roles'])
+        ) {
+          self::createSendingQueueEntry($newsletter, $subscriber_id);
+        }
+      }
+    }
+  }
+
+  private static function getWelcomeNewsletters() {
+    return Newsletter::where('type', 'welcome')
+      ->whereNull('deleted_at')
+      ->filter('filterWithOptions')
+      ->findArray();
+  }
+
+  private static function createSendingQueueEntry($newsletter, $subscriber_id) {
+    $queue = SendingQueue::create();
+    $queue->newsletter_id = $newsletter['id'];
+    $queue->subscribers = serialize(
+      array(
+        'to_process' => array($subscriber_id)
+      )
+    );
+    $queue->count_total = $queue->count_to_process = 1;
+    $after_time_type = $newsletter['afterTimeType'];
+    $after_time_number = $newsletter['afterTimeNumber'];
+    $scheduled_at = null;
+    $current_time = Carbon::createFromTimestamp(current_time('timestamp'));
+    switch($after_time_type) {
+      case 'hours':
+        $scheduled_at = $current_time->addHours($after_time_number);
+        break;
+      case 'days':
+        $scheduled_at = $current_time->addDays($after_time_number);
+        break;
+      case 'weeks':
+        $scheduled_at = $current_time->addWeeks($after_time_number);
+        break;
+      default:
+        $scheduled_at = $current_time;
+    }
+    $queue->status = 'scheduled';
+    $queue->scheduled_at = $scheduled_at;
+    $queue->save();
+  }
+}

lib/Newsletter/Shortcodes/Categories/Link.php

@@ -1,30 +0,0 @@
-<?php
-namespace MailPoet\Newsletter\Shortcodes\Categories;
-
-require_once(ABSPATH . 'wp-includes/pluggable.php');
-
-class Link {
-  /*
-    {
-      text: '<%= __('Unsubscribe link') %>',
-      shortcode: 'global:unsubscribe',
-    },
-    {
-      text: '<%= __('Edit subscription page link') %>',
-      shortcode: 'global:manage',
-    },
-    {
-      text: '<%= __('View in browser link') %>',
-      shortcode: 'global:browser',
-    }
-   */
-  static function process($action) {
-    // TODO: implement
-    $actions = array(
-      'unsubscribe' => '',
-      'manage' => '',
-      'browser' => ''
-    );
-    return (isset($actions[$action])) ? $actions[$action] : false;
-  }
-}

lib/Newsletter/Shortcodes/Categories/Newsletter.php

@@ -1,6 +1,8 @@
 <?php
 namespace MailPoet\Newsletter\Shortcodes\Categories;
 
+use MailPoet\Models\SendingQueue;
+
 class Newsletter {
   /*
     {
@@ -18,26 +20,54 @@ class Newsletter {
     {
       text: '<%= __('Issue number') %>',
       shortcode: 'newsletter:number',
+    },
+    {
+      text: '<%= __('Issue number') %>',
+      shortcode: 'newsletter:number',
+    },
+    {
+      text: '<%= __('View in browser link') %>',
+      shortcode: 'newsletter:view_in_browser',
     }
    */
-  static function process($action, $default_value = false, $newsletter) {
+  static function process($action,
+    $default_value = false,
+    $newsletter, $subscriber = false, $text) {
     if(is_object($newsletter)) {
       $newsletter = $newsletter->asArray();
     }
     switch($action) {
       case 'subject':
         return ($newsletter) ? $newsletter['subject'] : false;
+      break;
+
       case 'total':
-        $posts = wp_count_posts();
+        return substr_count($text, 'data-post-id');
-        return $posts->publish;
+      break;
+
       case 'post_title':
         $post = wp_get_recent_posts(array('numberposts' => 1));
         return (isset($post[0])) ? $post[0]['post_title'] : false;
+      break;
+
       case 'number':
-        // TODO: implement
+        if ($newsletter['type'] !== 'notification') return false;
-        return;
+        $sent_newsletters = (int)
+          SendingQueue::where('newsletter_id', $newsletter['id'])->count();
+        return ++$sent_newsletters;
+      break;
+
+      case 'view_in_browser':
+        return '<a href="#TODO">'.__('View in your browser').'</a>';
+      break;
+
+      case 'view_in_browser_url':
+        return '#TODO';
+      break;
+
       default:
         return false;
+      break;
     }
   }
 }

lib/Newsletter/Shortcodes/Categories/Subscription.php

@@ -0,0 +1,48 @@
+<?php
+namespace MailPoet\Newsletter\Shortcodes\Categories;
+use MailPoet\Subscription\Url as SubscriptionUrl;
+
+class Subscription {
+  /*
+    {
+      text: '<%= __('Unsubscribe') %>',-
+      shortcode: 'subscription:unsubscribe',
+    },
+    {
+      text: '<%= __('Manage subscriptions') %>',
+      shortcode: 'subscription:manage',
+    },
+   */
+  static function process(
+    $action,
+    $default_value = false,
+    $newsletter = false,
+    $subscriber = false
+  ) {
+    switch($action) {
+      case 'unsubscribe':
+        return '<a target="_blank" href="'.
+          esc_attr(SubscriptionUrl::getUnsubscribeUrl($subscriber))
+          .'">'.__('Unsubscribe').'</a>';
+      break;
+
+      case 'unsubscribe_url':
+        return SubscriptionUrl::getUnsubscribeUrl($subscriber);
+      break;
+
+      case 'manage':
+        return '<a target="_blank" href="'.
+          esc_attr(SubscriptionUrl::getManageUrl($subscriber))
+          .'">'.__('Manage subscription').'</a>';
+      break;
+
+      case 'manage_url':
+        return SubscriptionUrl::getManageUrl($subscriber);
+      break;
+
+      default:
+        return false;
+      break;
+    }
+  }
+}

lib/Newsletter/Shortcodes/Categories/User.php

@@ -35,20 +35,31 @@ class User {
     switch($action) {
       case 'firstname':
         return ($subscriber) ? $subscriber['first_name'] : $default_value;
+      break;
+
       case 'lastname':
         return ($subscriber) ? $subscriber['last_name'] : $default_value;
+      break;
+
       case 'email':
         return ($subscriber) ? $subscriber['email'] : false;
+      break;
+
       case 'displayname':
         if($subscriber && $subscriber['wp_user_id']) {
           $wp_user = get_userdata($subscriber['wp_user_id']);
           return $wp_user->user_login;
-        };
+        }
         return $default_value;
+      break;
+
       case 'count':
-        return Subscriber::count();
+        return Subscriber::filter('subscribed')->count();
+      break;
+
       default:
         return false;
+      break;
     }
   }
 }

lib/Newsletter/Shortcodes/Shortcodes.php

@@ -2,29 +2,25 @@
 namespace MailPoet\Newsletter\Shortcodes;
 
 class Shortcodes {
-  public $rendered_newsletter;
   public $newsletter;
   public $subscriber;
 
   function __construct(
-    $rendered_newsletter,
     $newsletter = false,
-    $subscriber = false) {
+    $subscriber = false
-    $this->rendered_newsletter = $rendered_newsletter;
+  ) {
     $this->newsletter = $newsletter;
     $this->subscriber = $subscriber;
   }
 
-  function extract() {
+  function extract($text) {
-    preg_match_all('/\[(?:\w+):.*?\]/', $this->rendered_newsletter, $shortcodes);
+    preg_match_all('/\[(?:\w+):.*?\]/', $text, $shortcodes);
     return array_unique($shortcodes[0]);
   }
 
-  function process($shortcodes) {
+  function process($shortcodes, $text) {
     $processed_shortcodes = array_map(
-      function ($shortcode) {
+      function($shortcode) use($text) {
-        // TODO: discuss renaming "global". It is a reserved name in PHP.
-        if($shortcode === 'global') $shortcode = 'link';
         preg_match(
           '/\[(?P<type>\w+):(?P<action>\w+)(?:.*?default:(?P<default>.*?))?\]/',
           $shortcode,
@@ -32,22 +28,25 @@ class Shortcodes {
         );
         $shortcode_class =
           __NAMESPACE__ . '\\Categories\\' . ucfirst($shortcode_details['type']);
+        $shortcode_action = $shortcode_details['action'];
+        $shortcode_default_value = isset($shortcode_details['default'])
+          ? $shortcode_details['default'] : false;
         if(!class_exists($shortcode_class)) return false;
         return $shortcode_class::process(
-          $shortcode_details['action'],
+          $shortcode_action,
-          isset($shortcode_details['default'])
+          $shortcode_default_value,
-            ? $shortcode_details['default'] : false,
           $this->newsletter,
-          $this->subscriber
+          $this->subscriber,
+          $text
         );
       }, $shortcodes);
-    return array_filter($processed_shortcodes);
+    return $processed_shortcodes;
   }
 
-  function replace() {
+  function replace($text) {
-    $shortcodes = $this->extract($this->rendered_newsletter);
+    $shortcodes = $this->extract($text);
-    $processed_shortcodes = $this->process($shortcodes);
+    $processed_shortcodes = $this->process($shortcodes, $text);
     $shortcodes = array_intersect_key($shortcodes, $processed_shortcodes);
-    return str_replace($shortcodes, $processed_shortcodes, $this->rendered_newsletter);
+    return str_replace($shortcodes, $processed_shortcodes, $text);
   }
 }

lib/Router/Cron.php

@@ -1,7 +1,6 @@
 <?php
 namespace MailPoet\Router;
 
-use Carbon\Carbon;
 use MailPoet\Cron\CronHelper;
 use MailPoet\Cron\Supervisor;
 use MailPoet\Models\Setting;
@@ -30,26 +29,8 @@ class Cron {
   function getStatus() {
     $daemon = Setting::where('name', 'cron_daemon')
       ->findOne();
-    return (
+    return ($daemon) ?
-      ($daemon) ?
+      unserialize($daemon->value) :
-        array_merge(
+      false;
-          array(
-            'timeSinceStart' =>
-              Carbon::createFromFormat(
-                'Y-m-d H:i:s',
-                $daemon->created_at,
-                'UTC'
-              )->diffForHumans(),
-            'timeSinceUpdate' =>
-              Carbon::createFromFormat(
-                'Y-m-d H:i:s',
-                $daemon->updated_at,
-                'UTC'
-              )->diffForHumans()
-          ),
-          unserialize($daemon->value)
-        ) :
-        "false"
-    );
   }
 }

lib/Router/Newsletters.php

@@ -14,6 +14,8 @@ use MailPoet\Models\NewsletterOptionField;
 use MailPoet\Models\NewsletterOption;
 use MailPoet\Newsletter\Renderer\Renderer;
 use MailPoet\Models\SendingQueue;
+use MailPoet\Newsletter\Scheduler\Scheduler;
+use MailPoet\Util\Helpers;
 
 if(!defined('ABSPATH')) exit;
 
@@ -32,7 +34,7 @@ class Newsletters {
       $newsletter['segments'] = array_map(function($segment) {
         return $segment['id'];
       }, $segments);
-      $newsletter['options'] = $options;
+      $newsletter['options'] = Helpers::arrayColumn($options, 'value', 'name');
       return $newsletter;
     }
   }
@@ -138,11 +140,8 @@ class Newsletters {
     }
     $renderer = new Renderer($data);
     $rendered_newsletter = $renderer->render();
-    $shortcodes = new \MailPoet\Newsletter\Shortcodes\Shortcodes(
+    $shortcodes = new \MailPoet\Newsletter\Shortcodes\Shortcodes($data);
-      $rendered_newsletter['html'],
+    $rendered_newsletter = $shortcodes->replace($rendered_newsletter['html']);
-      $data
-    );
-    $rendered_newsletter = $shortcodes->replace();
     return array('rendered_body' => $rendered_newsletter);
   }
 
@@ -158,7 +157,7 @@ class Newsletters {
     if(empty($data['subscriber'])) {
       return array(
         'result' => false,
-        'errors' => array(__('Please specify receiver information'))
+        'errors' => array(__('Please specify receiver information.'))
       );
     }
 
@@ -166,20 +165,17 @@ class Newsletters {
 
     $renderer = new Renderer($newsletter);
     $rendered_newsletter = $renderer->render();
+    $divider = '***MailPoet***';
+    $data_for_shortcodes =
+      array_merge(array($newsletter['subject']), $rendered_newsletter);
+    $body = implode($divider, $data_for_shortcodes);
     $shortcodes = new \MailPoet\Newsletter\Shortcodes\Shortcodes(
-      $rendered_newsletter['html'],
       $newsletter
     );
-    $processed_newsletter['html'] = $shortcodes->replace();
+    list($newsletter['subject'],
-    $shortcodes = new \MailPoet\Newsletter\Shortcodes\Shortcodes(
+      $newsletter['body']['html'],
-      $rendered_newsletter['text'],
+      $newsletter['body']['text']
-      $newsletter
+      ) = explode($divider, $shortcodes->replace($body));
-    );
-    $processed_newsletter['text'] = $shortcodes->replace();
-    $newsletter['body'] = array(
-      'html' => $processed_newsletter['html'],
-      'text' => $processed_newsletter['text'],
-    );
 
     try {
       $mailer = new \MailPoet\Mailer\Mailer(
@@ -265,6 +261,12 @@ class Newsletters {
           }
         }
       }
+      if(!isset($data['id']) &&
+        isset($data['type']) &&
+        $data['type'] === 'notification'
+      ) {
+        Scheduler::postNotification($newsletter->id);
+      }
       return array(
         'result' => true,
         'newsletter' => $newsletter->asArray()

lib/Router/SendingQueue.php

@@ -2,14 +2,17 @@
 namespace MailPoet\Router;
 
 use MailPoet\Models\Newsletter;
+use MailPoet\Models\NewsletterOption;
+use MailPoet\Models\NewsletterOptionField;
 use MailPoet\Models\Segment;
+use MailPoet\Models\SubscriberSegment;
 use MailPoet\Util\Helpers;
+use Cron\CronExpression as Cron;
 
 if(!defined('ABSPATH')) exit;
 
 class SendingQueue {
   function add($data) {
-    // check if mailer is properly configured
     try {
       new Mailer(false);
     } catch(\Exception $e) {
@@ -19,45 +22,81 @@ class SendingQueue {
       );
     }
 
-    $queue = \MailPoet\Models\SendingQueue::whereNull('status')
+    $newsletter = Newsletter::filter('filterWithOptions')
-      ->where('newsletter_id', $data['newsletter_id'])
+      ->findOne($data['newsletter_id']);
-      ->findArray();
+    if(!$newsletter) {
+      return array(
+        'result' => false,
+        'errors' => array(__('Newsletter does not exist.'))
+      );
+    }
 
+    if($newsletter->type === 'welcome') {
+      return array(
+        'result' => true
+      );
+    }
+
+    $queue = \MailPoet\Models\SendingQueue::whereNull('status')
+      ->where('newsletter_id', $newsletter->id)
+      ->findOne();
     if(!empty($queue)) {
       return array(
         'result' => false,
         'errors' => array(__('Send operation is already in progress.'))
       );
     }
-    $queue = \MailPoet\Models\SendingQueue::create();
-    $queue->newsletter_id = $data['newsletter_id'];
-    $subscriber_ids = array();
-    $segments = Segment::whereIn('id', $data['segments'])
-      ->findMany();
 
-    foreach($segments as $segment) {
+    if($newsletter->type === 'notification') {
-      $subscriber_ids = array_merge(
+      $option_field = NewsletterOptionField::where('name', 'segments')
-        $subscriber_ids,
+        ->where('newsletter_type', 'notification')
-        Helpers::arrayColumn(
+        ->findOne();
-          $segment->subscribers()->findArray(), 'id'
+      $relation = NewsletterOption::where('option_field_id', $option_field->id)
-        )
+        ->findOne();
+      if(!$relation) {
+        $relation = NewsletterOption::create();
+        $relation->newsletter_id = $newsletter->id;
+        $relation->option_field_id = $option_field->id;
+      }
+      $relation->value = serialize($data['segments']);
+      $relation->save();
+
+      $queue = \MailPoet\Models\SendingQueue::where('status', 'scheduled')
+        ->where('newsletter_id', $newsletter->id)
+        ->findOne();
+      if(!$queue) {
+        $queue = \MailPoet\Models\SendingQueue::create();
+        $queue->newsletter_id = $newsletter->id;
+      }
+      $schedule = Cron::factory($newsletter->schedule);
+      $queue->scheduled_at =
+        $schedule->getNextRunDate(current_time('mysql'))->format('Y-m-d H:i:s');
+      $queue->status = 'scheduled';
+      $queue->save();
+      return array(
+        'result' => true,
+        'data' => array(__('Newsletter was scheduled for sending.'))
       );
     }
 
-    if(empty($subscriber_ids)) {
+    $queue = \MailPoet\Models\SendingQueue::create();
+    $queue->newsletter_id = $newsletter->id;
+    $subscribers = SubscriberSegment::whereIn('segment_id', $data['segments'])
+      ->findArray();
+    $subscribers = Helpers::arrayColumn($subscribers, 'subscriber_id');
+    $subscribers = array_unique($subscribers);
+    if(!count($subscribers)) {
       return array(
         'result' => false,
         'errors' => array(__('There are no subscribers.'))
       );
     }
-
-    $subscriber_ids = array_unique($subscriber_ids);
     $queue->subscribers = serialize(
       array(
-        'to_process' => $subscriber_ids
+        'to_process' => $subscribers
       )
     );
-    $queue->count_total = $queue->count_to_process = count($subscriber_ids);
+    $queue->count_total = $queue->count_to_process = count($subscribers);
     $queue->save();
     $errors = $queue->getErrors();
     if(!empty($errors)) {

lib/Segments/WP.php

@@ -2,17 +2,15 @@
 namespace MailPoet\Segments;
 use \MailPoet\Models\Subscriber;
 use \MailPoet\Models\Segment;
+use MailPoet\Newsletter\Scheduler\Scheduler;
 
 class WP {
-  static function synchronizeUser($wp_user_id) {
+  static function synchronizeUser($wp_user_id, $old_wp_user_data = false) {
-    $wpUser = \get_userdata($wp_user_id);
+    $wp_user = \get_userdata($wp_user_id);
     $segment = Segment::getWPUsers();
-
+    if($wp_user === false or $segment === false) return;
-    if($wpUser === false or $segment === false) return;
+    $subscriber = Subscriber::where('wp_user_id', $wp_user->ID)
-
-    $subscriber = Subscriber::where('wp_user_id', $wpUser->ID)
       ->findOne();
-
     switch(current_filter()) {
       case 'delete_user':
       case 'deleted_user':
@@ -20,23 +18,22 @@ class WP {
         if($subscriber !== false && $subscriber->id()) {
           $subscriber->delete();
         }
-      break;
+        break;
-
-      case 'user_register':
-      case 'added_existing_user':
       case 'profile_update':
+      case 'user_register':
+        $schedule_welcome_newsletter = true;
+      case 'added_existing_user':
       default:
         // get first name & last name
-        $first_name = $wpUser->first_name;
+        $first_name = $wp_user->first_name;
-        $last_name = $wpUser->last_name;
+        $last_name = $wp_user->last_name;
-        if(empty($wpUser->first_name) && empty($wpUser->last_name)) {
+        if(empty($wp_user->first_name) && empty($wp_user->last_name)) {
-          $first_name = $wpUser->display_name;
+          $first_name = $wp_user->display_name;
         }
-
         // subscriber data
         $data = array(
-          'wp_user_id'=> $wpUser->ID,
+          'wp_user_id' => $wp_user->ID,
-          'email' => $wpUser->user_email,
+          'email' => $wp_user->user_email,
           'first_name' => $first_name,
           'last_name' => $last_name,
           'status' => 'subscribed'
@@ -46,13 +43,19 @@ class WP {
           $data['id'] = $subscriber->id();
         }
         $subscriber = Subscriber::createOrUpdate($data);
-
         if($subscriber->getErrors() === false && $subscriber->id > 0) {
           if($segment !== false) {
             $segment->addSubscriber($subscriber->id);
           }
+          if(isset($schedule_welcome_newsletter)) {
+            Scheduler::welcomeForNewWPUser(
+              $subscriber->id,
+              (array) $wp_user,
+              $old_wp_user_data
+            );
+          }
         }
-      break;
+        break;
     }
   }
 

lib/Settings/Hosts.php

@@ -18,23 +18,6 @@ class Hosts {
         'EU (Ireland)' => 'eu-west-1'
       )
     ),
-    'ElasticEmail' => array(
-      'name' => 'ElasticEmail',
-      'emails' => 100,
-      'interval' => 5,
-      'fields' => array(
-        'api_key'
-      )
-    ),
-    'MailGun' => array(
-      'name' => 'MailGun',
-      'emails' => 100,
-      'interval' => 5,
-      'fields' => array(
-        'domain',
-        'api_key'
-      )
-    ),
     'SendGrid' => array(
       'name' => 'SendGrid',
       'emails' => 100,

lib/Settings/Pages.php

@@ -66,9 +66,8 @@ class Pages {
       'id' => $page->ID,
       'title' => $page->post_title,
       'preview_url' => add_query_arg(array(
-        'preview' => 1
+        'mailpoet_preview' => 1
-      ), get_permalink($page->ID)),
+      ), get_permalink($page->ID))
-      'edit_url' => get_edit_post_link($page->ID)
     );
   }
 }

lib/Subscribers/ImportExport/Export/Export.php

@@ -226,7 +226,7 @@ class Export {
   function getExportFileURL($file) {
     return sprintf(
       '%s/%s',
-      Env::$temp_URL,
+      Env::$temp_url,
       basename($file)
     );
   }

lib/Subscription/Pages.php

@@ -8,6 +8,7 @@ use \MailPoet\Models\Setting;
 use \MailPoet\Models\Segment;
 use \MailPoet\Util\Helpers;
 use \MailPoet\Util\Url;
+use \MailPoet\Subscription;
 
 class Pages {
   const DEMO_EMAIL = 'demo@mailpoet.com';
@@ -16,10 +17,12 @@ class Pages {
   }
 
   function init() {
-    if(isset($_GET['mailpoet_page'])) {
+    $action = $this->getAction();
-      add_filter('wp_title', array($this,'setWindowTitle'));
+    if($action !== null) {
-      add_filter('the_title', array($this,'setPageTitle'));
+      add_filter('wp_title', array($this,'setWindowTitle'), 10, 3);
-      add_filter('the_content', array($this,'setPageContent'));
+      add_filter('document_title_parts', array($this,'setWindowTitleParts'), 10, 1);
+      add_filter('the_title', array($this,'setPageTitle'), 10, 1);
+      add_filter('the_content', array($this,'setPageContent'), 10, 1);
     }
     add_action(
       'admin_post_mailpoet_subscriber_save',
@@ -42,49 +45,94 @@ class Pages {
       $_POST,
       array_flip($reserved_keywords)
     );
-
+    if(isset($subscriber_data['email'])) {
-    $subscriber = Subscriber::createOrUpdate($subscriber_data);
+      if($subscriber_data['email'] !== self::DEMO_EMAIL) {
-    $errors = $subscriber->getErrors();
+        $subscriber = Subscriber::createOrUpdate($subscriber_data);
-
+        $errors = $subscriber->getErrors();
+      }
+    }
     // TBD: success/error messages (not present in MP2)
 
     Url::redirectBack();
   }
 
   function isPreview() {
-    return (array_key_exists('preview', $_GET));
+    return (array_key_exists('mailpoet_preview', $_GET));
   }
 
-  function setWindowTitle() {
+  function setWindowTitle($title, $separator, $separator_location = 'right') {
-    // TODO
+    $title_parts = explode(" $separator ", $title);
-  }
+    if($separator_location === 'right') {
-
+      // first part
-  function setPageTitle($title = null) {
+      $title_parts[0] = $this->setPageTitle($title_parts[0]);
-    $subscriber = $this->getSubscriber();
+    } else {
-
+      // last part
-    switch($this->getAction()) {
+      $last_index = count($title_parts) - 1;
-      case 'confirm':
+      $title_parts[$last_index] = $this->setPageTitle($title_parts[$last_index]);
-        return $this->getConfirmTitle($subscriber);
-      break;
-
-      case 'edit':
-        return $this->getEditTitle($subscriber);
-      break;
-
-      case 'unsubscribe':
-        if($subscriber !== false) {
-          if($subscriber->status !== Subscriber::STATUS_UNSUBSCRIBED) {
-            $subscriber->status = Subscriber::STATUS_UNSUBSCRIBED;
-            $subscriber->save();
-          }
-        }
-        return $this->getUnsubscribeTitle($subscriber);
-      break;
     }
-    return $title;
+    return implode(" $separator ", $title_parts);
+  }
+
+  function setWindowTitleParts($meta = array()) {
+    $meta['title'] = $this->setPageTitle($meta['title']);
+    return $meta;
+  }
+
+  function isMailPoetPage($page_id = null) {
+    $mailpoet_page_ids = array_unique(array_values(
+      Setting::getValue('subscription', array())
+    ));
+
+    return (in_array($page_id, $mailpoet_page_ids));
+  }
+
+  function setPageTitle($page_title = '') {
+    global $post;
+
+    if($post->post_title !== __('MailPoet Page')) return $page_title;
+
+    if(
+      ($this->isMailPoetPage($post->ID) === false)
+      ||
+      ($page_title !== single_post_title('', false))
+    ) {
+      return $page_title;
+    } else {
+      $subscriber = $this->getSubscriber();
+      switch($this->getAction()) {
+        case 'confirm':
+          return $this->getConfirmTitle($subscriber);
+        break;
+
+        case 'manage':
+          return $this->getManageTitle($subscriber);
+        break;
+
+        case 'unsubscribe':
+          if($subscriber !== false) {
+            if($subscriber->status !== Subscriber::STATUS_UNSUBSCRIBED) {
+              $subscriber->status = Subscriber::STATUS_UNSUBSCRIBED;
+              $subscriber->save();
+            }
+          }
+          return $this->getUnsubscribeTitle($subscriber);
+        break;
+      }
+    }
+    return $page_title;
   }
 
   function setPageContent($page_content = '[mailpoet_page]') {
+    global $post;
+
+    if(
+      ($this->isPreview() === false)
+      &&
+      ($this->isMailPoetPage($post->ID) === false)
+    ) {
+      return $page_content;
+    }
+
     $content = '';
     $subscriber = $this->getSubscriber();
 
@@ -92,8 +140,8 @@ class Pages {
       case 'confirm':
         $content = $this->getConfirmContent($subscriber);
       break;
-      case 'edit':
+      case 'manage':
-        $content = $this->getEditContent($subscriber);
+        $content = $this->getManageContent($subscriber);
       break;
       case 'unsubscribe':
         $content = $this->getUnsubscribeContent($subscriber);
@@ -132,7 +180,7 @@ class Pages {
     return $title;
   }
 
-  private function getEditTitle($subscriber) {
+  private function getManageTitle($subscriber) {
     if($this->isPreview()) {
       return sprintf(
         __('Edit your subscriber profile: %s'),
@@ -159,7 +207,7 @@ class Pages {
     }
   }
 
-  private function getEditContent($subscriber) {
+  private function getManageContent($subscriber) {
     if($this->isPreview()) {
       $subscriber = Subscriber::create();
       $subscriber->hydrate(array(
@@ -213,7 +261,8 @@ class Pages {
         'params' => array(
           'label' => __('Email'),
           'required' => true,
-          'value' => $subscriber->email
+          'value' => $subscriber->email,
+          'readonly' => true
         )
       ),
       array(
@@ -253,14 +302,6 @@ class Pages {
               'is_checked' => (
                 $subscriber->status === Subscriber::STATUS_UNSUBSCRIBED
               )
-            ),
-            array(
-              'value' => array(
-                Subscriber::STATUS_UNCONFIRMED => __('Unconfirmed')
-              ),
-              'is_checked' => (
-                $subscriber->status === Subscriber::STATUS_UNCONFIRMED
-              )
             )
           )
         )
@@ -310,7 +351,7 @@ class Pages {
         $content .= '<p><strong>'.
           str_replace(
             array('[link]', '[/link]'),
-            array('<a href="'.$subscriber->getConfirmationUrl().'">', '</a>'),
+            array('<a href="'.Subscription\Url::getConfirmationUrl($subscriber).'">', '</a>'),
             __('You made a mistake? [link]Undo unsubscribe.[/link]')
           ).
         '</strong></p>';

lib/Subscription/Url.php

@@ -0,0 +1,57 @@
+<?php
+namespace MailPoet\Subscription;
+
+use \MailPoet\Models\Subscriber;
+use \MailPoet\Models\Setting;
+
+class Url {
+  static function getConfirmationUrl($subscriber = false) {
+    $post = get_post(Setting::getValue('subscription.confirmation_page'));
+    return self::getSubscriptionUrl($post, 'confirm', $subscriber);
+  }
+
+  static function getManageUrl($subscriber = false) {
+    $post = get_post(Setting::getValue('subscription.manage_page'));
+    return self::getSubscriptionUrl($post, 'manage', $subscriber);
+  }
+
+  static function getUnsubscribeUrl($subscriber = false) {
+    $post = get_post(Setting::getValue('subscription.unsubscribe_page'));
+    return self::getSubscriptionUrl($post, 'unsubscribe', $subscriber);
+  }
+
+  private static function getSubscriptionUrl(
+    $post = null, $action = null, $subscriber = false
+  ) {
+    if($post === null || $action === null) return;
+
+    $url = get_permalink($post);
+
+    if($subscriber !== false) {
+
+      if(is_object($subscriber)) {
+        $subscriber = $subscriber->asArray();
+      }
+
+      $params = array(
+        'mailpoet_action='.$action,
+        'mailpoet_token='.Subscriber::generateToken($subscriber['email']),
+        'mailpoet_email='.$subscriber['email']
+      );
+    } else {
+      $params = array(
+        'mailpoet_action='.$action,
+        'mailpoet_preview=1'
+      );
+    }
+    // add parameters
+    $url .= (parse_url($url, PHP_URL_QUERY) ? '&' : '?').join('&', $params);
+
+    $url_params = parse_url($url);
+    if(empty($url_params['scheme'])) {
+      $url = get_bloginfo('url').$url;
+    }
+
+    return $url;
+  }
+}

lib/Twig/i18n.php

@@ -42,10 +42,9 @@ class i18n extends \Twig_Extension {
     $output = array();
 
     $output[] = '<script type="text/javascript">';
-    $output[] = ' var MailPoetI18n = MailPoetI18n || {}';
     foreach($translations as $key => $translation) {
       $output[] =
-        'MailPoetI18n["'.$key.'"] = "'. str_replace('"', '\"', $translation) . '";';
+        'MailPoet.I18n.add("'.$key.'", "'. str_replace('"', '\"', $translation) . '");';
     }
     $output[] = '</script>';
     return join("\n", $output);

lib/Util/CSS.php

@@ -116,6 +116,7 @@ class CSS {
   public function parseCSS($text)
   {
     $css  = new csstidy();
+    $css->settings['compress_colors'] = false;
     $css->parse($text);
 
     $rules    = array();

mailpoet.php

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