Merge pull request #662 from mailpoet/security_issue_634

PHP Object injection in front Router

.gitignore

@@ -17,3 +17,4 @@ tests/javascript/testBundles
 assets/css/*.css
 assets/js/*.js
 .vagrant
+lang

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

@@ -4,7 +4,7 @@
 
 .mailpoet_input_title,
 .mailpoet_input_preheader
-  width: 400px
+  width: 500px
   padding: 3px
   line-height: normal
 

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

@@ -89,10 +89,17 @@ function(
       if(this.props.field['selected'] !== undefined) {
         return this.props.field['selected'](this.props.item);
       } else if(this.props.item !== undefined && this.props.field.name !== undefined) {
-        return this.props.item[this.props.field.name];
-      } else {
-        return null;
+        if (this.allowMultipleValues()) {
+          if (Array.isArray(this.props.item[this.props.field.name])) {
+            return this.props.item[this.props.field.name].map(function(item) {
+              return item.id;
+            });
+          }
+        } else {
+          return this.props.item[this.props.field.name];
+        }
       }
+      return null;
     },
     loadCachedItems: function() {
       if(typeof(window['mailpoet_'+this.props.field.endpoint]) !== 'undefined') {

assets/js/src/form/form.jsx

@@ -66,22 +66,22 @@ define(
         MailPoet.Ajax.post({
           endpoint: this.props.endpoint,
           action: 'get',
-          data: id
-        }).done(function(response) {
-          if(response === false) {
-            this.setState({
-              loading: false,
-              item: {}
-            }, function() {
-              this.context.router.push('/new');
-            }.bind(this));
-          } else {
-            this.setState({
-              loading: false,
-              item: response
-            });
+          data: {
+            id: id
           }
-        }.bind(this));
+        }).done((response) => {
+          this.setState({
+            loading: false,
+            item: response.data
+          });
+        }).fail((response) => {
+          this.setState({
+            loading: false,
+            item: {}
+          }, function() {
+            this.context.router.push('/new');
+          });
+        });
       },
       handleSubmit: function(e) {
         e.preventDefault();
@@ -115,29 +115,25 @@ define(
           endpoint: this.props.endpoint,
           action: 'save',
           data: item
-        }).done(function(response) {
+        }).always(() => {
           this.setState({ loading: false });
-
-          if(response.result === true) {
-            if(this.props.onSuccess !== undefined) {
-              this.props.onSuccess();
-            } else {
-              this.context.router.push('/');
-            }
-
-            if(this.props.params.id !== undefined) {
-              this.props.messages.onUpdate();
-            } else {
-              this.props.messages.onCreate();
-            }
+        }).done((response) => {
+          if(this.props.onSuccess !== undefined) {
+            this.props.onSuccess();
           } else {
-            if(response.result === false) {
-              if(response.errors.length > 0) {
-                this.setState({ errors: response.errors });
-              }
-            }
+            this.context.router.push('/');
           }
-        }.bind(this));
+
+          if(this.props.params.id !== undefined) {
+            this.props.messages.onUpdate();
+          } else {
+            this.props.messages.onCreate();
+          }
+        }).fail((response) => {
+          if(response.errors.length > 0) {
+            this.setState({ errors: response.errors });
+          }
+        });
       },
       handleValueChange: function(e) {
         if (this.props.onChange) {
@@ -159,7 +155,7 @@ define(
           var errors = this.getErrors().map(function(error, index) {
             return (
               <p key={ 'error-'+index } className="mailpoet_error">
-                { error }
+                { error.message }
               </p>
             );
           });

assets/js/src/forms/list.jsx

@@ -27,48 +27,48 @@ const columns = [
 ];
 
 const messages = {
-  onTrash: function(response) {
-    var count = ~~response;
-    var message = null;
+  onTrash: (response) => {
+    const count = ~~response.meta.count;
+    let message = null;
 
-    if(count === 1) {
+    if (count === 1) {
       message = (
         MailPoet.I18n.t('oneFormTrashed')
       );
     } else {
       message = (
         MailPoet.I18n.t('multipleFormsTrashed')
-      ).replace('%$1d', count);
+      ).replace('%$1d', count.toLocaleString());
     }
     MailPoet.Notice.success(message);
   },
-  onDelete: function(response) {
-    var count = ~~response;
-    var message = null;
+  onDelete: (response) => {
+    const count = ~~response.meta.count;
+    let message = null;
 
-    if(count === 1) {
+    if (count === 1) {
       message = (
         MailPoet.I18n.t('oneFormDeleted')
       );
     } else {
       message = (
         MailPoet.I18n.t('multipleFormsDeleted')
-      ).replace('%$1d', count);
+      ).replace('%$1d', count.toLocaleString());
     }
     MailPoet.Notice.success(message);
   },
-  onRestore: function(response) {
-    var count = ~~response;
-    var message = null;
+  onRestore: (response) => {
+    const count = ~~response.meta.count;
+    let message = null;
 
-    if(count === 1) {
+    if (count === 1) {
       message = (
         MailPoet.I18n.t('oneFormRestored')
       );
     } else {
       message = (
         MailPoet.I18n.t('multipleFormsRestored')
-      ).replace('%$1d', count);
+      ).replace('%$1d', count.toLocaleString());
     }
     MailPoet.Notice.success(message);
   }
@@ -99,14 +99,21 @@ const item_actions = [
       return MailPoet.Ajax.post({
         endpoint: 'forms',
         action: 'duplicate',
-        data: item.id
-      }).done(function(response) {
-        if (response !== false && response['name'] !== undefined) {
-          MailPoet.Notice.success(
-            (MailPoet.I18n.t('formDuplicated')).replace('%$1s', response.name)
+        data: {
+          id: item.id
+        }
+      }).done((response) => {
+        MailPoet.Notice.success(
+          (MailPoet.I18n.t('formDuplicated')).replace('%$1s', response.data.name)
+        );
+        refresh();
+      }).fail((response) => {
+        if (response.errors.length > 0) {
+          MailPoet.Notice.error(
+            response.errors.map(function(error) { return error.message; }),
+            { scroll: true }
           );
         }
-        refresh();
       });
     }
   },
@@ -120,9 +127,14 @@ const FormList = React.createClass({
     MailPoet.Ajax.post({
       endpoint: 'forms',
       action: 'create'
-    }).done(function(response) {
-      if(response.result && response.form_id) {
-        window.location = mailpoet_form_edit_url + response.form_id;
+    }).done((response) => {
+      window.location = mailpoet_form_edit_url + response.data.id;
+    }).fail((response) => {
+      if (response.errors.length > 0) {
+        MailPoet.Notice.error(
+          response.errors.map(function(error) { return error.message; }),
+          { scroll: true }
+        );
       }
     });
   },
@@ -139,6 +151,10 @@ const FormList = React.createClass({
       return segment.name;
     }).join(', ');
 
+    if (form.settings.segments_selected_by === 'user') {
+      segments = MailPoet.I18n.t('userChoice') + ' ' + segments;
+    }
+
     return (
       <div>
         <td className={ row_classes }>

assets/js/src/listing/bulk_actions.jsx

@@ -53,7 +53,10 @@ function(
       }
 
       if(data.action) {
-        this.props.onBulkAction(selected_ids, data).then(onSuccess);
+        const promise = this.props.onBulkAction(selected_ids, data);
+        if (promise !== false) {
+          promise.then(onSuccess);
+        };
       }
 
       this.setState({

assets/js/src/listing/listing.jsx

@@ -456,22 +456,29 @@ const Listing = React.createClass({
           sort_by: this.state.sort_by,
           sort_order: this.state.sort_order
         }
-      }).done(function(response) {
+      }).always(() => {
+        this.setState({ loading: false });
+      }).done((response) => {
         this.setState({
-          items: response.items || [],
-          filters: response.filters || {},
-          groups: response.groups || [],
-          count: response.count || 0,
-          loading: false
-        }, function() {
-          if (this.props['onGetItems'] !== undefined) {
-            const count = (response.groups[0] !== undefined)
-              ? ~~(response.groups[0].count)
-              : 0;
-            this.props.onGetItems(count);
+          items: response.data || [],
+          filters: response.meta.filters || {},
+          groups: response.meta.groups || [],
+          count: response.meta.count || 0
+        }, () => {
+          // if viewing an empty trash
+          if (this.state.group === 'trash' && response.meta.count === 0) {
+            // redirect to default group
+            this.handleGroup('all');
           }
-        }.bind(this));
-      }.bind(this));
+        });
+      }).fail(function(response) {
+        if (response.errors.length > 0) {
+          MailPoet.Notice.error(
+            response.errors.map(function(error) { return error.message; }),
+            { scroll: true }
+          );
+        }
+      });
     }
   },
   handleRestoreItem: function(id) {
@@ -483,8 +490,10 @@ const Listing = React.createClass({
     MailPoet.Ajax.post({
       endpoint: this.props.endpoint,
       action: 'restore',
-      data: id
-    }).done(function(response) {
+      data: {
+        id: id
+      }
+    }).done((response) => {
       if (
         this.props.messages !== undefined
         && this.props.messages['onRestore'] !== undefined
@@ -492,7 +501,12 @@ const Listing = React.createClass({
         this.props.messages.onRestore(response);
       }
       this.getItems();
-    }.bind(this));
+    }).fail((response) => {
+      MailPoet.Notice.error(
+        response.errors.map(function(error) { return error.message; }),
+        { scroll: true }
+      );
+    });
   },
   handleTrashItem: function(id) {
     this.setState({
@@ -503,8 +517,10 @@ const Listing = React.createClass({
     MailPoet.Ajax.post({
       endpoint: this.props.endpoint,
       action: 'trash',
-      data: id
-    }).done(function(response) {
+      data: {
+        id: id
+      }
+    }).done((response) => {
       if (
         this.props.messages !== undefined
         && this.props.messages['onTrash'] !== undefined
@@ -512,7 +528,12 @@ const Listing = React.createClass({
         this.props.messages.onTrash(response);
       }
       this.getItems();
-    }.bind(this));
+    }).fail((response) => {
+      MailPoet.Notice.error(
+        response.errors.map(function(error) { return error.message; }),
+        { scroll: true }
+      );
+    });
   },
   handleDeleteItem: function(id) {
     this.setState({
@@ -523,8 +544,10 @@ const Listing = React.createClass({
     MailPoet.Ajax.post({
       endpoint: this.props.endpoint,
       action: 'delete',
-      data: id
-    }).done(function(response) {
+      data: {
+        id: id
+      }
+    }).done((response) => {
       if (
         this.props.messages !== undefined
         && this.props.messages['onDelete'] !== undefined
@@ -532,22 +555,29 @@ const Listing = React.createClass({
         this.props.messages.onDelete(response);
       }
       this.getItems();
-    }.bind(this));
+    }).fail((response) => {
+      MailPoet.Notice.error(
+        response.errors.map(function(error) { return error.message; }),
+        { scroll: true }
+      );
+    });
   },
   handleEmptyTrash: function() {
     return this.handleBulkAction('all', {
       action: 'delete',
       group: 'trash'
-    }).then(function(response) {
-      if (~~(response) > 0) {
-        MailPoet.Notice.success(
-          MailPoet.I18n.t('permanentlyDeleted').replace('%d', response)
-        );
-      }
-
+    }).done((response) => {
+      MailPoet.Notice.success(
+        MailPoet.I18n.t('permanentlyDeleted').replace('%d', response.meta.count)
+      );
       // redirect to default group
       this.handleGroup('all');
-    }.bind(this));
+    }).fail((response) => {
+      MailPoet.Notice.error(
+        response.errors.map(function(error) { return error.message; }),
+        { scroll: true }
+      );
+    });
   },
   handleBulkAction: function(selected_ids, params) {
     if (
@@ -555,7 +585,7 @@ const Listing = React.createClass({
       && this.state.selected_ids.length === 0
       && selected_ids !== 'all'
     ) {
-      return;
+      return false;
     }
 
     this.setState({ loading: true });
@@ -594,7 +624,7 @@ const Listing = React.createClass({
   handleSort: function(sort_by, sort_order = 'asc') {
     this.setState({
       sort_by: sort_by,
-      sort_order: sort_order,
+      sort_order: (sort_order === 'asc') ? 'asc' : 'desc',
     }, function() {
       this.setParams();
     }.bind(this));

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

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

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

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

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

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

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

@@ -11,7 +11,7 @@ define([
     return MailPoet.Ajax.post({
       endpoint: 'automatedLatestContent',
       action: args.action,
-      data: args.options || {},
+      data: args.options || {}
     });
   };
   Module._cachedQuery = _.memoize(Module._query, JSON.stringify);
@@ -19,14 +19,14 @@ define([
   Module.getNewsletter = function(options) {
     return Module._query({
       action: 'get',
-      options: options,
+      options: options
     });
   };
 
   Module.getPostTypes = function() {
     return Module._cachedQuery({
       action: 'getPostTypes',
-      options: {},
+      options: {}
     }).then(function(response) {
       return _.values(response.data);
     });
@@ -83,7 +83,7 @@ define([
     return MailPoet.Ajax.post({
       endpoint: 'newsletters',
       action: 'save',
-      data: options || {},
+      data: options || {}
     });
   };
 
@@ -91,7 +91,7 @@ define([
     return MailPoet.Ajax.post({
       endpoint: 'newsletters',
       action: 'sendPreview',
-      data: options || {},
+      data: options || {}
     });
   };
 

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

@@ -252,32 +252,31 @@ define([
         endpoint: 'newsletters',
         action: 'showPreview',
         data: json,
-      }).done(function(response) {
-        if (response.result === true) {
-          this.previewView = new Module.NewsletterPreviewView({
-            previewUrl: response.data.url
-          });
-
-          var view = this.previewView.render();
-
-          MailPoet.Modal.popup({
-            template: '',
-            element: this.previewView.$el,
-            title: MailPoet.I18n.t('newsletterPreview'),
-            onCancel: function() {
-              this.previewView.destroy();
-              this.previewView = null;
-            }.bind(this)
-          });
-        } else {
-          MailPoet.Notice.error(response.errors);
-        }
-      }.bind(this)).fail(function(error) {
-        MailPoet.Notice.error(
-          MailPoet.I18n.t('newsletterPreviewFailed')
-        );
       }).always(function() {
         MailPoet.Modal.loading(false);
+      }).done(function(response) {
+        this.previewView = new Module.NewsletterPreviewView({
+          previewUrl: response.meta.preview_url
+        });
+
+        var view = this.previewView.render();
+
+        MailPoet.Modal.popup({
+          template: '',
+          element: this.previewView.$el,
+          title: MailPoet.I18n.t('newsletterPreview'),
+          onCancel: function() {
+            this.previewView.destroy();
+            this.previewView = null;
+          }.bind(this)
+        });
+      }.bind(this)).fail(function(response) {
+        if (response.errors.length > 0) {
+          MailPoet.Notice.error(
+            response.errors.map(function(error) { return error.message; }),
+            { scroll: true }
+          );
+        }
       });
     },
     sendPreview: function() {
@@ -302,28 +301,19 @@ define([
       // send test email
       MailPoet.Modal.loading(true);
 
-      CommunicationComponent.previewNewsletter(data).done(function(response) {
-        if(response.result !== undefined && response.result === true) {
-          MailPoet.Notice.success(MailPoet.I18n.t('newsletterPreviewSent'), { scroll: true });
-        } else {
-          if (_.isArray(response.errors)) {
-            response.errors.map(function(error) {
-              MailPoet.Notice.error(error, { scroll: true });
-            });
-          } else {
-            MailPoet.Notice.error(
-              MailPoet.I18n.t('newsletterPreviewFailedToSend'),
-              {
-                scroll: true,
-                static: true,
-              }
-            );
-          }
-        }
+      CommunicationComponent.previewNewsletter(data).always(function() {
         MailPoet.Modal.loading(false);
+      }).done(function(response) {
+        MailPoet.Notice.success(
+          MailPoet.I18n.t('newsletterPreviewSent'),
+          { scroll: true });
       }).fail(function(response) {
-        // an error occurred
-        MailPoet.Modal.loading(false);
+        if (response.errors.length > 0) {
+          MailPoet.Notice.error(
+            response.errors.map(function(error) { return error.message; }),
+            { scroll: true, static: true }
+          );
+        }
       });
     },
   });

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

@@ -17,8 +17,8 @@ import {
 } from 'newsletters/scheduling/common.jsx'
 
 const messages = {
-  onTrash(response) {
-    const count = ~~response;
+  onTrash: (response) => {
+    const count = ~~response.meta.count;
     let message = null;
 
     if (count === 1) {
@@ -28,12 +28,12 @@ const messages = {
     } else {
       message = (
         MailPoet.I18n.t('multipleNewslettersTrashed')
-      ).replace('%$1d', count);
+      ).replace('%$1d', count.toLocaleString());
     }
     MailPoet.Notice.success(message);
   },
-  onDelete(response) {
-    const count = ~~response;
+  onDelete: (response) => {
+    const count = ~~response.meta.count;
     let message = null;
 
     if (count === 1) {
@@ -43,12 +43,12 @@ const messages = {
     } else {
       message = (
         MailPoet.I18n.t('multipleNewslettersDeleted')
-      ).replace('%$1d', count);
+      ).replace('%$1d', count.toLocaleString());
     }
     MailPoet.Notice.success(message);
   },
-  onRestore(response) {
-    const count = ~~response;
+  onRestore: (response) => {
+    const count = ~~response.meta.count;
     let message = null;
 
     if (count === 1) {
@@ -58,7 +58,7 @@ const messages = {
     } else {
       message = (
         MailPoet.I18n.t('multipleNewslettersRestored')
-      ).replace('%$1d', count);
+      ).replace('%$1d', count.toLocaleString());
     }
     MailPoet.Notice.success(message);
   }
@@ -127,16 +127,23 @@ const newsletter_actions = [
       return MailPoet.Ajax.post({
         endpoint: 'newsletters',
         action: 'duplicate',
-        data: newsletter.id
-      }).done(function(response) {
-        if (response !== false && response.subject !== undefined) {
-          MailPoet.Notice.success(
-            (MailPoet.I18n.t('newsletterDuplicated')).replace(
-              '%$1s', response.subject
-            )
+        data: {
+          id: newsletter.id
+        }
+      }).done((response) => {
+        MailPoet.Notice.success(
+          (MailPoet.I18n.t('newsletterDuplicated')).replace(
+            '%$1s', response.data.subject
+          )
+        );
+        refresh();
+      }).fail((response) => {
+        if (response.errors.length > 0) {
+          MailPoet.Notice.error(
+            response.errors.map(function(error) { return error.message; }),
+            { scroll: true }
           );
         }
-        refresh();
       });
     }
   },

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

@@ -12,8 +12,8 @@ import { QueueMixin, StatisticsMixin } from 'newsletters/listings/mixins.jsx'
 const mailpoet_tracking_enabled = (!!(window['mailpoet_tracking_enabled']));
 
 const messages = {
-  onTrash(response) {
-    const count = ~~response;
+  onTrash: (response) => {
+    const count = ~~response.meta.count;
     let message = null;
 
     if (count === 1) {
@@ -23,12 +23,12 @@ const messages = {
     } else {
       message = (
         MailPoet.I18n.t('multipleNewslettersTrashed')
-      ).replace('%$1d', count);
+      ).replace('%$1d', count.toLocaleString());
     }
     MailPoet.Notice.success(message);
   },
-  onDelete(response) {
-    const count = ~~response;
+  onDelete: (response) => {
+    const count = ~~response.meta.count;
     let message = null;
 
     if (count === 1) {
@@ -38,12 +38,12 @@ const messages = {
     } else {
       message = (
         MailPoet.I18n.t('multipleNewslettersDeleted')
-      ).replace('%$1d', count);
+      ).replace('%$1d', count.toLocaleString());
     }
     MailPoet.Notice.success(message);
   },
-  onRestore(response) {
-    const count = ~~response;
+  onRestore: (response) => {
+    const count = ~~response.meta.count;
     let message = null;
 
     if (count === 1) {
@@ -53,7 +53,7 @@ const messages = {
     } else {
       message = (
         MailPoet.I18n.t('multipleNewslettersRestored')
-      ).replace('%$1d', count);
+      ).replace('%$1d', count.toLocaleString());
     }
     MailPoet.Notice.success(message);
   }
@@ -122,16 +122,23 @@ const newsletter_actions = [
       return MailPoet.Ajax.post({
         endpoint: 'newsletters',
         action: 'duplicate',
-        data: newsletter.id
-      }).done(function(response) {
-        if (response !== false && response.subject !== undefined) {
-          MailPoet.Notice.success(
-            (MailPoet.I18n.t('newsletterDuplicated')).replace(
-              '%$1s', response.subject
-            )
+        data: {
+          id: newsletter.id
+        }
+      }).done((response) => {
+        MailPoet.Notice.success(
+          (MailPoet.I18n.t('newsletterDuplicated')).replace(
+            '%$1s', response.data.subject
+          )
+        );
+        refresh();
+      }).fail((response) => {
+        if (response.errors.length > 0) {
+          MailPoet.Notice.error(
+            response.errors.map(function(error) { return error.message; }),
+            { scroll: true }
           );
         }
-        refresh();
       });
     }
   },

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

@@ -15,8 +15,8 @@ const mailpoet_segments = window.mailpoet_segments || {};
 const mailpoet_tracking_enabled = (!!(window['mailpoet_tracking_enabled']));
 
 const messages = {
-  onTrash(response) {
-    const count = ~~response;
+  onTrash: (response) => {
+    const count = ~~response.meta.count;
     let message = null;
 
     if (count === 1) {
@@ -26,12 +26,12 @@ const messages = {
     } else {
       message = (
         MailPoet.I18n.t('multipleNewslettersTrashed')
-      ).replace('%$1d', count);
+      ).replace('%$1d', count.toLocaleString());
     }
     MailPoet.Notice.success(message);
   },
-  onDelete(response) {
-    const count = ~~response;
+  onDelete: (response) => {
+    const count = ~~response.meta.count;
     let message = null;
 
     if (count === 1) {
@@ -41,12 +41,12 @@ const messages = {
     } else {
       message = (
         MailPoet.I18n.t('multipleNewslettersDeleted')
-      ).replace('%$1d', count);
+      ).replace('%$1d', count.toLocaleString());
     }
     MailPoet.Notice.success(message);
   },
-  onRestore(response) {
-    const count = ~~response;
+  onRestore: (response) => {
+    const count = ~~response.meta.count;
     let message = null;
 
     if (count === 1) {
@@ -56,7 +56,7 @@ const messages = {
     } else {
       message = (
         MailPoet.I18n.t('multipleNewslettersRestored')
-      ).replace('%$1d', count);
+      ).replace('%$1d', count.toLocaleString());
     }
     MailPoet.Notice.success(message);
   }
@@ -125,16 +125,23 @@ const newsletter_actions = [
       return MailPoet.Ajax.post({
         endpoint: 'newsletters',
         action: 'duplicate',
-        data: newsletter.id
-      }).done(function(response) {
-        if (response !== false && response.subject !== undefined) {
-          MailPoet.Notice.success(
-            (MailPoet.I18n.t('newsletterDuplicated')).replace(
-              '%$1s', response.subject
-            )
+        data: {
+          id: newsletter.id
+        }
+      }).done((response) => {
+        MailPoet.Notice.success(
+          (MailPoet.I18n.t('newsletterDuplicated')).replace(
+            '%$1s', response.data.subject
+          )
+        );
+        refresh();
+      }).fail((response) => {
+        if (response.errors.length > 0) {
+          MailPoet.Notice.error(
+            response.errors.map(function(error) { return error.message; }),
+            { scroll: true }
           );
         }
-        refresh();
       });
     }
   },

assets/js/src/newsletters/send.jsx

@@ -66,22 +66,22 @@ define(
         MailPoet.Ajax.post({
           endpoint: 'newsletters',
           action: 'get',
-          data: id
-        }).done((response) => {
-          if(response === false) {
-            this.setState({
-              loading: false,
-              item: {},
-            }, function() {
-              this.context.router.push('/new');
-            }.bind(this));
-          } else {
-            this.setState({
-              loading: false,
-              item: response,
-              fields: this.getFieldsByNewsletter(response),
-            });
+          data: {
+            id: id
           }
+        }).done((response) => {
+          this.setState({
+            loading: false,
+            item: response.data,
+            fields: this.getFieldsByNewsletter(response.data)
+          });
+        }).fail((response) => {
+          this.setState({
+            loading: false,
+            item: {}
+          }, () => {
+            this.context.router.push('/new');
+          });
         });
       },
       handleSend: function(e) {

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

@@ -40,11 +40,7 @@ define(
           return !!(!segment.deleted_at);
         },
         getLabel: function(segment) {
-          var name = segment.name;
-          if (segment.subscribers > 0) {
-            name += ' (%$1s)'.replace('%$1s', parseInt(segment.subscribers).toLocaleString());
-          }
-          return name;
+          return segment.name + ' (' + parseInt(segment.subscribers).toLocaleString() + ')';
         },
         validation: {
           'data-parsley-required': true,

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

@@ -346,11 +346,7 @@ define(
           return !!(!segment.deleted_at);
         },
         getLabel: function(segment) {
-          var name = segment.name;
-          if (segment.subscribers > 0) {
-            name += ' (%$1s)'.replace('%$1s', parseInt(segment.subscribers).toLocaleString());
-          }
-          return name;
+          return segment.name + ' (' + parseInt(segment.subscribers).toLocaleString() + ')';
         },
         validation: {
           'data-parsley-required': true,

assets/js/src/newsletters/types.jsx

@@ -28,17 +28,16 @@ define(
             type: type,
             subject: MailPoet.I18n.t('draftNewsletterTitle'),
           }
-        }).done(function(response) {
-          if(response.result && response.newsletter.id) {
-            this.context.router.push(`/template/${response.newsletter.id}`);
-          } else {
-            if(response.errors.length > 0) {
-              response.errors.map(function(error) {
-                MailPoet.Notice.error(error);
-              });
-            }
+        }).done((response) => {
+          this.context.router.push(`/template/${response.data.id}`);
+        }).fail((response) => {
+          if (response.errors.length > 0) {
+            MailPoet.Notice.error(
+              response.errors.map(function(error) { return error.message; }),
+              { scroll: true }
+            );
           }
-        }.bind(this));
+        });
       },
       render: function() {
         return (

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

@@ -50,17 +50,16 @@ define(
             type: 'notification',
             subject: MailPoet.I18n.t('draftNewsletterTitle'),
           }),
-        }).done(function(response) {
-          if(response.result && response.newsletter.id) {
-            this.showTemplateSelection(response.newsletter.id);
-          } else {
-            if(response.errors.length > 0) {
-              response.errors.map(function(error) {
-                MailPoet.Notice.error(error);
-              });
-            }
+        }).done((response) => {
+          this.showTemplateSelection(response.data.id);
+        }).fail((response) => {
+          if (response.errors.length > 0) {
+            MailPoet.Notice.error(
+              response.errors.map(function(error) { return error.message; }),
+              { scroll: true }
+            );
           }
-        }.bind(this));
+        });
       },
       showTemplateSelection: function(newsletterId) {
         this.context.router.push(`/template/${newsletterId}`);

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

@@ -25,19 +25,18 @@ define(
           endpoint: 'newsletters',
           action: 'create',
           data: {
-            type: 'standard',
+            type: 'standard'
           }
-        }).done(function(response) {
-          if(response.result && response.newsletter.id) {
-            this.showTemplateSelection(response.newsletter.id);
-          } else {
-            if(response.errors.length > 0) {
-              response.errors.map(function(error) {
-                MailPoet.Notice.error(error);
-              });
-            }
+        }).done((response) => {
+          this.showTemplateSelection(response.data.id);
+        }).fail((response) => {
+          if (response.errors.length > 0) {
+            MailPoet.Notice.error(
+              response.errors.map(function(error) { return error.message; }),
+              { scroll: true }
+            );
           }
-        }.bind(this));
+        });
       },
       render: function() {
         return (

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

@@ -27,10 +27,7 @@ const events = {
 const availableSegmentValues = _.object(_.map(
   availableSegments,
   function(segment) {
-    let name = segment.name;
-    if (segment.subscribers > 0) {
-      name += ' (%$1s)'.replace('%$1s', parseInt(segment.subscribers).toLocaleString());
-    }
+    let name = segment.name + ' (' + parseInt(segment.subscribers).toLocaleString() + ')';
     return [segment.id, name];
   }
 ));
@@ -113,17 +110,16 @@ const WelcomeScheduling = React.createClass({
         type: 'welcome',
         options: this.state
       }
-    }).done(function(response) {
-      if (response.result && response.newsletter.id) {
-        this.showTemplateSelection(response.newsletter.id);
-      } else {
+    }).done((response) => {
+        this.showTemplateSelection(response.data.id);
+      }).fail((response) => {
         if (response.errors.length > 0) {
-          response.errors.map(function(error) {
-            MailPoet.Notice.error(error);
-          });
+          MailPoet.Notice.error(
+            response.errors.map(function(error) { return error.message; }),
+            { scroll: true }
+          );
         }
-      }
-    }.bind(this));
+      });
   },
   showTemplateSelection: function(newsletterId) {
     this.context.router.push(`/template/${ newsletterId }`);

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

@@ -57,18 +57,17 @@ define(
           data: _.extend({}, this.state, {
             type: 'welcome',
             subject: MailPoet.I18n.t('draftNewsletterTitle'),
-          }),
-        }).done(function(response) {
-          if(response.result && response.newsletter.id) {
-            this.showTemplateSelection(response.newsletter.id);
-          } else {
-            if(response.errors.length > 0) {
-              response.errors.map(function(error) {
-                MailPoet.Notice.error(error);
-              });
-            }
+          })
+        }).done((response) => {
+          this.showTemplateSelection(response.data.id);
+        }).fail((response) => {
+          if (response.errors.length > 0) {
+            MailPoet.Notice.error(
+              response.errors.map(function(error) { return error.message; }),
+              { scroll: true }
+            );
           }
-        }.bind(this));
+        });
       },
       showTemplateSelection: function(newsletterId) {
         this.context.router.push(`/template/${newsletterId}`);

assets/js/src/public.js

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

assets/js/src/segments/list.jsx

@@ -36,48 +36,48 @@ var columns = [
 ];
 
 const messages = {
-  onTrash: function(response) {
-    var count = ~~response;
-    var message = null;
+  onTrash: (response) => {
+    const count = ~~response.meta.count;
+    let message = null;
 
-    if(count === 1) {
+    if (count === 1) {
       message = (
         MailPoet.I18n.t('oneSegmentTrashed')
       );
     } else {
       message = (
         MailPoet.I18n.t('multipleSegmentsTrashed')
-      ).replace('%$1d', count);
+      ).replace('%$1d', count.toLocaleString());
     }
     MailPoet.Notice.success(message);
   },
-  onDelete: function(response) {
-    var count = ~~response;
-    var message = null;
+  onDelete: (response) => {
+    const count = ~~response.meta.count;
+    let message = null;
 
-    if(count === 1) {
+    if (count === 1) {
       message = (
         MailPoet.I18n.t('oneSegmentDeleted')
       );
     } else {
       message = (
         MailPoet.I18n.t('multipleSegmentsDeleted')
-      ).replace('%$1d', count);
+      ).replace('%$1d', count.toLocaleString());
     }
     MailPoet.Notice.success(message);
   },
-  onRestore: function(response) {
-    var count = ~~response;
-    var message = null;
+  onRestore: (response) => {
+    const count = ~~response.meta.count;
+    let message = null;
 
-    if(count === 1) {
+    if (count === 1) {
       message = (
         MailPoet.I18n.t('oneSegmentRestored')
       );
     } else {
       message = (
         MailPoet.I18n.t('multipleSegmentsRestored')
-      ).replace('%$1d', count);
+      ).replace('%$1d', count.toLocaleString());
     }
     MailPoet.Notice.success(message);
   }
@@ -106,16 +106,23 @@ const item_actions = [
   {
     name: 'duplicate_segment',
     label: MailPoet.I18n.t('duplicate'),
-    onClick: function(item, refresh) {
+    onClick: (item, refresh) => {
       return MailPoet.Ajax.post({
         endpoint: 'segments',
         action: 'duplicate',
-        data: item.id
-      }).done(function(response) {
+        data: {
+          id: item.id
+        }
+      }).done((response) => {
         MailPoet.Notice.success(
-          (MailPoet.I18n.t('listDuplicated')).replace('%$1s', response.name)
+          MailPoet.I18n.t('listDuplicated').replace('%$1s', response.data.name)
         );
         refresh();
+      }).fail((response) => {
+        MailPoet.Notice.error(
+          response.errors.map(function(error) { return error.message; }),
+          { scroll: true }
+        );
       });
     },
     display: function(segment) {
@@ -127,7 +134,7 @@ const item_actions = [
     link: function(item) {
       return (
         <a
-          href="https://www.mailpoet.com/#TODO"
+          href="http://docs.mailpoet.com/article/133-the-wordpress-users-list"
           target="_blank"
         >{MailPoet.I18n.t('readMore')}</a>
       );

assets/js/src/subscribers/form.jsx

@@ -75,6 +75,9 @@ define(
         filter: function(segment) {
           return !!(!segment.deleted_at && segment.type === 'default');
         },
+        getLabel: function(segment) {
+          return segment.name + ' ('+ segment.subscribers +')';
+        },
         getSearchLabel: function(segment, subscriber) {
           let label = '';
 

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

@@ -7,7 +7,6 @@ define(
       'handlebars',
       'papaparse',
       'asyncqueue',
-      'xss',
       'moment',
       'select2'
     ],
@@ -19,7 +18,6 @@ define(
       Handlebars,
       Papa,
       AsyncQueue,
-      xss,
       Moment
     ) {
       if (!jQuery('#mailpoet_subscribers_import').length) {
@@ -337,9 +335,9 @@ define(
               complete: function (CSV) {
                 for (var rowCount in CSV.data) {
                   var rowData = CSV.data[rowCount].map(function (el) {
-                        return filterXSS(el.trim());
-                      }),
-                      rowColumnCount = rowData.length;
+                    return el.trim();
+                  });
+                  var rowColumnCount = rowData.length;
                   // set the number of row elements based on the first non-empty row
                   if (columnCount === null) {
                     columnCount = rowColumnCount;
@@ -530,15 +528,11 @@ define(
                   width: '20em',
                   templateResult: function (item) {
                     item.subscriberCount = parseInt(item.subscriberCount);
-                    return (item.subscriberCount > 0)
-                        ? item.name + ' (' + item.subscriberCount.toLocaleString() + ')'
-                        : item.name;
+                    return item.name + ' (' + item.subscriberCount.toLocaleString() + ')';
                   },
                   templateSelection: function (item) {
                     item.subscriberCount = parseInt(item.subscriberCount);
-                    return (item.subscriberCount > 0)
-                        ? item.name + ' (' + item.subscriberCount.toLocaleString() + ')'
-                        : item.name;
+                    return item.name + ' (' + item.subscriberCount.toLocaleString() + ')';
                   }
                 })
                 .change(function () {
@@ -586,7 +580,8 @@ define(
               }).done(function(response) {
                 mailpoetSegments.push({
                   'id': response.data.id,
-                  'name': response.data.name
+                  'name': response.data.name,
+                  'subscriberCount': 0
                 });
 
                 var selected_values = segmentSelectElement.val();
@@ -673,8 +668,15 @@ define(
                 return options.fn(displayedColumns);
               });
 
+          // sanitize unsafe data
+          Handlebars.registerHelper('sanitize_data', function(data) {
+            return (data instanceof Handlebars.SafeString) ?
+              data :
+              new Handlebars.SafeString(Handlebars.Utils.escapeExpression(data));
+          });
+
           // start array index from 1
-          Handlebars.registerHelper('show_real_index', function (index) {
+          Handlebars.registerHelper('calculate_index', function (index) {
             var index = parseInt(index);
             // display filler data (e.g., ellipsis) if we've reached the maximum number of rows and
             // subscribers count is greater than the maximum number of rows we're displaying
@@ -883,7 +885,9 @@ define(
                       jQuery(matchedColumn.element).data('validation-rule', validationRule);
                       break;
                     }
-                    if (validationRule === 'datetime') validationRule = Moment.ISO_8601;
+                    if (validationRule === 'datetime') {
+                      validationRule = Moment.ISO_8601;
+                    }
                   }
                 }
                 jQuery.map(subscribersClone.subscribers, function (data, index) {
@@ -892,18 +896,22 @@ define(
                   var date = Moment(rowData, testedFormat, true);
                   // validate date
                   if (date.isValid()) {
-                    data[matchedColumn.index] +=
-                        '<span class="mailpoet_data_match" title="'
-                        + MailPoet.I18n.t('verifyDateMatch') + '">'
-                        + MailPoet.Date.format(date)
-                        + '</span>';
+                    data[matchedColumn.index] = new Handlebars.SafeString(
+                      Handlebars.Utils.escapeExpression(data[matchedColumn.index])
+                      + '<span class="mailpoet_data_match" title="'
+                      + MailPoet.I18n.t('verifyDateMatch') + '">'
+                      + MailPoet.Date.format(date)
+                      + '</span>'
+                    );
                   }
                   else {
-                    data[matchedColumn.index] +=
-                      '<span class="mailpoet_data_match mailpoet_import_error" title="'
+                    data[matchedColumn.index] = new Handlebars.SafeString(
+                      Handlebars.Utils.escapeExpression(data[matchedColumn.index])
+                      + '<span class="mailpoet_data_match mailpoet_import_error" title="'
                       + MailPoet.I18n.t('noDateFieldMatch') + '">'
-                      + MailPoet.I18n.t('dateMatchError')
-                      + '</span>';
+                      + (new Handlebars.SafeString(MailPoet.I18n.t('dateMatchError')))
+                      + '</span>'
+                    );
                     preventNextStep = true;
                   };
                 });

assets/js/src/subscribers/list.jsx

@@ -37,59 +37,50 @@ const columns = [
 ];
 
 const messages = {
-  onTrash: function(response) {
-    if (response) {
-      var message = null;
-      if (~~response === 1) {
-        message = (
-          MailPoet.I18n.t('oneSubscriberTrashed')
-        );
-      } else if (~~response > 1) {
-        message = (
-          MailPoet.I18n.t('multipleSubscribersTrashed')
-        ).replace('%$1d', (~~response).toLocaleString());
-      }
+  onTrash: (response) => {
+    const count = ~~response.meta.count;
+    let message = null;
 
-      if (message !== null) {
-        MailPoet.Notice.success(message);
-      }
+    if (count === 1) {
+      message = (
+        MailPoet.I18n.t('oneSubscriberTrashed')
+      );
+    } else {
+      message = (
+        MailPoet.I18n.t('multipleSubscribersTrashed')
+      ).replace('%$1d', count.toLocaleString());
     }
+    MailPoet.Notice.success(message);
   },
-  onDelete: function(response) {
-    if (response) {
-      var message = null;
-      if (~~response === 1) {
-        message = (
-          MailPoet.I18n.t('oneSubscriberDeleted')
-        );
-      } else if (~~response > 1) {
-        message = (
-          MailPoet.I18n.t('multipleSubscribersDeleted')
-        ).replace('%$1d', ~~response);
-      }
+  onDelete: (response) => {
+    const count = ~~response.meta.count;
+    let message = null;
 
-      if (message !== null) {
-        MailPoet.Notice.success(message);
-      }
+    if (count === 1) {
+      message = (
+        MailPoet.I18n.t('oneSubscriberDeleted')
+      );
+    } else {
+      message = (
+        MailPoet.I18n.t('multipleSubscribersDeleted')
+      ).replace('%$1d', count.toLocaleString());
     }
+    MailPoet.Notice.success(message);
   },
-  onRestore: function(response) {
-    if (response) {
-      var message = null;
-      if (~~response === 1) {
-        message = (
-          MailPoet.I18n.t('oneSubscriberRestored')
-        );
-      } else if (~~response > 1) {
-        message = (
-          MailPoet.I18n.t('multipleSubscribersRestored')
-        ).replace('%$1d', (~~response).toLocaleString());
-      }
+  onRestore: (response) => {
+    const count = ~~response.meta.count;
+    let message = null;
 
-      if (message !== null) {
-        MailPoet.Notice.success(message);
-      }
+    if (count === 1) {
+      message = (
+        MailPoet.I18n.t('oneSubscriberRestored')
+      );
+    } else {
+      message = (
+        MailPoet.I18n.t('multipleSubscribersRestored')
+      ).replace('%$1d', count.toLocaleString());
     }
+    MailPoet.Notice.success(message);
   }
 };
 
@@ -120,8 +111,8 @@ const bulk_actions = [
     onSuccess: function(response) {
       MailPoet.Notice.success(
         MailPoet.I18n.t('multipleSubscribersMovedToList')
-        .replace('%$1d', (~~(response.subscribers)).toLocaleString())
-        .replace('%$2s', response.segment)
+        .replace('%$1d', (~~(response.meta.count)).toLocaleString())
+        .replace('%$2s', response.meta.segment)
       );
     }
   },
@@ -151,8 +142,8 @@ const bulk_actions = [
     onSuccess: function(response) {
       MailPoet.Notice.success(
         MailPoet.I18n.t('multipleSubscribersAddedToList')
-        .replace('%$1d', (~~response.subscribers).toLocaleString())
-        .replace('%$2s', response.segment)
+        .replace('%$1d', (~~response.meta.count).toLocaleString())
+        .replace('%$2s', response.meta.segment)
       );
     }
   },
@@ -182,8 +173,8 @@ const bulk_actions = [
     onSuccess: function(response) {
       MailPoet.Notice.success(
         MailPoet.I18n.t('multipleSubscribersRemovedFromList')
-        .replace('%$1d', (~~response.subscribers).toLocaleString())
-        .replace('%$2s', response.segment)
+        .replace('%$1d', (~~response.meta.count).toLocaleString())
+        .replace('%$2s', response.meta.segment)
       );
     }
   },
@@ -193,7 +184,7 @@ const bulk_actions = [
     onSuccess: function(response) {
       MailPoet.Notice.success(
         MailPoet.I18n.t('multipleSubscribersRemovedFromAllLists')
-        .replace('%$1d', (~~response).toLocaleString())
+        .replace('%$1d', (~~response.meta.count).toLocaleString())
       );
     }
   },
@@ -203,7 +194,7 @@ const bulk_actions = [
     onSuccess: function(response) {
       MailPoet.Notice.success(
         MailPoet.I18n.t('multipleConfirmationEmailsSent')
-        .replace('%$1d', (~~response).toLocaleString())
+        .replace('%$1d', (~~response.meta.count).toLocaleString())
       );
     }
   },
@@ -330,16 +321,23 @@ const SubscriberList = React.createClass({
       </div>
     );
   },
-  onGetItems: function(count) {
-    jQuery('#mailpoet_export_button')[(count > 0) ? 'show' : 'hide']();
-  },
   render: function() {
     return (
       <div>
         <h1 className="title">
-          {MailPoet.I18n.t('pageTitle')} <Link className="page-title-action" to="/new">{MailPoet.I18n.t('new')}</Link>
-          <a className="page-title-action" href="?page=mailpoet-import#step1">{MailPoet.I18n.t('import')}</a>
-          <a id="mailpoet_export_button" className="page-title-action" href="?page=mailpoet-export">{MailPoet.I18n.t('export')}</a>
+          {MailPoet.I18n.t('pageTitle')} <Link
+            className="page-title-action"
+            to="/new"
+          >{MailPoet.I18n.t('new')}</Link>
+          <a
+            className="page-title-action"
+            href="?page=mailpoet-import#step1"
+          >{MailPoet.I18n.t('import')}</a>
+          <a
+            id="mailpoet_export_button"
+            className="page-title-action"
+            href="?page=mailpoet-export"
+          >{MailPoet.I18n.t('export')}</a>
         </h1>
 
         <Listing
@@ -352,7 +350,6 @@ const SubscriberList = React.createClass({
           bulk_actions={ bulk_actions }
           item_actions={ item_actions }
           messages={ messages }
-          onGetItems={ this.onGetItems }
           sort_by={ 'created_at' }
           sort_order={ 'desc' }
         />

build.sh

@@ -1,5 +1,8 @@
 #!/bin/sh
 
+# Translations (npm install & composer install need to be run before)
+./do makepot
+
 plugin_name='mailpoet'
 
 # Remove previous build.
@@ -14,10 +17,7 @@ npm install
 ./do compile:all
 
 # Production libraries.
-./composer.phar install --no-dev
-
-# Translations
-./do makepot
+./composer.phar install --no-dev --prefer-dist --optimize-autoloader
 
 # Copy release folders.
 cp -Rf lang $plugin_name
@@ -28,6 +28,21 @@ cp -Rf views $plugin_name
 rm -Rf $plugin_name/assets/css/src
 rm -Rf $plugin_name/assets/js/src
 
+# Remove extra files (docs, examples,...) from 3rd party extensions
+find $plugin_name/vendor -type f -regextype posix-egrep -iregex ".*\/*\.(markdown|md|txt)" -print0 | xargs -0 rm -f
+find $plugin_name/vendor -type f -regextype posix-egrep -iregex ".*\/(readme|license|version|changes|changelog)" -print0 | xargs -0 rm -f
+find $plugin_name/vendor -type d -regextype posix-egrep -iregex ".*\/(docs?|examples?|\.git)" -print0 | xargs -0 rm -rf
+
+# Remove unit tests from 3rd party extensions
+rm $plugin_name/vendor/j4mie/idiorm/demo.php
+rm -rf $plugin_name/vendor/twig/twig/test
+rm -rf $plugin_name/vendor/symfony/translation/Tests
+rm -rf $plugin_name/vendor/phpmailer/phpmailer/test
+rm -rf $plugin_name/vendor/soundasleep/html2text/tests
+rm -rf $plugin_name/vendor/mtdowling/cron-expression/tests
+rm -rf $plugin_name/vendor/swiftmailer/swiftmailer/tests
+rm -rf $plugin_name/vendor/cerdic/css-tidy/testing
+
 # Copy release files.
 cp LICENSE $plugin_name
 cp index.php $plugin_name

lib/API/API.php

@@ -1,14 +1,10 @@
 <?php
 namespace MailPoet\API;
-
 use \MailPoet\Util\Security;
 
 if(!defined('ABSPATH')) exit;
 
 class API {
-  function __construct() {
-  }
-
   function init() {
     // security token
     add_action(
@@ -27,32 +23,29 @@ class API {
       'wp_ajax_nopriv_mailpoet',
       array($this, 'setupPublic')
     );
-    // Public API (Post)
-    add_action(
-      'admin_post_nopriv_mailpoet',
-      array($this, 'setupPublic')
-    );
   }
 
   function setupAdmin() {
     if($this->checkToken() === false) {
-      (new ErrorResponse(
+      $error_response = new ErrorResponse(
         array(
-          Error::UNAUTHORIZED => __('You need to specify a valid API token.')
+          Error::UNAUTHORIZED => __('You need to specify a valid API token.', 'mailpoet')
         ),
         array(),
         Response::STATUS_UNAUTHORIZED
-      ))->send();
+      );
+      $error_response->send();
     }
 
     if($this->checkPermissions() === false) {
-      (new ErrorResponse(
+      $error_response = new ErrorResponse(
         array(
-          Error::FORBIDDEN => __('You do not have the required permissions.')
+          Error::FORBIDDEN => __('You do not have the required permissions.', 'mailpoet')
         ),
         array(),
         Response::STATUS_FORBIDDEN
-      ))->send();
+      );
+      $error_response->send();
     }
 
     $this->processRoute();
@@ -60,13 +53,14 @@ class API {
 
   function setupPublic() {
     if($this->checkToken() === false) {
-      (new ErrorResponse(
+      $error_response = new ErrorResponse(
         array(
-          Error::UNAUTHORIZED => __('You need to specify a valid API token.')
+          Error::UNAUTHORIZED => __('You need to specify a valid API token.', 'mailpoet')
         ),
         array(),
         Response::STATUS_UNAUTHORIZED
-      ))->send();
+      );
+      $error_response->send();
     }
 
     $this->processRoute();
@@ -76,14 +70,7 @@ class API {
     $class = ucfirst($_POST['endpoint']);
     $endpoint =  __NAMESPACE__ . "\\Endpoints\\" . $class;
     $method = $_POST['method'];
-
-    $doing_ajax = (bool)(defined('DOING_AJAX') && DOING_AJAX);
-
-    if($doing_ajax) {
-      $data = isset($_POST['data']) ? stripslashes_deep($_POST['data']) : array();
-    } else {
-      $data = $_POST;
-    }
+    $data = isset($_POST['data']) ? stripslashes_deep($_POST['data']) : array();
 
     if(is_array($data) && !empty($data)) {
       // filter out reserved keywords from data
@@ -99,18 +86,12 @@ class API {
     try {
       $endpoint = new $endpoint();
       $response = $endpoint->$method($data);
-
-      // TODO: remove this condition once the API unification is complete
-      if(is_object($response)) {
-        $response->send();
-      } else {
-        // LEGACY API
-        wp_send_json($response);
-      }
+      $response->send();
     } catch(\Exception $e) {
-      (new ErrorResponse(
+      $error_response = new ErrorResponse(
         array($e->getCode() => $e->getMessage())
-      ))->send();
+      );
+      $error_response->send();
     }
   }
 

lib/API/Endpoint.php

@@ -16,7 +16,7 @@ abstract class Endpoint {
   ) {
     if(empty($errors)) {
       $errors = array(
-        Error::UNKNOWN  => __('An unknown error occurred.')
+        Error::UNKNOWN  => __('An unknown error occurred.', 'mailpoet')
       );
     }
     return new ErrorResponse($errors, $meta, $status);
@@ -25,7 +25,7 @@ abstract class Endpoint {
   function badRequest($errors = array(), $meta = array()) {
     if(empty($errors)) {
       $errors = array(
-        Error::BAD_REQUEST => __('Invalid request parameters.')
+        Error::BAD_REQUEST => __('Invalid request parameters.', 'mailpoet')
       );
     }
     return new ErrorResponse($errors, $meta, Response::STATUS_BAD_REQUEST);

lib/API/Endpoints/CustomFields.php

@@ -8,7 +8,7 @@ if(!defined('ABSPATH')) exit;
 
 class CustomFields extends APIEndpoint {
   function getAll() {
-    $collection = CustomField::findMany();
+    $collection = CustomField::orderByAsc('created_at')->findMany();
     $custom_fields = array_map(function($custom_field) {
       return $custom_field->asArray();
     }, $collection);
@@ -21,7 +21,7 @@ class CustomFields extends APIEndpoint {
     $custom_field = CustomField::findOne($id);
     if($custom_field === false) {
       return $this->errorResponse(array(
-        APIError::NOT_FOUND => __('This custom field does not exist.')
+        APIError::NOT_FOUND => __('This custom field does not exist.', 'mailpoet')
       ));
     } else {
       $custom_field->delete();
@@ -48,7 +48,7 @@ class CustomFields extends APIEndpoint {
     $custom_field = CustomField::findOne($id);
     if($custom_field === false) {
       return $this->errorResponse(array(
-        APIError::NOT_FOUND => __('This custom field does not exist.')
+        APIError::NOT_FOUND => __('This custom field does not exist.', 'mailpoet')
       ));
     } else {
       return $this->successResponse($custom_field->asArray());

lib/API/Endpoints/Forms.php

@@ -1,5 +1,7 @@
 <?php
 namespace MailPoet\API\Endpoints;
+use MailPoet\API\Endpoint as APIEndpoint;
+use MailPoet\API\Error as APIError;
 
 use \MailPoet\Models\Form;
 use \MailPoet\Models\StatisticsForms;
@@ -9,16 +11,17 @@ use \MailPoet\Form\Util;
 
 if(!defined('ABSPATH')) exit;
 
-class Forms {
-  function __construct() {
-  }
-
-  function get($id = false) {
+class Forms extends APIEndpoint {
+  function get($data = array()) {
+    $id = (isset($data['id']) ? (int)$data['id'] : false);
     $form = Form::findOne($id);
-    if($form !== false) {
-      $form = $form->asArray();
+    if($form === false) {
+      return $this->errorResponse(array(
+        APIError::NOT_FOUND => __('This form does not exist.', 'mailpoet')
+      ));
+    } else {
+      return $this->successResponse($form->asArray());
     }
-    return $form;
   }
 
   function listing($data = array()) {
@@ -29,8 +32,8 @@ class Forms {
 
     $listing_data = $listing->get();
 
-    // fetch segments relations for each returned item
-    foreach($listing_data['items'] as $key => $form) {
+    $data = array();
+    foreach($listing_data['items'] as $form) {
       $form = $form->asArray();
 
       $form['signups'] = StatisticsForms::getTotalSignups($form['id']);
@@ -40,40 +43,45 @@ class Forms {
         ? $form['settings']['segments']
         : array()
       );
-      $listing_data['items'][$key] = $form;
+
+      $data[] = $form;
     }
 
-    return $listing_data;
+    return $this->successResponse($data, array(
+      'count' => $listing_data['count'],
+      'filters' => $listing_data['filters'],
+      'groups' => $listing_data['groups']
+    ));
   }
 
   function create() {
     // create new form
     $form_data = array(
-      'name' => __('New form'),
+      'name' => __('New form', 'mailpoet'),
       'body' => array(
         array(
           'id' => 'email',
-          'name' => __('Email'),
+          'name' => __('Email', 'mailpoet'),
           'type' => 'text',
           'static' => true,
           'params' => array(
-            'label' => __('Email'),
+            'label' => __('Email', 'mailpoet'),
             'required' => true
           )
         ),
         array(
           'id' => 'submit',
-          'name' => __('Submit'),
+          'name' => __('Submit', 'mailpoet'),
           'type' => 'submit',
           'static' => true,
           'params' => array(
-            'label' => __('Subscribe!')
+            'label' => __('Subscribe!', 'mailpoet')
           )
         )
       ),
       'settings' => array(
         'on_success' => 'message',
-        'success_message' => __('Check your inbox or spam folder to confirm your subscription.'),
+        'success_message' => __('Check your inbox or spam folder to confirm your subscription.', 'mailpoet'),
         'segments' => null,
         'segments_selected_by' => 'admin'
       )
@@ -87,14 +95,10 @@ class Forms {
     $errors = $form->getErrors();
 
     if(!empty($errors)) {
-      return array(
-        'result' => false,
-        'errors' => $errors
-      );
+      return $this->badRequest($errors);
     } else {
-      return array(
-        'result' => true,
-        'form_id' => $form->id()
+      return $this->successResponse(
+        Form::findOne($form->id)->asArray()
       );
     }
   }
@@ -109,76 +113,74 @@ class Forms {
     // styles
     $css = new Util\Styles(FormRenderer::getStyles($data));
 
-    return array(
+    return $this->successResponse(array(
       'html' => $html,
       'css' => $css->render()
-    );
+    ));
   }
 
-  function exportsEditor($id) {
-    $exports = false;
-
+  function exportsEditor($data = array()) {
+    $id = (isset($data['id']) ? (int)$data['id'] : false);
     $form = Form::findOne($id);
-
-    if($form !== false) {
+    if($form === false) {
+      return $this->errorResponse(array(
+        APIError::NOT_FOUND => __('This form does not exist.', 'mailpoet')
+      ));
+    } else {
       $exports = Util\Export::getAll($form->asArray());
+      return $this->successResponse($exports);
     }
-
-    return $exports;
   }
 
   function saveEditor($data = array()) {
+    $id = (isset($data['id']) ? (int)$data['id'] : false);
+
     $form_id = (isset($data['id']) ? (int)$data['id'] : 0);
-    $name = (isset($data['name']) ? $data['name'] : __('New form'));
+    $name = (isset($data['name']) ? $data['name'] : __('New form', 'mailpoet'));
     $body = (isset($data['body']) ? $data['body'] : array());
     $settings = (isset($data['settings']) ? $data['settings'] : array());
     $styles = (isset($data['styles']) ? $data['styles'] : '');
 
-    if(empty($body) || empty($settings)) {
-      // error
-      return false;
-    } else {
-      // check if the form is used as a widget
-      $is_widget = false;
-      $widgets = get_option('widget_mailpoet_form');
-      if(!empty($widgets)) {
-        foreach($widgets as $widget) {
-          if(isset($widget['form']) && (int)$widget['form'] === $form_id) {
-            $is_widget = true;
-            break;
-          }
-        }
-      }
-
-      // check if the user gets to pick his own lists
-      // or if it's selected by the admin
-      $has_segment_selection = false;
-
-      foreach($body as $i => $block) {
-        if($block['type'] === 'segment') {
-          $has_segment_selection = true;
-          if(!empty($block['params']['values'])) {
-            $list_selection = array_filter(
-              array_map(function($segment) {
-                return (isset($segment['id'])
-                  ? (int)$segment['id']
-                  : null
-                );
-              }, $block['params']['values'])
-            );
-          }
+    // check if the form is used as a widget
+    $is_widget = false;
+    $widgets = get_option('widget_mailpoet_form');
+    if(!empty($widgets)) {
+      foreach($widgets as $widget) {
+        if(isset($widget['form']) && (int)$widget['form'] === $form_id) {
+          $is_widget = true;
           break;
         }
       }
+    }
 
-      // check list selection
-      if($has_segment_selection === true) {
-        $settings['segments_selected_by'] = 'user';
-      } else {
-        $settings['segments_selected_by'] = 'admin';
+    // check if the user gets to pick his own lists
+    // or if it's selected by the admin
+    $has_segment_selection = false;
+    foreach($body as $i => $block) {
+      if($block['type'] === 'segment') {
+        $has_segment_selection = true;
+        if(!empty($block['params']['values'])) {
+          $list_selection = array_filter(
+            array_map(function($segment) {
+              return (isset($segment['id'])
+                ? $segment['id']
+                : null
+              );
+            }, $block['params']['values'])
+          );
+        }
+        break;
       }
     }
 
+    // check list selection
+    if($has_segment_selection === true) {
+      $settings['segments_selected_by'] = 'user';
+      $settings['segments'] = $list_selection;
+    } else {
+      $settings['segments_selected_by'] = 'admin';
+    }
+
     $form = Form::createOrUpdate(array(
       'id' => $form_id,
       'name' => $name,
@@ -187,64 +189,101 @@ class Forms {
       'styles' => $styles
     ));
 
-    if($form->getErrors() === false) {
-      return array(
-        'result' => true,
-        'is_widget' => $is_widget
-      );
+    $errors = $form->getErrors();
+
+    if(!empty($errors)) {
+      return $this->badRequest($errors);
     } else {
-      return array(
-        'result' => false,
-        'errors' => $form->getErrors()
+      return $this->successResponse(
+        Form::findOne($form->id)->asArray(),
+        array('is_widget' => $is_widget)
       );
     }
   }
 
-  function restore($id) {
+  function restore($data = array()) {
+    $id = (isset($data['id']) ? (int)$data['id'] : false);
     $form = Form::findOne($id);
-    if($form !== false) {
+    if($form === false) {
+      return $this->errorResponse(array(
+        APIError::NOT_FOUND => __('This form does not exist.', 'mailpoet')
+      ));
+    } else {
       $form->restore();
-    }
-    return ($form->getErrors() === false);
-  }
-
-  function trash($id) {
-    $form = Form::findOne($id);
-    if($form !== false) {
-      $form->trash();
-    }
-    return ($form->getErrors() === false);
-  }
-
-  function delete($id) {
-    $form = Form::findOne($id);
-    if($form !== false) {
-      $form->delete();
-      return 1;
-    }
-    return false;
-  }
-
-  function duplicate($id) {
-    $result = false;
-
-    $form = Form::findOne($id);
-    if($form !== false) {
-      $data = array(
-        'name' => sprintf(__('Copy of %s'), $form->name)
+      return $this->successResponse(
+        Form::findOne($form->id)->asArray(),
+        array('count' => 1)
       );
-      $result = $form->duplicate($data)->asArray();
     }
+  }
 
-    return $result;
+  function trash($data = array()) {
+    $id = (isset($data['id']) ? (int)$data['id'] : false);
+    $form = Form::findOne($id);
+    if($form === false) {
+      return $this->errorResponse(array(
+        APIError::NOT_FOUND => __('This form does not exist.', 'mailpoet')
+      ));
+    } else {
+      $form->trash();
+      return $this->successResponse(
+        Form::findOne($form->id)->asArray(),
+        array('count' => 1)
+      );
+    }
+  }
+
+  function delete($data = array()) {
+    $id = (isset($data['id']) ? (int)$data['id'] : false);
+    $form = Form::findOne($id);
+    if($form === false) {
+      return $this->errorResponse(array(
+        APIError::NOT_FOUND => __('This form does not exist.', 'mailpoet')
+      ));
+    } else {
+      $form->delete();
+      return $this->successResponse(null, array('count' => 1));
+    }
+  }
+
+  function duplicate($data = array()) {
+    $id = (isset($data['id']) ? (int)$data['id'] : false);
+    $form = Form::findOne($id);
+
+    if($form === false) {
+      return $this->errorResponse(array(
+        APIError::NOT_FOUND => __('This form does not exist.', 'mailpoet')
+      ));
+    } else {
+      $data = array(
+        'name' => sprintf(__('Copy of %s', 'mailpoet'), $form->name)
+      );
+      $duplicate = $form->duplicate($data);
+      $errors = $duplicate->getErrors();
+
+      if(!empty($errors)) {
+        return $this->errorResponse($errors);
+      } else {
+        return $this->successResponse(
+          Form::findOne($duplicate->id)->asArray(),
+          array('count' => 1)
+        );
+      }
+    }
   }
 
   function bulkAction($data = array()) {
-    $bulk_action = new Listing\BulkAction(
-      '\MailPoet\Models\Form',
-      $data
-    );
-
-    return $bulk_action->apply();
+    try {
+      $bulk_action = new Listing\BulkAction(
+        '\MailPoet\Models\Form',
+        $data
+      );
+      $meta = $bulk_action->apply();
+      return $this->successResponse(null, $meta);
+    } catch(\Exception $e) {
+      return $this->errorResponse(array(
+        $e->getCode() => $e->getMessage()
+      ));
+    }
   }
 }

lib/API/Endpoints/Mailer.php

@@ -22,7 +22,7 @@ class Mailer extends APIEndpoint {
 
     if($result === false) {
       return $this->errorResponse(array(
-        APIError::BAD_REQUEST => __("The email could not be sent. Please check your settings.")
+        APIError::BAD_REQUEST => __("The email could not be sent. Please check your settings.", 'mailpoet')
       ));
     } else {
       return $this->successResponse(null);

lib/API/Endpoints/NewsletterTemplates.php

@@ -13,7 +13,7 @@ class NewsletterTemplates extends APIEndpoint {
     $template = NewsletterTemplate::findOne($id);
     if($template === false) {
       return $this->errorResponse(array(
-        APIError::NOT_FOUND => __('This template does not exist.')
+        APIError::NOT_FOUND => __('This template does not exist.', 'mailpoet')
       ));
     } else {
       return $this->successResponse(
@@ -49,7 +49,7 @@ class NewsletterTemplates extends APIEndpoint {
     $template = NewsletterTemplate::findOne($id);
     if($template === false) {
       return $this->errorResponse(array(
-        APIError::NOT_FOUND => __('This template does not exist.')
+        APIError::NOT_FOUND => __('This template does not exist.', 'mailpoet')
       ));
     } else {
       $template->delete();

lib/API/Endpoints/Newsletters.php

@@ -22,19 +22,20 @@ if(!defined('ABSPATH')) exit;
 require_once(ABSPATH . 'wp-includes/pluggable.php');
 
 class Newsletters extends APIEndpoint {
-  function get($id = false) {
+  function get($data = array()) {
+    $id = (isset($data['id']) ? (int)$data['id'] : false);
     $newsletter = Newsletter::findOne($id);
     if($newsletter === false) {
-      return false;
+      return $this->errorResponse(array(
+        APIError::NOT_FOUND => __('This newsletter does not exist.', 'mailpoet')
+      ));
     } else {
-      $segments = $newsletter->segments()->findArray();
-      $options = $newsletter->options()->findArray();
-      $newsletter = $newsletter->asArray();
-      $newsletter['segments'] = array_map(function($segment) {
-        return $segment['id'];
-      }, $segments);
-      $newsletter['options'] = Helpers::arrayColumn($options, 'value', 'name');
-      return $newsletter;
+      return $this->successResponse(
+        $newsletter
+        ->withSegments()
+        ->withOptions()
+        ->asArray()
+      );
     }
   }
 
@@ -96,19 +97,20 @@ class Newsletters extends APIEndpoint {
   }
 
   function setStatus($data = array()) {
-    $id = (isset($data['id'])) ? (int)$data['id'] : false;
-    $newsletter = Newsletter::findOne($id);
     $status = (isset($data['status']) ? $data['status'] : null);
 
     if(!$status) {
       return $this->badRequest(array(
-        APIError::BAD_REQUEST  => __('You need to specify a status.')
+        APIError::BAD_REQUEST  => __('You need to specify a status.', 'mailpoet')
       ));
     }
 
+    $id = (isset($data['id'])) ? (int)$data['id'] : false;
+    $newsletter = Newsletter::findOne($id);
+
     if($newsletter === false) {
       return $this->errorResponse(array(
-        APIError::NOT_FOUND => __('This newsletter does not exist.')
+        APIError::NOT_FOUND => __('This newsletter does not exist.', 'mailpoet')
       ));
     }
 
@@ -119,143 +121,178 @@ class Newsletters extends APIEndpoint {
       return $this->errorResponse($errors);
     } else {
       return $this->successResponse(
-        $newsletter->asArray()
+        Newsletter::findOne($newsletter->id)->asArray()
       );
     }
   }
 
-  function restore($id) {
+  function restore($data = array()) {
+    $id = (isset($data['id']) ? (int)$data['id'] : false);
     $newsletter = Newsletter::findOne($id);
-    if($newsletter !== false) {
-      $newsletter->restore();
-    }
-    return ($newsletter->getErrors() === false);
-  }
-
-  function trash($id) {
-    $newsletter = Newsletter::findOne($id);
-    if($newsletter !== false) {
-      $newsletter->trash();
-    }
-    return ($newsletter->getErrors() === false);
-  }
-
-  function delete($id) {
-    $newsletter = Newsletter::findOne($id);
-    if($newsletter !== false) {
-      $newsletter->delete();
-      return 1;
-    }
-    return false;
-  }
-
-  function duplicate($id = false) {
-    $result = false;
-
-    $newsletter = Newsletter::findOne($id);
-    if($newsletter !== false) {
-      $duplicate = $newsletter->duplicate(array(
-        'subject' => sprintf(__('Copy of %s'), $newsletter->subject)
+    if($newsletter === false) {
+      return $this->errorResponse(array(
+        APIError::NOT_FOUND => __('This newsletter does not exist.', 'mailpoet')
       ));
+    } else {
+      $newsletter->restore();
+      return $this->successResponse(
+        Newsletter::findOne($newsletter->id)->asArray(),
+        array('count' => 1)
+      );
+    }
+  }
 
-      if($duplicate !== false && $duplicate->getErrors() === false) {
-        $result = $duplicate->asArray();
+  function trash($data = array()) {
+    $id = (isset($data['id']) ? (int)$data['id'] : false);
+    $newsletter = Newsletter::findOne($id);
+    if($newsletter === false) {
+      return $this->errorResponse(array(
+        APIError::NOT_FOUND => __('This newsletter does not exist.', 'mailpoet')
+      ));
+    } else {
+      $newsletter->trash();
+      return $this->successResponse(
+        Newsletter::findOne($newsletter->id)->asArray(),
+        array('count' => 1)
+      );
+    }
+  }
+
+  function delete($data = array()) {
+    $id = (isset($data['id']) ? (int)$data['id'] : false);
+    $newsletter = Newsletter::findOne($id);
+    if($newsletter === false) {
+      return $this->errorResponse(array(
+        APIError::NOT_FOUND => __('This newsletter does not exist.', 'mailpoet')
+      ));
+    } else {
+      $newsletter->delete();
+      return $this->successResponse(null, array('count' => 1));
+    }
+  }
+
+  function duplicate($data = array()) {
+    $id = (isset($data['id']) ? (int)$data['id'] : false);
+    $newsletter = Newsletter::findOne($id);
+
+    if($newsletter === false) {
+      return $this->errorResponse(array(
+        APIError::NOT_FOUND => __('This newsletter does not exist.', 'mailpoet')
+      ));
+    } else {
+      $data = array(
+        'subject' => sprintf(__('Copy of %s', 'mailpoet'), $newsletter->subject)
+      );
+      $duplicate = $newsletter->duplicate($data);
+      $errors = $duplicate->getErrors();
+
+      if(!empty($errors)) {
+        return $this->errorResponse($errors);
+      } else {
+        return $this->successResponse(
+          Newsletter::findOne($duplicate->id)->asArray(),
+          array('count' => 1)
+        );
       }
     }
-    return $result;
   }
 
   function showPreview($data = array()) {
-    if(!isset($data['body'])) {
-      return array(
-        'result' => false,
-        'errors' => array(__('Newsletter data is missing'))
-      );
+    if(empty($data['body'])) {
+      return $this->badRequest(array(
+        APIError::BAD_REQUEST => __('Newsletter data is missing.', 'mailpoet')
+      ));
     }
-    $newsletter_id = (isset($data['id'])) ? (int)$data['id'] : null;
-    $newsletter = Newsletter::findOne($newsletter_id);
-    if(!$newsletter) {
-      return array(
-        'result' => false,
-        'errors' => array(__('Newsletter could not be read'))
-      );
-    }
-    $newsletter->body = $data['body'];
-    $newsletter->save();
-    $subscriber = Subscriber::getCurrentWPUser();
-    $preview_url = NewsletterUrl::getViewInBrowserUrl(
-      $data, $subscriber, $queue = false, $preview = true
-    );
-    return array(
-      'result' => true,
-      'data' => array('url' => $preview_url)
-    );
-  }
 
-  function sendPreview($data = array()) {
     $id = (isset($data['id'])) ? (int)$data['id'] : false;
     $newsletter = Newsletter::findOne($id);
 
     if($newsletter === false) {
-      return array(
-        'result' => false
+      return $this->errorResponse(array(
+        APIError::NOT_FOUND => __('This newsletter does not exist.', 'mailpoet')
+      ));
+    } else {
+      $newsletter->body = $data['body'];
+      $newsletter->save();
+      $subscriber = Subscriber::getCurrentWPUser();
+      $preview_url = NewsletterUrl::getViewInBrowserUrl(
+        $data, $subscriber, $queue = false, $preview = true
       );
-    }
-    if(empty($data['subscriber'])) {
-      return array(
-        'result' => false,
-        'errors' => array(__('Please specify receiver information.'))
-      );
-    }
 
-    $newsletter = $newsletter->asArray();
-
-    $renderer = new Renderer($newsletter, $preview = true);
-    $rendered_newsletter = $renderer->render();
-    $divider = '***MailPoet***';
-    $data_for_shortcodes =
-      array_merge(array($newsletter['subject']), $rendered_newsletter);
-    $body = implode($divider, $data_for_shortcodes);
-
-    $subscriber = Subscriber::getCurrentWPUser();
-    $subscriber = ($subscriber) ? $subscriber->asArray() : false;
-
-    $shortcodes = new \MailPoet\Newsletter\Shortcodes\Shortcodes(
-      $newsletter,
-      $subscriber
-    );
-    list($newsletter['subject'],
-      $newsletter['body']['html'],
-      $newsletter['body']['text']
-      ) = explode($divider, $shortcodes->replace($body));
-
-    try {
-      $mailer = new \MailPoet\Mailer\Mailer(
-        $mailer = false,
-        $sender = false,
-        $reply_to = false
-      );
-      $result = $mailer->send($newsletter, $data['subscriber']);
-
-      return array('result' => $result);
-    } catch(\Exception $e) {
-      return array(
-        'result' => false,
-        'errors' => array($e->getMessage()),
+      return $this->successResponse(
+        Newsletter::findOne($newsletter->id)->asArray(),
+        array('preview_url' => $preview_url)
       );
     }
   }
 
-  function listing($data = array()) {
+  function sendPreview($data = array()) {
+    if(empty($data['subscriber'])) {
+      return $this->badRequest(array(
+        APIError::BAD_REQUEST => __('Please specify receiver information.', 'mailpoet')
+      ));
+    }
 
+    $id = (isset($data['id'])) ? (int)$data['id'] : false;
+    $newsletter = Newsletter::findOne($id);
+
+    if($newsletter === false) {
+      return $this->errorResponse(array(
+        APIError::NOT_FOUND => __('This newsletter does not exist.', 'mailpoet')
+      ));
+    } else {
+      $newsletter = $newsletter->asArray();
+
+      $renderer = new Renderer($newsletter, $preview = true);
+      $rendered_newsletter = $renderer->render();
+      $divider = '***MailPoet***';
+      $data_for_shortcodes = array_merge(
+        array($newsletter['subject']),
+        $rendered_newsletter
+      );
+
+      $body = implode($divider, $data_for_shortcodes);
+
+      $subscriber = Subscriber::getCurrentWPUser();
+      $subscriber = ($subscriber) ? $subscriber->asArray() : false;
+
+      $shortcodes = new \MailPoet\Newsletter\Shortcodes\Shortcodes(
+        $newsletter,
+        $subscriber
+      );
+      list(
+        $newsletter['subject'],
+        $newsletter['body']['html'],
+        $newsletter['body']['text']
+      ) = explode($divider, $shortcodes->replace($body));
+
+      try {
+        $mailer = new \MailPoet\Mailer\Mailer(
+          $mailer = false,
+          $sender = false,
+          $reply_to = false
+        );
+        $mailer->send($newsletter, $data['subscriber']);
+        return $this->successResponse(
+          Newsletter::findOne($id)->asArray()
+        );
+      } catch(\Exception $e) {
+        return $this->errorResponse(array(
+          $e->getCode() => $e->getMessage()
+        ));
+      }
+    }
+  }
+
+  function listing($data = array()) {
     $listing = new Listing\Handler(
       '\MailPoet\Models\Newsletter',
       $data
     );
     $listing_data = $listing->get();
-    $subscriber = Subscriber::getCurrentWPUser();
 
-    foreach($listing_data['items'] as $key => $newsletter) {
+    $data = array();
+    foreach($listing_data['items'] as $newsletter) {
       $queue = false;
 
       if($newsletter->type === Newsletter::TYPE_STANDARD) {
@@ -287,22 +324,33 @@ class Newsletters extends APIEndpoint {
       }
 
       // get preview url
+      $subscriber = Subscriber::getCurrentWPUser();
       $newsletter->preview_url = NewsletterUrl::getViewInBrowserUrl(
         $newsletter, $subscriber, $queue, $preview = true);
 
-      // convert object to array
-      $listing_data['items'][$key] = $newsletter->asArray();
+      $data[] = $newsletter->asArray();
     }
 
-    return $listing_data;
+    return $this->successResponse($data, array(
+      'count' => $listing_data['count'],
+      'filters' => $listing_data['filters'],
+      'groups' => $listing_data['groups']
+    ));
   }
 
   function bulkAction($data = array()) {
-    $bulk_action = new Listing\BulkAction(
-      '\MailPoet\Models\Newsletter',
-      $data
-    );
-    return $bulk_action->apply();
+    try {
+      $bulk_action = new Listing\BulkAction(
+        '\MailPoet\Models\Newsletter',
+        $data
+      );
+      $meta = $bulk_action->apply();
+      return $this->successResponse(null, $meta);
+    } catch(\Exception $e) {
+      return $this->errorResponse(array(
+        $e->getCode() => $e->getMessage()
+      ));
+    }
   }
 
   function create($data = array()) {
@@ -313,23 +361,25 @@ class Newsletters extends APIEndpoint {
     }
 
     $newsletter = Newsletter::createOrUpdate($data);
+    $errors = $newsletter->getErrors();
 
-    // try to load template data
-    $template_id = (!empty($data['template']) ? (int)$data['template'] : false);
-    $template = NewsletterTemplate::findOne($template_id);
-    if($template !== false) {
-      $newsletter->body = $template->body;
+    if(!empty($errors)) {
+      return $this->badRequest($errors);
     } else {
-      $newsletter->body = array();
+      // try to load template data
+      $template_id = (isset($data['template']) ? (int)$data['template'] : false);
+      $template = NewsletterTemplate::findOne($template_id);
+      if($template === false) {
+        $newsletter->body = array();
+      } else {
+        $newsletter->body = $template->body;
+      }
     }
 
     $newsletter->save();
     $errors = $newsletter->getErrors();
     if(!empty($errors)) {
-      return array(
-        'result' => false,
-        'errors' =>$errors
-      );
+      return $this->badRequest($errors);
     } else {
       if(!empty($options)) {
         $option_fields = NewsletterOptionField::where(
@@ -346,15 +396,20 @@ class Newsletters extends APIEndpoint {
           }
         }
       }
-      if(!isset($data['id']) &&
-        isset($data['type']) &&
-        $data['type'] === 'notification'
+
+      if(
+        empty($data['id'])
+        &&
+        isset($data['type'])
+        &&
+        $data['type'] === Newsletter::TYPE_NOTIFICATION
       ) {
-        Scheduler::processPostNotificationSchedule($newsletter->id);
+        $newsletter = Newsletter::filter('filterWithOptions')->findOne($newsletter->id);
+        Scheduler::processPostNotificationSchedule($newsletter);
       }
-      return array(
-        'result' => true,
-        'newsletter' => $newsletter->asArray()
+
+      return $this->successResponse(
+        Newsletter::findOne($newsletter->id)->asArray()
       );
     }
   }

lib/API/Endpoints/Segments.php

@@ -1,5 +1,7 @@
 <?php
 namespace MailPoet\API\Endpoints;
+use \MailPoet\API\Endpoint as APIEndpoint;
+use \MailPoet\API\Error as APIError;
 
 use \MailPoet\Models\Segment;
 use \MailPoet\Models\SubscriberSegment;
@@ -9,16 +11,16 @@ use \MailPoet\Segments\WP;
 
 if(!defined('ABSPATH')) exit;
 
-class Segments {
-  function __construct() {
-  }
-
-  function get($id = false) {
+class Segments extends APIEndpoint {
+  function get($data = array()) {
+    $id = (isset($data['id']) ? (int)$data['id'] : false);
     $segment = Segment::findOne($id);
     if($segment === false) {
-      return false;
+      return $this->errorResponse(array(
+        APIError::NOT_FOUND => __('This list does not exist.', 'mailpoet')
+      ));
     } else {
-      return $segment->asArray();
+      return $this->successResponse($segment->asArray());
     }
   }
 
@@ -30,18 +32,22 @@ class Segments {
 
     $listing_data = $listing->get();
 
-    // fetch segments relations for each returned item
-    foreach($listing_data['items'] as $key => $segment) {
+    $data = array();
+    foreach($listing_data['items'] as $segment) {
       $segment->subscribers_url = admin_url(
         'admin.php?page=mailpoet-subscribers#/filter[segment='.$segment->id.']'
       );
 
-      $listing_data['items'][$key] = $segment
+      $data[] = $segment
         ->withSubscribersCount()
         ->asArray();
     }
 
-    return $listing_data;
+    return $this->successResponse($data, array(
+      'count' => $listing_data['count'],
+      'filters' => $listing_data['filters'],
+      'groups' => $listing_data['groups']
+    ));
   }
 
   function save($data = array()) {
@@ -49,68 +55,109 @@ class Segments {
     $errors = $segment->getErrors();
 
     if(!empty($errors)) {
-      return array(
-        'result' => false,
-        'errors' => $errors
-      );
+      return $this->badRequest($errors);
     } else {
-      return array(
-        'result' => true
+      return $this->successResponse(
+        Segment::findOne($segment->id)->asArray()
       );
     }
   }
 
-  function restore($id) {
+  function restore($data = array()) {
+    $id = (isset($data['id']) ? (int)$data['id'] : false);
     $segment = Segment::findOne($id);
-    if($segment !== false) {
+    if($segment === false) {
+      return $this->errorResponse(array(
+        APIError::NOT_FOUND => __('This list does not exist.', 'mailpoet')
+      ));
+    } else {
       $segment->restore();
-    }
-    return ($segment->getErrors() === false);
-  }
-
-  function trash($id) {
-    $segment = Segment::findOne($id);
-    if($segment !== false) {
-      $segment->trash();
-    }
-    return ($segment->getErrors() === false);
-  }
-
-  function delete($id) {
-    $segment = Segment::findOne($id);
-    if($segment !== false) {
-      $segment->delete();
-      return 1;
-    }
-    return false;
-  }
-
-  function duplicate($id) {
-    $result = false;
-
-    $segment = Segment::findOne($id);
-    if($segment !== false) {
-      $data = array(
-        'name' => sprintf(__('Copy of %s'), $segment->name)
+      return $this->successResponse(
+        Segment::findOne($segment->id)->asArray(),
+        array('count' => 1)
       );
-      $result = $segment->duplicate($data)->asArray();
     }
+  }
 
-    return $result;
+  function trash($data = array()) {
+    $id = (isset($data['id']) ? (int)$data['id'] : false);
+    $segment = Segment::findOne($id);
+    if($segment === false) {
+      return $this->errorResponse(array(
+        APIError::NOT_FOUND => __('This list does not exist.', 'mailpoet')
+      ));
+    } else {
+      $segment->trash();
+      return $this->successResponse(
+        Segment::findOne($segment->id)->asArray(),
+        array('count' => 1)
+      );
+    }
+  }
+
+  function delete($data = array()) {
+    $id = (isset($data['id']) ? (int)$data['id'] : false);
+    $segment = Segment::findOne($id);
+    if($segment === false) {
+      return $this->errorResponse(array(
+        APIError::NOT_FOUND => __('This list does not exist.', 'mailpoet')
+      ));
+    } else {
+      $segment->delete();
+      return $this->successResponse(null, array('count' => 1));
+    }
+  }
+
+  function duplicate($data = array()) {
+    $id = (isset($data['id']) ? (int)$data['id'] : false);
+    $segment = Segment::findOne($id);
+
+    if($segment === false) {
+      return $this->errorResponse(array(
+        APIError::NOT_FOUND => __('This list does not exist.', 'mailpoet')
+      ));
+    } else {
+      $data = array(
+        'name' => sprintf(__('Copy of %s', 'mailpoet'), $segment->name)
+      );
+      $duplicate = $segment->duplicate($data);
+      $errors = $duplicate->getErrors();
+
+      if(!empty($errors)) {
+        return $this->errorResponse($errors);
+      } else {
+        return $this->successResponse(
+          Segment::findOne($duplicate->id)->asArray(),
+          array('count' => 1)
+        );
+      }
+    }
   }
 
   function synchronize() {
-    $result = WP::synchronizeUsers();
+    try {
+      WP::synchronizeUsers();
+    } catch(\Exception $e) {
+      return $this->errorResponse(array(
+        $e->getCode() => $e->getMessage()
+      ));
+    }
 
-    return $result;
+    return $this->successResponse(null);
   }
 
   function bulkAction($data = array()) {
-    $bulk_action = new Listing\BulkAction(
-      '\MailPoet\Models\Segment',
-      $data
-    );
-
-    return $bulk_action->apply();
+    try {
+      $bulk_action = new Listing\BulkAction(
+        '\MailPoet\Models\Segment',
+        $data
+      );
+      $meta = $bulk_action->apply();
+      return $this->successResponse(null, $meta);
+    } catch(\Exception $e) {
+      return $this->errorResponse(array(
+        $e->getCode() => $e->getMessage()
+      ));
+    }
   }
 }

lib/API/Endpoints/SendingQueue.php

@@ -29,7 +29,7 @@ class SendingQueue extends APIEndpoint {
 
     if($newsletter === false) {
       return $this->errorResponse(array(
-        APIError::NOT_FOUND => __('This newsletter does not exist.')
+        APIError::NOT_FOUND => __('This newsletter does not exist.', 'mailpoet')
       ));
     }
 
@@ -49,7 +49,7 @@ class SendingQueue extends APIEndpoint {
 
     if(!empty($queue)) {
       return $this->errorResponse(array(
-        APIError::NOT_FOUND => __('This newsletter is already being sent.')
+        APIError::NOT_FOUND => __('This newsletter is already being sent.', 'mailpoet')
       ));
     }
 
@@ -67,7 +67,7 @@ class SendingQueue extends APIEndpoint {
 
       // set queue status
       $queue->status = SendingQueueModel::STATUS_SCHEDULED;
-      $queue->scheduled_at = Scheduler::scheduleFromTimestamp(
+      $queue->scheduled_at = Scheduler::formatDatetimeString(
         $newsletter->scheduledAt
       );
       $queue->subscribers = null;
@@ -83,7 +83,7 @@ class SendingQueue extends APIEndpoint {
       $subscribers = array_unique($subscribers);
       if(!count($subscribers)) {
         return $this->errorResponse(array(
-          APIError::UNKNOWN => __('There are no subscribers in that list!')
+          APIError::UNKNOWN => __('There are no subscribers in that list!', 'mailpoet')
         ));
       }
       $queue->status = null;
@@ -119,14 +119,14 @@ class SendingQueue extends APIEndpoint {
 
     if($newsletter === false) {
       return $this->errorResponse(array(
-        APIError::NOT_FOUND => __('This newsletter does not exist.')
+        APIError::NOT_FOUND => __('This newsletter does not exist.', 'mailpoet')
       ));
     } else {
       $queue = $newsletter->getQueue();
 
       if($queue === false) {
         return $this->errorResponse(array(
-          APIError::UNKNOWN => __('This newsletter has not been sent yet.')
+          APIError::UNKNOWN => __('This newsletter has not been sent yet.', 'mailpoet')
         ));
       } else {
         $queue->pause();
@@ -145,14 +145,14 @@ class SendingQueue extends APIEndpoint {
     $newsletter = Newsletter::findOne($newsletter_id);
     if($newsletter === false) {
       return $this->errorResponse(array(
-        APIError::NOT_FOUND => __('This newsletter does not exist.')
+        APIError::NOT_FOUND => __('This newsletter does not exist.', 'mailpoet')
       ));
     } else {
       $queue = $newsletter->getQueue();
 
       if($queue === false) {
         return $this->errorResponse(array(
-          APIError::UNKNOWN => __('This newsletter has not been sent yet.')
+          APIError::UNKNOWN => __('This newsletter has not been sent yet.', 'mailpoet')
         ));
       } else {
         $queue->resume();

lib/API/Endpoints/Settings.php

@@ -15,7 +15,7 @@ class Settings extends APIEndpoint {
     if(empty($settings)) {
       return $this->badRequest(array(
         APIError::BAD_REQUEST =>
-          __("You have not specified any settings to be saved.")
+          __("You have not specified any settings to be saved.", 'mailpoet')
       ));
     } else {
       foreach($settings as $name => $value) {

lib/API/Endpoints/Subscribers.php

@@ -1,5 +1,7 @@
 <?php
 namespace MailPoet\API\Endpoints;
+use \MailPoet\API\Endpoint as APIEndpoint;
+use \MailPoet\API\Error as APIError;
 
 use MailPoet\Listing;
 use MailPoet\Models\Subscriber;
@@ -9,23 +11,25 @@ use MailPoet\Models\Segment;
 use MailPoet\Models\Setting;
 use MailPoet\Models\Form;
 use MailPoet\Models\StatisticsForms;
-use MailPoet\Util\Url;
 
 if(!defined('ABSPATH')) exit;
 
-class Subscribers {
-  function __construct() {
-  }
-
-  function get($id = null) {
+class Subscribers extends APIEndpoint {
+  function get($data = array()) {
+    $id = (isset($data['id']) ? (int)$data['id'] : false);
     $subscriber = Subscriber::findOne($id);
-    if($subscriber !== false) {
-      $subscriber = $subscriber
-        ->withCustomFields()
-        ->withSubscriptions()
-        ->asArray();
+    if($subscriber === false) {
+      return $this->errorResponse(array(
+        APIError::NOT_FOUND => __('This subscriber does not exist.', 'mailpoet')
+      ));
+    } else {
+      return $this->successResponse(
+        $subscriber
+          ->withCustomFields()
+          ->withSubscriptions()
+          ->asArray()
+      );
     }
-    return $subscriber;
   }
 
   function listing($data = array()) {
@@ -36,41 +40,24 @@ class Subscribers {
 
     $listing_data = $listing->get();
 
-    // fetch segments relations for each returned item
-    foreach($listing_data['items'] as $key => $subscriber) {
-      $listing_data['items'][$key] = $subscriber
+    $data = array();
+    foreach($listing_data['items'] as $subscriber) {
+      $data[] = $subscriber
         ->withSubscriptions()
         ->asArray();
     }
 
-    return $listing_data;
-  }
-
-  function save($data = array()) {
-    $subscriber = Subscriber::createOrUpdate($data);
-    $errors = $subscriber->getErrors();
-
-    if(!empty($errors)) {
-      return array(
-        'result' => false,
-        'errors' => $errors
-      );
-    } else {
-      return array(
-        'result' => true
-      );
-    }
+    return $this->successResponse($data, array(
+      'count' => $listing_data['count'],
+      'filters' => $listing_data['filters'],
+      'groups' => $listing_data['groups']
+    ));
   }
 
   function subscribe($data = array()) {
-    $doing_ajax = (bool)(defined('DOING_AJAX') && DOING_AJAX);
-    $errors = array();
-
-    $form = Form::findOne($data['form_id']);
+    $form_id = (isset($data['form_id']) ? (int)$data['form_id'] : false);
+    $form = Form::findOne($form_id);
     unset($data['form_id']);
-    if($form === false || !$form->id()) {
-      $errors[] = __('This form does not exist');
-    }
 
     $segment_ids = (!empty($data['segments'])
       ? (array)$data['segments']
@@ -79,106 +66,110 @@ class Subscribers {
     unset($data['segments']);
 
     if(empty($segment_ids)) {
-      $errors[] = __('Please select a list');
-    }
-
-    if(!empty($errors)) {
-      return array(
-        'result' => false,
-        'errors' => $errors
-      );
+      return $this->badRequest(array(
+        APIError::BAD_REQUEST => __('Please select a list', 'mailpoet')
+      ));
     }
 
     $subscriber = Subscriber::subscribe($data, $segment_ids);
     $errors = $subscriber->getErrors();
-    $result = ($errors === false && $subscriber->id() > 0);
 
-    // record form statistics
-    if($result === true && $form !== false && $form->id > 0) {
-      StatisticsForms::record($form->id, $subscriber->id);
-    }
+    if($errors !== false) {
+      return $this->badRequest($errors);
+    } else {
+      $meta = array();
 
-    // get success message to display after subscription
-    $form_settings = (
-      isset($form->settings)
-      ? unserialize($form->settings)
-      : null
-    );
+      if($form !== false) {
+        // record form statistics
+        StatisticsForms::record($form->id, $subscriber->id);
 
-    if($form_settings !== null) {
-      switch($form_settings['on_success']) {
-        case 'page':
-          $success_page_url = get_permalink($form_settings['success_page']);
+        $form = $form->asArray();
 
-          // response depending on context
-          if($doing_ajax === true) {
-            return array(
-              'result' => $result,
-              'page' => $success_page_url,
-              'errors' => $errors
-            );
-          } else {
-            if($result === false) {
-              Url::redirectBack();
-            } else {
-              Url::redirectTo($success_page_url);
-            }
-          }
-          break;
-
-        case 'message':
-        default:
-          // response depending on context
-          if($doing_ajax === true) {
-            return array(
-              'result' => $result,
-              'errors' => $errors
-            );
-          } else {
-            $params = (
-              ($result === true)
-              ? array('mailpoet_success' => $form->id)
-              : array()
-            );
-
-            Url::redirectBack($params);
-          }
-          break;
+        if($form['settings']['on_success'] === 'page') {
+          // redirect to a page on a success, pass the page url in the meta
+          $meta['redirect_url'] = get_permalink($form['settings']['success_page']);
+        } else if($form['settings']['on_success'] === 'url') {
+          $meta['redirect_url'] = $form['settings']['success_url'];
+        }
       }
+
+      return $this->successResponse(
+        Subscriber::findOne($subscriber->id)->asArray(),
+        $meta
+      );
     }
   }
 
-  function restore($id) {
+  function save($data = array()) {
+    $subscriber = Subscriber::createOrUpdate($data);
+    $errors = $subscriber->getErrors();
+
+    if(!empty($errors)) {
+      return $this->badRequest($errors);
+    } else {
+      return $this->successResponse(
+        Subscriber::findOne($subscriber->id)->asArray()
+      );
+    }
+  }
+
+  function restore($data = array()) {
+    $id = (isset($data['id']) ? (int)$data['id'] : false);
     $subscriber = Subscriber::findOne($id);
-    if($subscriber !== false) {
+    if($subscriber === false) {
+      return $this->errorResponse(array(
+        APIError::NOT_FOUND => __('This subscriber does not exist.', 'mailpoet')
+      ));
+    } else {
       $subscriber->restore();
+      return $this->successResponse(
+        Subscriber::findOne($subscriber->id)->asArray(),
+        array('count' => 1)
+      );
     }
-    return ($subscriber->getErrors() === false);
   }
 
-  function trash($id) {
+  function trash($data = array()) {
+    $id = (isset($data['id']) ? (int)$data['id'] : false);
     $subscriber = Subscriber::findOne($id);
-    if($subscriber !== false) {
+    if($subscriber === false) {
+      return $this->errorResponse(array(
+        APIError::NOT_FOUND => __('This subscriber does not exist.', 'mailpoet')
+      ));
+    } else {
       $subscriber->trash();
+      return $this->successResponse(
+        Subscriber::findOne($subscriber->id)->asArray(),
+        array('count' => 1)
+      );
     }
-    return ($subscriber->getErrors() === false);
   }
 
-  function delete($id) {
+  function delete($data = array()) {
+    $id = (isset($data['id']) ? (int)$data['id'] : false);
     $subscriber = Subscriber::findOne($id);
-    if($subscriber !== false) {
+    if($subscriber === false) {
+      return $this->errorResponse(array(
+        APIError::NOT_FOUND => __('This subscriber does not exist.', 'mailpoet')
+      ));
+    } else {
       $subscriber->delete();
-      return 1;
+      return $this->successResponse(null, array('count' => 1));
     }
-    return false;
   }
 
   function bulkAction($data = array()) {
-    $bulk_action = new Listing\BulkAction(
-      '\MailPoet\Models\Subscriber',
-      $data
-    );
-
-    return $bulk_action->apply();
+    try {
+      $bulk_action = new Listing\BulkAction(
+        '\MailPoet\Models\Subscriber',
+        $data
+      );
+      $meta = $bulk_action->apply();
+      return $this->successResponse(null, $meta);
+    } catch(\Exception $e) {
+      return $this->errorResponse(array(
+        $e->getCode() => $e->getMessage()
+      ));
+    }
   }
 }

lib/API/Response.php

@@ -31,11 +31,11 @@ abstract class Response {
       $response = array_merge($response, $data);
     }
 
-    if(empty($response)) {
-      die();
-    } else {
-      wp_send_json($response);
+    if(!empty($response)) {
+      @header('Content-Type: application/json; charset='.get_option('blog_charset'));
+      echo wp_json_encode($response);
     }
+    die();
   }
 
   abstract function getData();

lib/Config/Env.php

@@ -27,6 +27,7 @@ class Env {
   static $db_password;
   static $db_charset;
   static $db_timezone_offset;
+  static $subscribers_limit = 2000;
 
   static function init($file, $version) {
     global $wpdb;

lib/Config/Hooks.php

@@ -91,6 +91,16 @@ class Hooks {
       'admin_post_nopriv_mailpoet_subscription_update',
       '\MailPoet\Subscription\Manage::onSave'
     );
+
+    // Subscription form
+    add_action(
+      'admin_post_mailpoet_subscription_form',
+      '\MailPoet\Subscription\Form::onSubmit'
+    );
+    add_action(
+      'admin_post_nopriv_mailpoet_subscription_form',
+      '\MailPoet\Subscription\Form::onSubmit'
+    );
   }
 
   function setupWPUsers() {
@@ -138,7 +148,7 @@ class Hooks {
 
   function appendImageSize($sizes) {
     return array_merge($sizes, array(
-      'mailpoet_newsletter_max' => __('MailPoet Newsletter')
+      'mailpoet_newsletter_max' => __('MailPoet Newsletter', 'mailpoet')
     ));
   }
 

lib/Config/Localizer.php

@@ -25,8 +25,6 @@ class Localizer {
     $language_path =
       Env::$languages_path
       . '/'
-      . Env::$plugin_name
-      . '-'
       . $this->locale()
       . '.mo';
     load_textdomain(Env::$plugin_name, $language_path);

lib/Config/Menu.php

@@ -34,6 +34,16 @@ class Menu {
     );
   }
 
+  function checkSubscribersLimit() {
+    $subscribers_count = Subscriber::getTotalSubscribers();
+    if($subscribers_count > Env::$subscribers_limit) {
+      echo $this->renderer->render('limit.html', array(
+        'limit' => Env::$subscribers_limit
+      ));
+      exit;
+    }
+  }
+
   function setup() {
     $main_page_slug = 'mailpoet-newsletters';
 
@@ -49,8 +59,8 @@ class Menu {
 
     $newsletters_page = add_submenu_page(
       $main_page_slug,
-      $this->setPageTitle(__('Newsletters')),
-      __('Newsletters'),
+      $this->setPageTitle(__('Newsletters', 'mailpoet')),
+      __('Newsletters', 'mailpoet'),
       'manage_options',
       $main_page_slug,
       array($this, 'newsletters')
@@ -69,8 +79,8 @@ class Menu {
 
     $forms_page = add_submenu_page(
       $main_page_slug,
-      $this->setPageTitle(__('Forms')),
-      __('Forms'),
+      $this->setPageTitle(__('Forms', 'mailpoet')),
+      __('Forms', 'mailpoet'),
       'manage_options',
       'mailpoet-forms',
       array($this, 'forms')
@@ -88,8 +98,8 @@ class Menu {
 
     $subscribers_page = add_submenu_page(
       $main_page_slug,
-      $this->setPageTitle(__('Subscribers')),
-      __('Subscribers'),
+      $this->setPageTitle(__('Subscribers', 'mailpoet')),
+      __('Subscribers', 'mailpoet'),
       'manage_options',
       'mailpoet-subscribers',
       array($this, 'subscribers')
@@ -107,8 +117,8 @@ class Menu {
 
     $segments_page = add_submenu_page(
       $main_page_slug,
-      $this->setPageTitle(__('Lists')),
-      __('Lists'),
+      $this->setPageTitle(__('Lists', 'mailpoet')),
+      __('Lists', 'mailpoet'),
       'manage_options',
       'mailpoet-segments',
       array($this, 'segments')
@@ -127,16 +137,16 @@ class Menu {
 
     add_submenu_page(
       $main_page_slug,
-      $this->setPageTitle( __('Settings')),
-      __('Settings'),
+      $this->setPageTitle( __('Settings', 'mailpoet')),
+      __('Settings', 'mailpoet'),
       'manage_options',
       'mailpoet-settings',
       array($this, 'settings')
     );
     add_submenu_page(
       'admin.php?page=mailpoet-subscribers',
-      $this->setPageTitle( __('Import')),
-      __('Import'),
+      $this->setPageTitle( __('Import', 'mailpoet')),
+      __('Import', 'mailpoet'),
       'manage_options',
       'mailpoet-import',
       array($this, 'import')
@@ -144,8 +154,8 @@ class Menu {
 
     add_submenu_page(
       true,
-      $this->setPageTitle(__('Export')),
-      __('Export'),
+      $this->setPageTitle(__('Export', 'mailpoet')),
+      __('Export', 'mailpoet'),
       'manage_options',
       'mailpoet-export',
       array($this, 'export')
@@ -153,8 +163,8 @@ class Menu {
 
     add_submenu_page(
       true,
-      $this->setPageTitle(__('Welcome')),
-      __('Welcome'),
+      $this->setPageTitle(__('Welcome', 'mailpoet')),
+      __('Welcome', 'mailpoet'),
       'manage_options',
       'mailpoet-welcome',
       array($this, 'welcome')
@@ -162,8 +172,8 @@ class Menu {
 
     add_submenu_page(
       true,
-      $this->setPageTitle(__('Update')),
-      __('Update'),
+      $this->setPageTitle(__('Update', 'mailpoet')),
+      __('Update', 'mailpoet'),
       'manage_options',
       'mailpoet-update',
       array($this, 'update')
@@ -171,8 +181,8 @@ class Menu {
 
     add_submenu_page(
       true,
-      $this->setPageTitle(__('Form Editor')),
-      __('Form Editor'),
+      $this->setPageTitle(__('Form Editor', 'mailpoet')),
+      __('Form Editor', 'mailpoet'),
       'manage_options',
       'mailpoet-form-editor',
       array($this, 'formEditor')
@@ -180,8 +190,8 @@ class Menu {
 
     add_submenu_page(
       true,
-      $this->setPageTitle(__('Newsletter')),
-      __('Newsletter Editor'),
+      $this->setPageTitle(__('Newsletter', 'mailpoet')),
+      __('Newsletter Editor', 'mailpoet'),
       'manage_options',
       'mailpoet-newsletter-editor',
       array($this, 'newletterEditor')
@@ -242,12 +252,14 @@ class Menu {
   }
 
   function settings() {
+    $this->checkSubscribersLimit();
+
     $settings = Setting::getAll();
     $flags = $this->_getFlags();
 
     $data = array(
       'settings' => $settings,
-      'segments' => Segment::getPublic()->findArray(),
+      'segments' => Segment::getSegmentsWithSubscriberCount(),
       'cron_trigger' => CronTrigger::getAvailableMethods(),
       'pages' => Pages::getAll(),
       'flags' => $flags,
@@ -291,7 +303,7 @@ class Menu {
     $data = array();
 
     $data['items_per_page'] = $this->getLimitPerPage('subscribers');
-    $data['segments'] = Segment::findArray();
+    $data['segments'] = Segment::getSegmentsWithSubscriberCount($type = false);
 
     $data['custom_fields'] = array_map(function($field) {
       $field['params'] = unserialize($field['params']);
@@ -314,12 +326,16 @@ class Menu {
   }
 
   function segments() {
+    $this->checkSubscribersLimit();
+
     $data = array();
     $data['items_per_page'] = $this->getLimitPerPage('segments');
     echo $this->renderer->render('segments.html', $data);
   }
 
   function forms() {
+    $this->checkSubscribersLimit();
+
     $data = array();
 
     $data['items_per_page'] = $this->getLimitPerPage('forms');
@@ -329,6 +345,8 @@ class Menu {
   }
 
   function newsletters() {
+    $this->checkSubscribersLimit();
+
     global $wp_roles;
 
     $data = array();
@@ -337,7 +355,7 @@ class Menu {
     $data['segments'] = Segment::getSegmentsWithSubscriberCount($type = false);
     $data['settings'] = Setting::getAll();
     $data['roles'] = $wp_roles->get_names();
-    $data['roles']['mailpoet_all'] = __('In any WordPress role');
+    $data['roles']['mailpoet_all'] = __('In any WordPress role', 'mailpoet');
 
     $date_time = new DateTime();
     $data['current_date'] = $date_time->getCurrentDate(DateTime::DEFAULT_DATE_FORMAT);
@@ -398,7 +416,7 @@ class Menu {
     $data = array(
       'form' => $form,
       'pages' => Pages::getAll(),
-      'segments' => Segment::getPublic()->findArray(),
+      'segments' => Segment::getSegmentsWithSubscriberCount(),
       'styles' => FormRenderer::getStyles($form),
       'date_types' => Block\Date::getDateTypes(),
       'date_formats' => Block\Date::getDateFormats(),
@@ -412,7 +430,7 @@ class Menu {
   function setPageTitle($title) {
     return sprintf(
       '%s - %s',
-      __('MailPoet'),
+      __('MailPoet', 'mailpoet'),
       $title
     );
   }

lib/Config/Populator.php

@@ -1,18 +1,6 @@
 <?php
 namespace MailPoet\Config;
 
-use MailPoet\Config\PopulatorData\Templates\FranksRoastHouseTemplate;
-use MailPoet\Config\PopulatorData\Templates\NewsletterBlank1Column;
-use MailPoet\Config\PopulatorData\Templates\NewsletterBlank12Column;
-use MailPoet\Config\PopulatorData\Templates\NewsletterBlank121Column;
-use MailPoet\Config\PopulatorData\Templates\NewsletterBlank13Column;
-use MailPoet\Config\PopulatorData\Templates\PostNotificationsBlank1Column;
-use MailPoet\Config\PopulatorData\Templates\WelcomeBlank1Column;
-use MailPoet\Config\PopulatorData\Templates\WelcomeBlank12Column;
-use MailPoet\Config\PopulatorData\Templates\SimpleText;
-use MailPoet\Config\PopulatorData\Templates\Restaurant;
-use MailPoet\Config\PopulatorData\Templates\StoreDiscount;
-use MailPoet\Config\PopulatorData\Templates\TravelEmail;
 use MailPoet\Cron\CronTrigger;
 use \MailPoet\Models\Segment;
 use \MailPoet\Segments\WP;
@@ -25,12 +13,31 @@ if(!defined('ABSPATH')) exit;
 require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
 
 class Populator {
+  public $prefix;
+  public $models;
+  public $templates;
+  const TEMPLATES_NAMESPACE = '\MailPoet\Config\PopulatorData\Templates\\';
+
   function __construct() {
     $this->prefix = Env::$db_prefix;
     $this->models = array(
       'newsletter_option_fields',
       'newsletter_templates',
     );
+    $this->templates = array(
+      "FranksRoastHouseTemplate",
+      "NewsletterBlank1Column",
+      "NewsletterBlank12Column",
+      "NewsletterBlank121Column",
+      "NewsletterBlank13Column",
+      "PostNotificationsBlank1Column",
+      "WelcomeBlank1Column",
+      "WelcomeBlank12Column",
+      "SimpleText",
+      "Restaurant",
+      "StoreDiscount",
+      "TravelEmail"
+    );
   }
 
   function up() {
@@ -124,9 +131,9 @@ class Populator {
     if(Segment::where('type', 'default')->count() === 0) {
       $default_segment = Segment::create();
       $default_segment->hydrate(array(
-        'name' => __('My First List'),
+        'name' => __('My First List', 'mailpoet'),
         'description' =>
-          __('This list is automatically created when you install MailPoet')
+          __('This list is automatically created when you install MailPoet', 'mailpoet')
       ));
       $default_segment->save();
     }
@@ -191,20 +198,13 @@ class Populator {
   }
 
   private function newsletterTemplates() {
-    return array(
-      (new FranksRoastHouseTemplate(Env::$assets_url))->get(),
-      (new NewsletterBlank1Column(Env::$assets_url))->get(),
-      (new NewsletterBlank12Column(Env::$assets_url))->get(),
-      (new NewsletterBlank121Column(Env::$assets_url))->get(),
-      (new NewsletterBlank13Column(Env::$assets_url))->get(),
-      (new PostNotificationsBlank1Column(Env::$assets_url))->get(),
-      (new WelcomeBlank1Column(Env::$assets_url))->get(),
-      (new WelcomeBlank12Column(Env::$assets_url))->get(),
-      (new SimpleText(Env::$assets_url))->get(),
-      (new Restaurant(Env::$assets_url))->get(),
-      (new StoreDiscount(Env::$assets_url))->get(),
-      (new TravelEmail(Env::$assets_url))->get(),
-    );
+    $templates = array();
+    foreach($this->templates as $template) {
+      $template = self::TEMPLATES_NAMESPACE . $template;
+      $template = new $template(Env::$assets_url);
+      $templates[] = $template->get();
+    }
+    return $templates;
   }
 
   private function populate($model) {

lib/Config/PopulatorData/Templates/FranksRoastHouseTemplate.php

@@ -13,8 +13,8 @@ class FranksRoastHouseTemplate {
 
   function get() {
     return array(
-      'name' => __("Frank's Roast House"),
-      'description' => __("Think of this as your sandbox. Play around with this example newsletter to see what MailPoet can do for you."),
+      'name' => __("Frank's Roast House", 'mailpoet'),
+      'description' => __("Think of this as your sandbox. Play around with this example newsletter to see what MailPoet can do for you.", 'mailpoet'),
       'readonly' => 0,
       'thumbnail' => $this->getThumbnail(),
       'body' => json_encode($this->getBody()),
@@ -46,7 +46,7 @@ class FranksRoastHouseTemplate {
                 "blocks" => array(
                   array(
                     "type" => "header",
-                    "text" => __("<a href=\"[link:newsletter_view_in_browser_url]\">Open this email in your web browser.</a>"),
+                    "text" => __("<a href=\"[link:newsletter_view_in_browser_url]\">Open this email in your web browser.</a>", 'mailpoet'),
                     "styles" => array(
                       "block" => array(
                         "backgroundColor" => "#ccc6c6"
@@ -67,7 +67,7 @@ class FranksRoastHouseTemplate {
                     "type" => "image",
                     "link" => "http://www.example.com",
                     "src" => $this->template_image_url . "/header-v2.jpg",
-                    "alt" => __("Frank's Café"),
+                    "alt" => __("Frank's Café", 'mailpoet'),
                     "fullWidth" => true,
                     "width" => "600px",
                     "height" => "220px",
@@ -88,13 +88,13 @@ class FranksRoastHouseTemplate {
                   ),
                   array(
                     "type" => "text",
-                    "text" => __("<p>Hi there&nbsp;[subscriber:firstname | default:coffee drinker]</p>\n<p></p>\n<p>Sit back&nbsp;and enjoy your favorite roast as you read this week's newsletter.&nbsp;</p>")
+                    "text" => __("<p>Hi there&nbsp;[subscriber:firstname | default:coffee drinker]</p>\n<p></p>\n<p>Sit back&nbsp;and enjoy your favorite roast as you read this week's newsletter.&nbsp;</p>", 'mailpoet')
                   ),
                   array(
                     "type" => "image",
                     "link" => "http://example.org",
                     "src" => $this->template_image_url . "/coffee-grain.jpg",
-                    "alt" => __("coffee-grain-3-1329675-1599x941"),
+                    "alt" => __('Coffee grain', 'mailpoet'),
                     "fullWidth" => false,
                     "width" => "1599px",
                     "height" => "777px",
@@ -106,7 +106,7 @@ class FranksRoastHouseTemplate {
                   ),
                   array(
                     "type" => "text",
-                    "text" => __("<h1 style=\"text-align: center;\">--- Guest Coffee Roaster: <em>Brew Bros. ---</em></h1>\n<p><em></em></p>\n<p>Visit our Center Avenue store to try the latest guest coffee from Brew Bros, a local coffee roaster. This young duo started only two years ago, but have quickly gained&nbsp;popularity through pop-up shops, local events, and collaborations with food trucks.</p>\n<p></p>\n<blockquote>\n<p><span style=\"color: #ff6600;\"><em>Tasting notes: A rich, caramel flavor with subtle hints of molasses. The perfect wake-up morning espresso!</em></span></p>\n</blockquote>")
+                    "text" => __("<h1 style=\"text-align: center;\">--- Guest Coffee Roaster: <em>Brew Bros. ---</em></h1>\n<p><em></em></p>\n<p>Visit our Center Avenue store to try the latest guest coffee from Brew Bros, a local coffee roaster. This young duo started only two years ago, but have quickly gained&nbsp;popularity through pop-up shops, local events, and collaborations with food trucks.</p>\n<p></p>\n<blockquote>\n<p><span style=\"color: #ff6600;\"><em>Tasting notes: A rich, caramel flavor with subtle hints of molasses. The perfect wake-up morning espresso!</em></span></p>\n</blockquote>", 'mailpoet')
                   )
                 )
               )
@@ -132,13 +132,13 @@ class FranksRoastHouseTemplate {
                 "blocks" => array(
                   array(
                     "type" => "text",
-                    "text" => __("<h2>Sandwich Competition</h2>")
+                    "text" => __("<h2>Sandwich Competition</h2>", 'mailpoet')
                   ),
                   array(
                     "type" => "image",
                     "link" => "http://example.org",
                     "src" => $this->template_image_url . "/sandwich.jpg",
-                    "alt" => "sandwich",
+                    "alt" => __('Sandwich', 'mailpoet'),
                     "fullWidth" => false,
                     "width" => "640px",
                     "height" => "344px",
@@ -150,7 +150,7 @@ class FranksRoastHouseTemplate {
                   ),
                   array(
                     "type" => "text",
-                    "text" => __("<p>Have an idea for the Next Great Sandwich? Tell us! We're offering free lunch for a month if you can invent an awesome new sandwich for our menu.</p>\n<p></p>\n<p></p>\n<p>Simply tweet your ideas to <a href=\"http://www.example.com\" title=\"This isn't a real twitter account\">@franksroasthouse</a> and use #sandwichcomp and we'll let you know if you're a winner.</p>")
+                    "text" => __("<p>Have an idea for the Next Great Sandwich? Tell us! We're offering free lunch for a month if you can invent an awesome new sandwich for our menu.</p>\n<p></p>\n<p></p>\n<p>Simply tweet your ideas to <a href=\"http://www.example.com\" title=\"This isn't a real twitter account\">@franksroasthouse</a> and use #sandwichcomp and we'll let you know if you're a winner.</p>", 'mailpoet')
                   ),
                   array(
                     "type" => "button",
@@ -175,7 +175,7 @@ class FranksRoastHouseTemplate {
                   ),
                   array(
                     "type" => "text",
-                    "text" => __("<h3 style=\"text-align: center;\">Follow Us</h3>")
+                    "text" => __("<h3 style=\"text-align: center;\">Follow Us</h3>", 'mailpoet')
                   ),
                   array(
                     "type" => "social",
@@ -232,13 +232,13 @@ class FranksRoastHouseTemplate {
                 "blocks" => array(
                   array(
                     "type" => "text",
-                    "text" => __("<h2>New Store Opening!</h2>")
+                    "text" => __("<h2>New Store Opening!</h2>", 'mailpoet')
                   ),
                   array(
                     "type" => "image",
                     "link" => "http://example.org",
                     "src" => $this->template_image_url . "/map-v2.jpg",
-                    "alt" => __("map-v2"),
+                    "alt" => __('Map', 'mailpoet'),
                     "fullWidth" => false,
                     "width" => "636px",
                     "height" => "342px",
@@ -250,11 +250,11 @@ class FranksRoastHouseTemplate {
                   ),
                   array(
                     "type" => "text",
-                    "text" => __("<p>Watch out Broad Street, we're coming to you very soon!&nbsp;</p>\n<p></p>\n<p>Keep an eye on your inbox, as we'll have some special offers for our email subscribers plus an exclusive launch party invite!<br /><br /></p>")
+                    "text" => __("<p>Watch out Broad Street, we're coming to you very soon!&nbsp;</p>\n<p></p>\n<p>Keep an eye on your inbox, as we'll have some special offers for our email subscribers plus an exclusive launch party invite!<br /><br /></p>", 'mailpoet')
                   ),
                   array(
                     "type" => "text",
-                    "text" => __("<h2>New and Improved Hours!</h2>\n<p></p>\n<p>Frank's is now open even later, so you can get your caffeine fix all day (and night) long! Here's our new opening hours:</p>\n<p></p>\n<ul>\n<li>Monday - Thursday: 6am - 12am</li>\n<li>Friday - Saturday: 6am - 1:30am</li>\n<li>Sunday: 7:30am - 11pm</li>\n</ul>")
+                    "text" => __("<h2>New and Improved Hours!</h2>\n<p></p>\n<p>Frank's is now open even later, so you can get your caffeine fix all day (and night) long! Here's our new opening hours:</p>\n<p></p>\n<ul>\n<li>Monday - Thursday: 6am - 12am</li>\n<li>Friday - Saturday: 6am - 1:30am</li>\n<li>Sunday: 7:30am - 11pm</li>\n</ul>", 'mailpoet')
                   )
                 )
               )
@@ -280,7 +280,7 @@ class FranksRoastHouseTemplate {
                 "blocks" => array(
                   array(
                     "type" => "footer",
-                    "text" => __("<p><a href=\"[link:subscription_unsubscribe_url]\">Unsubscribe</a> | <a href=\"[link:subscription_manage_url]\">Manage subscription</a><br />12345 MailPoet Drive, EmailVille, 76543</p>"),
+                    "text" => __("<p><a href=\"[link:subscription_unsubscribe_url]\">Unsubscribe</a> | <a href=\"[link:subscription_manage_url]\">Manage subscription</a><br />12345 MailPoet Drive, EmailVille, 76543</p>", 'mailpoet'),
                     "styles" => array(
                       "block" => array(
                         "backgroundColor" => "#a9a7a7"

lib/Config/PopulatorData/Templates/NewsletterBlank121Column.php

@@ -13,8 +13,8 @@ class NewsletterBlank121Column {
 
   function get() {
     return array(
-      'name' => __("Newsletter: Blank 1:2:1 Column"),
-      'description' => __("A blank Newsletter template with a 1:2:1 column layout."),
+      'name' => __("Newsletter: Blank 1:2:1 Column", 'mailpoet'),
+      'description' => __("A blank Newsletter template with a 1:2:1 column layout.", 'mailpoet'),
       'readonly' => 1,
       'thumbnail' => $this->getThumbnail(),
       'body' => json_encode($this->getBody()),
@@ -52,7 +52,7 @@ class NewsletterBlank121Column {
                 "blocks" => array(
                   array(
                     "type" => "header",
-                    "text" => __("Display problems?&nbsp;<a href=\"[link:newsletter_view_in_browser_url]\">Open this email in your web browser</a>"),
+                    "text" => __("Display problems?&nbsp;<a href=\"[link:newsletter_view_in_browser_url]\">Open this email in your web browser</a>", 'mailpoet'),
                     "styles" => array(
                       "block" => array(
                         "backgroundColor" => "transparent"
@@ -104,7 +104,7 @@ class NewsletterBlank121Column {
                     "type" => "image",
                     "link" => "",
                     "src" => $this->template_image_url . "/fake-logo.png",
-                    "alt" => __("Fake logo"),
+                    "alt" => __("Fake logo", 'mailpoet'),
                     "fullWidth" => false,
                     "width" => "598px",
                     "height" => "71px",
@@ -116,7 +116,7 @@ class NewsletterBlank121Column {
                   ),
                   array(
                     "type" => "text",
-                    "text" => __("<h1 style=\"text-align: center;\"><strong>Let's Get Started!</strong></h1>\n<p>It's time to design your newsletter! On&nbsp;the right sidebar, you'll find four menu items that will help&nbsp;you&nbsp;customize your&nbsp;newsletter:</p>\n<ol>\n<li>Content</li>\n<li>Layout</li>\n<li>Styles</li>\n<li>Preview</li>\n</ol>")
+                    "text" => __("<h1 style=\"text-align: center;\"><strong>Let's Get Started!</strong></h1>\n<p>It's time to design your newsletter! On&nbsp;the right sidebar, you'll find four menu items that will help&nbsp;you&nbsp;customize your&nbsp;newsletter:</p>\n<ol>\n<li>Content</li>\n<li>Layout</li>\n<li>Styles</li>\n<li>Preview</li>\n</ol>", 'mailpoet')
                   ),
                   array(
                     "type" => "divider",
@@ -154,11 +154,11 @@ class NewsletterBlank121Column {
                 "blocks" => array(
                   array(
                     "type" => "text",
-                    "text" => __("<h2>This template has...</h2>")
+                    "text" => __("<h2>This template has...</h2>", 'mailpoet')
                   ),
                   array(
                     "type" => "text",
-                    "text" => __("<p>In the right sidebar, you can&nbsp;add layout blocks to your email:</p>\n<ul>\n<li>1 column</li>\n<li>2 columns</li>\n<li>3 columns</li>\n</ul>")
+                    "text" => __("<p>In the right sidebar, you can&nbsp;add layout blocks to your email:</p>\n<ul>\n<li>1 column</li>\n<li>2 columns</li>\n<li>3 columns</li>\n</ul>", 'mailpoet')
                   )
                 )
               ),
@@ -173,11 +173,11 @@ class NewsletterBlank121Column {
                 "blocks" => array(
                   array(
                     "type" => "text",
-                    "text" => __("<h2>... a 2-column layout.</h2>")
+                    "text" => __("<h2>... a 2-column layout.</h2>", 'mailpoet')
                   ),
                   array(
                     "type" => "text",
-                    "text" => __("<p>You can change a layout's background color by clicking on the settings icon on the right edge of the&nbsp;Designer. Simply hover&nbsp;over this area to see the Settings (gear) icon.</p>")
+                    "text" => __("<p>You can change a layout's background color by clicking on the settings icon on the right edge of the&nbsp;Designer. Simply hover&nbsp;over this area to see the Settings (gear) icon.</p>", 'mailpoet')
                   )
                 )
               )
@@ -237,7 +237,7 @@ class NewsletterBlank121Column {
                 "blocks" => array(
                   array(
                     "type" => "text",
-                    "text" => __("<h3 style=\"text-align: center;\"><span style=\"font-weight: 600;\">Let's end with&nbsp;a single column.&nbsp;</span></h3>\n<p style=\"line-height: 25.6px;\">In the right sidebar, you can&nbsp;add these layout blocks to your&nbsp;email:</p>\n<p style=\"line-height: 25.6px;\"></p>\n<ul style=\"line-height: 25.6px;\">\n<li>1 column</li>\n<li>2 columns</li>\n<li>3 columns</li>\n</ul>")
+                    "text" => __("<h3 style=\"text-align: center;\"><span style=\"font-weight: 600;\">Let's end with&nbsp;a single column.&nbsp;</span></h3>\n<p style=\"line-height: 25.6px;\">In the right sidebar, you can&nbsp;add these layout blocks to your&nbsp;email:</p>\n<p style=\"line-height: 25.6px;\"></p>\n<ul style=\"line-height: 25.6px;\">\n<li>1 column</li>\n<li>2 columns</li>\n<li>3 columns</li>\n</ul>", 'mailpoet')
                   )
                 )
               )
@@ -311,7 +311,7 @@ class NewsletterBlank121Column {
                   ),
                   array(
                     "type" => "footer",
-                    "text" => __("<p><a href=\"[link:subscription_unsubscribe_url]\">Unsubscribe</a> | <a href=\"[link:subscription_manage_url]\">Manage your subscription</a><br />Add your postal address here!</p>"),
+                    "text" => __("<p><a href=\"[link:subscription_unsubscribe_url]\">Unsubscribe</a> | <a href=\"[link:subscription_manage_url]\">Manage your subscription</a><br />Add your postal address here!</p>", 'mailpoet'),
                     "styles" => array(
                       "block" => array(
                         "backgroundColor" => "transparent"

lib/Config/PopulatorData/Templates/NewsletterBlank12Column.php

@@ -13,8 +13,8 @@ class NewsletterBlank12Column {
 
   function get() {
     return array(
-      'name' => __("Newsletter: Blank 1:2 Column"),
-      'description' => __("A blank Newsletter template with a 1:2 column layout."),
+      'name' => __("Newsletter: Blank 1:2 Column", 'mailpoet'),
+      'description' => __("A blank Newsletter template with a 1:2 column layout.", 'mailpoet'),
       'readonly' => 1,
       'thumbnail' => $this->getThumbnail(),
       'body' => json_encode($this->getBody()),
@@ -52,7 +52,7 @@ class NewsletterBlank12Column {
                 "blocks" => array(
                   array(
                     "type" => "header",
-                    "text" => __("Display problems?&nbsp;<a href=\"[link:newsletter_view_in_browser_url]\">Open this email in your web browser</a>"),
+                    "text" => __("Display problems?&nbsp;<a href=\"[link:newsletter_view_in_browser_url]\">Open this email in your web browser</a>", 'mailpoet'),
                     "styles" => array(
                       "block" => array(
                         "backgroundColor" => "transparent"
@@ -104,7 +104,7 @@ class NewsletterBlank12Column {
                     "type" => "image",
                     "link" => "",
                     "src" => $this->template_image_url . "/fake-logo.png",
-                    "alt" => __("Fake Logo"),
+                    "alt" => __("Fake Logo", 'mailpoet'),
                     "fullWidth" => false,
                     "width" => "598px",
                     "height" => "71px",
@@ -116,7 +116,7 @@ class NewsletterBlank12Column {
                   ),
                   array(
                     "type" => "text",
-                    "text" => __("<h1 style=\"text-align: center;\"><strong>Let's Get Started!</strong></h1>\n<p></p>\n<p>It's time to design your newsletter! In the right sidebar, you'll find 4 menu items that will&nbsp;help you customize your&nbsp;newsletter:</p>\n<ol>\n<li>Content</li>\n<li>Layout</li>\n<li>Styles</li>\n<li>Preview</li>\n</ol>")
+                    "text" => __("<h1 style=\"text-align: center;\"><strong>Let's Get Started!</strong></h1>\n<p></p>\n<p>It's time to design your newsletter! In the right sidebar, you'll find 4 menu items that will&nbsp;help you customize your&nbsp;newsletter:</p>\n<ol>\n<li>Content</li>\n<li>Layout</li>\n<li>Styles</li>\n<li>Preview</li>\n</ol>", 'mailpoet')
                   ),
                   array(
                     "type" => "divider",
@@ -154,11 +154,11 @@ class NewsletterBlank12Column {
                 "blocks" => array(
                   array(
                     "type" => "text",
-                    "text" => __("<h2>This template has...</h2>")
+                    "text" => __("<h2>This template has...</h2>", 'mailpoet')
                   ),
                   array(
                     "type" => "text",
-                    "text" => __("<p>In the right sidebar, you can&nbsp;add these layout blocks to your email:</p>\n<ul>\n<li>1 column</li>\n<li>2 columns</li>\n<li>3 columns</li>\n</ul>")
+                    "text" => __("<p>In the right sidebar, you can&nbsp;add these layout blocks to your email:</p>\n<ul>\n<li>1 column</li>\n<li>2 columns</li>\n<li>3 columns</li>\n</ul>", 'mailpoet')
                   )
                 )
               ),
@@ -173,11 +173,11 @@ class NewsletterBlank12Column {
                 "blocks" => array(
                   array(
                     "type" => "text",
-                    "text" => __("<h2>... a 2-column layout.</h2>")
+                    "text" => __("<h2>... a 2-column layout.</h2>", 'mailpoet')
                   ),
                   array(
                     "type" => "text",
-                    "text" => __("<p><span style=\"line-height: 25.6px;\">You can change a layout's background color by clicking on the settings icon on the right edge of the Designer. Simply hover&nbsp;over this area to see the Settings (gear) icon.</span></p>")
+                    "text" => __("<p><span style=\"line-height: 25.6px;\">You can change a layout's background color by clicking on the settings icon on the right edge of the Designer. Simply hover&nbsp;over this area to see the Settings (gear) icon.</span></p>", 'mailpoet')
                   )
                 )
               )
@@ -251,7 +251,7 @@ class NewsletterBlank12Column {
                   ),
                   array(
                     "type" => "footer",
-                    "text" => __("<p><a href=\"[link:subscription_unsubscribe_url]\">Unsubscribe</a> | <a href=\"[link:subscription_manage_url]\">Manage your subscription</a><br />Add your postal address here!</p>"),
+                    "text" => __("<p><a href=\"[link:subscription_unsubscribe_url]\">Unsubscribe</a> | <a href=\"[link:subscription_manage_url]\">Manage your subscription</a><br />Add your postal address here!</p>", 'mailpoet'),
                     "styles" => array(
                       "block" => array(
                         "backgroundColor" => "transparent"

lib/Config/PopulatorData/Templates/NewsletterBlank13Column.php

@@ -13,8 +13,8 @@ class NewsletterBlank13Column {
 
   function get() {
     return array(
-      'name' => __("Newsletter: Blank 1:3 Column"),
-      'description' => __("A blank Newsletter template with a 1:3 column layout."),
+      'name' => __("Newsletter: Blank 1:3 Column", 'mailpoet'),
+      'description' => __("A blank Newsletter template with a 1:3 column layout.", 'mailpoet'),
       'readonly' => 1,
       'thumbnail' => $this->getThumbnail(),
       'body' => json_encode($this->getBody()),
@@ -52,7 +52,7 @@ class NewsletterBlank13Column {
                 "blocks" => array(
                   array(
                     "type" => "header",
-                    "text" => __("Display problems?&nbsp;<a href=\"[link:newsletter_view_in_browser_url]\">Open this email in your web browser</a>"),
+                    "text" => __("Display problems?&nbsp;<a href=\"[link:newsletter_view_in_browser_url]\">Open this email in your web browser</a>", 'mailpoet'),
                     "styles" => array(
                       "block" => array(
                         "backgroundColor" => "transparent"
@@ -104,7 +104,7 @@ class NewsletterBlank13Column {
                     "type" => "image",
                     "link" => "",
                     "src" => $this->template_image_url . "/fake-logo.png",
-                    "alt" => __("Fake logo"),
+                    "alt" => __("Fake logo", 'mailpoet'),
                     "fullWidth" => false,
                     "width" => "598px",
                     "height" => "71px",
@@ -116,7 +116,7 @@ class NewsletterBlank13Column {
                   ),
                   array(
                     "type" => "text",
-                    "text" => __("<h1 style=\"text-align: center;\"><strong>Let's Get Started!&nbsp;</strong></h1>\n<p></p>\n<p>It's time to design your newsletter! On&nbsp;the right sidebar, you'll find four menu items that will help&nbsp;you&nbsp;customize your&nbsp;newsletter:</p>\n<ol>\n<li>Content</li>\n<li>Layout</li>\n<li>Styles</li>\n<li>Preview</li>\n</ol>")
+                    "text" => __("<h1 style=\"text-align: center;\"><strong>Let's Get Started!&nbsp;</strong></h1>\n<p></p>\n<p>It's time to design your newsletter! On&nbsp;the right sidebar, you'll find four menu items that will help&nbsp;you&nbsp;customize your&nbsp;newsletter:</p>\n<ol>\n<li>Content</li>\n<li>Layout</li>\n<li>Styles</li>\n<li>Preview</li>\n</ol>", 'mailpoet')
                   ),
                   array(
                     "type" => "divider",
@@ -154,11 +154,11 @@ class NewsletterBlank13Column {
                 "blocks" => array(
                   array(
                     "type" => "text",
-                    "text" => __("<h3>This template...&nbsp;</h3>")
+                    "text" => __("<h3>This template...&nbsp;</h3>", 'mailpoet')
                   ),
                   array(
                     "type" => "text",
-                    "text" => __("<p>In the right sidebar, you can&nbsp;add layout blocks to your newsletter.</p>")
+                    "text" => __("<p>In the right sidebar, you can&nbsp;add layout blocks to your newsletter.</p>", 'mailpoet')
                   )
                 )
               ),
@@ -173,11 +173,11 @@ class NewsletterBlank13Column {
                 "blocks" => array(
                   array(
                     "type" => "text",
-                    "text" => __("<h3>... has&nbsp;a...&nbsp;</h3>")
+                    "text" => __("<h3>... has&nbsp;a...&nbsp;</h3>", 'mailpoet')
                   ),
                   array(
                     "type" => "text",
-                    "text" => __("<p>You have the choice of:</p>\n<ul>\n<li>1 column</li>\n<li>2 columns</li>\n<li>3 columns</li>\n</ul>")
+                    "text" => __("<p>You have the choice of:</p>\n<ul>\n<li>1 column</li>\n<li>2 columns</li>\n<li>3 columns</li>\n</ul>", 'mailpoet')
                   )
                 )
               ),
@@ -192,11 +192,11 @@ class NewsletterBlank13Column {
                 "blocks" => array(
                   array(
                     "type" => "text",
-                    "text" => __("<h3>3-column layout.</h3>")
+                    "text" => __("<h3>3-column layout.</h3>", 'mailpoet')
                   ),
                   array(
                     "type" => "text",
-                    "text" => __("<p>You can add as many layout blocks as you want!</p>")
+                    "text" => __("<p>You can add as many layout blocks as you want!</p>", 'mailpoet')
                   ),
                   array(
                     "type" => "text",
@@ -274,7 +274,7 @@ class NewsletterBlank13Column {
                   ),
                   array(
                     "type" => "footer",
-                    "text" => __("<p><a href=\"[link:subscription_unsubscribe_url]\">Unsubscribe</a> | <a href=\"[link:subscription_manage_url]\">Manage your subscription</a><br />Add your postal address here!</p>"),
+                    "text" => __("<p><a href=\"[link:subscription_unsubscribe_url]\">Unsubscribe</a> | <a href=\"[link:subscription_manage_url]\">Manage your subscription</a><br />Add your postal address here!</p>", 'mailpoet'),
                     "styles" => array(
                       "block" => array(
                         "backgroundColor" => "transparent"

lib/Config/PopulatorData/Templates/NewsletterBlank1Column.php

@@ -13,8 +13,8 @@ class NewsletterBlank1Column {
 
   function get() {
     return array(
-      'name' => __("Newsletter: Blank 1 Column"),
-      'description' => __("A blank Newsletter template with a 1 column layout."),
+      'name' => __("Newsletter: Blank 1 Column", 'mailpoet'),
+      'description' => __("A blank Newsletter template with a 1 column layout.", 'mailpoet'),
       'readonly' => 1,
       'thumbnail' => $this->getThumbnail(),
       'body' => json_encode($this->getBody()),
@@ -52,7 +52,7 @@ class NewsletterBlank1Column {
                 "blocks" => array(
                   array(
                     "type" => "header",
-                    "text" => __("Display problems?&nbsp;<a href=\"[link:newsletter_view_in_browser_url]\">Open this email in your web browser</a>"),
+                    "text" => __("Display problems?&nbsp;<a href=\"[link:newsletter_view_in_browser_url]\">Open this email in your web browser</a>", 'mailpoet'),
                     "styles" => array(
                       "block" => array(
                         "backgroundColor" => "transparent"
@@ -104,7 +104,7 @@ class NewsletterBlank1Column {
                     "type" => "image",
                     "link" => "",
                     "src" => $this->template_image_url . "/fake-logo.png",
-                    "alt" => __("Fake logo"),
+                    "alt" => __("Fake logo", 'mailpoet'),
                     "fullWidth" => false,
                     "width" => "598px",
                     "height" => "71px",
@@ -116,7 +116,7 @@ class NewsletterBlank1Column {
                   ),
                   array(
                     "type" => "text",
-                    "text" => __("<h1 style=\"text-align: center;\"><strong>Let's Get Started!&nbsp;</strong></h1>\n<p></p>\n<p>It's time to design your newsletter! In the right sidebar, you'll find 4 menu items that will&nbsp;help you customize your newsletter:</p>\n<ol>\n<li>Content</li>\n<li>Layout</li>\n<li>Styles</li>\n<li>Preview</li>\n</ol>")
+                    "text" => __("<h1 style=\"text-align: center;\"><strong>Let's Get Started!&nbsp;</strong></h1>\n<p></p>\n<p>It's time to design your newsletter! In the right sidebar, you'll find 4 menu items that will&nbsp;help you customize your newsletter:</p>\n<ol>\n<li>Content</li>\n<li>Layout</li>\n<li>Styles</li>\n<li>Preview</li>\n</ol>", 'mailpoet')
                   )
                 )
               )
@@ -190,7 +190,7 @@ class NewsletterBlank1Column {
                   ),
                   array(
                     "type" => "footer",
-                    "text" => __("<p><a href=\"[link:subscription_unsubscribe_url]\">Unsubscribe</a> | <a href=\"[link:subscription_manage_url]\">Manage your subscription</a><br />Add your postal address here!</p>"),
+                    "text" => __("<p><a href=\"[link:subscription_unsubscribe_url]\">Unsubscribe</a> | <a href=\"[link:subscription_manage_url]\">Manage your subscription</a><br />Add your postal address here!</p>", 'mailpoet'),
                     "styles" => array(
                       "block" => array(
                         "backgroundColor" => "transparent"

lib/Config/PopulatorData/Templates/PostNotificationsBlank1Column.php

@@ -13,8 +13,8 @@ class PostNotificationsBlank1Column {
 
   function get() {
     return array(
-      'name' => __("Post Notifications: Blank 1 Column"),
-      'description' => __("A blank Post Notifications template with a 1 column layout."),
+      'name' => __("Post Notifications: Blank 1 Column", 'mailpoet'),
+      'description' => __("A blank Post Notifications template with a 1 column layout.", 'mailpoet'),
       'readonly' => 1,
       'thumbnail' => $this->getThumbnail(),
       'body' => json_encode($this->getBody()),
@@ -52,7 +52,7 @@ class PostNotificationsBlank1Column {
                 "blocks" => array(
                   array(
                     "type" => "header",
-                    "text" => __("Display problems?&nbsp;<a href=\"[link:newsletter_view_in_browser_url]\">Open this email in your web browser</a>"),
+                    "text" => __("Display problems?&nbsp;<a href=\"[link:newsletter_view_in_browser_url]\">Open this email in your web browser</a>", 'mailpoet'),
                     "styles" => array(
                       "block" => array(
                         "backgroundColor" => "transparent"
@@ -116,7 +116,7 @@ class PostNotificationsBlank1Column {
                   ),
                   array(
                     "type" => "text",
-                    "text" => __("<h1 style=\"text-align: center;\"><strong>Check Out Our New Blog Posts!&nbsp;</strong></h1>\n<p></p>\n<p>MailPoet&nbsp;can&nbsp;<span style=\"line-height: 1.6em; background-color: inherit;\"><em>automatically</em>&nbsp;</span><span style=\"line-height: 1.6em; background-color: inherit;\">send your new blog posts to your subscribers.</span></p>\n<p><span style=\"line-height: 1.6em; background-color: inherit;\"></span></p>\n<p><span style=\"line-height: 1.6em; background-color: inherit;\">Below, you'll find three&nbsp;recent&nbsp;posts, which are displayed automatically, thanks to the&nbsp;<em>Automatic Latest Content</em>&nbsp;widget, which can be found on the right sidebar, under&nbsp;<em>Content</em>.</span></p>\n<p><span style=\"line-height: 1.6em; background-color: inherit;\"></span></p>\n<p><span style=\"line-height: 1.6em; background-color: inherit;\">To edit the settings and styles of your post, simply click on&nbsp;a&nbsp;post below.</span></p>")
+                    "text" => __("<h1 style=\"text-align: center;\"><strong>Check Out Our New Blog Posts!&nbsp;</strong></h1>\n<p></p>\n<p>MailPoet&nbsp;can&nbsp;<span style=\"line-height: 1.6em; background-color: inherit;\"><em>automatically</em>&nbsp;</span><span style=\"line-height: 1.6em; background-color: inherit;\">send your new blog posts to your subscribers.</span></p>\n<p><span style=\"line-height: 1.6em; background-color: inherit;\"></span></p>\n<p><span style=\"line-height: 1.6em; background-color: inherit;\">Below, you'll find three&nbsp;recent&nbsp;posts, which are displayed automatically, thanks to the&nbsp;<em>Automatic Latest Content</em>&nbsp;widget, which can be found on the right sidebar, under&nbsp;<em>Content</em>.</span></p>\n<p><span style=\"line-height: 1.6em; background-color: inherit;\"></span></p>\n<p><span style=\"line-height: 1.6em; background-color: inherit;\">To edit the settings and styles of your post, simply click on&nbsp;a&nbsp;post below.</span></p>", 'mailpoet')
                   ),
                   array(
                     "type" => "divider",
@@ -174,14 +174,14 @@ class PostNotificationsBlank1Column {
                     "imageFullWidth" => false,
                     "featuredImagePosition" => "belowTitle",
                     "showAuthor" => "no",
-                    "authorPrecededBy" => __("Author:"),
+                    "authorPrecededBy" => __("Author:", 'mailpoet'),
                     "showCategories" => "no",
-                    "categoriesPrecededBy" => __("Categories:"),
+                    "categoriesPrecededBy" => __("Categories:", 'mailpoet'),
                     "readMoreType" => "button",
                     "readMoreText" => "Read more",
                     "readMoreButton" => array(
                       "type" => "button",
-                      "text" => __("Read the post"),
+                      "text" => __("Read the post", 'mailpoet'),
                       "url" => "[postLink]",
                       "styles" => array(
                         "block" => array(
@@ -298,7 +298,7 @@ class PostNotificationsBlank1Column {
                   ),
                   array(
                     "type" => "footer",
-                    "text" => __("<p><a href=\"[link:subscription_unsubscribe_url]\">Unsubscribe</a> | <a href=\"[link:subscription_manage_url]\">Manage your subscription</a><br />Add your postal address here!</p>"),
+                    "text" => __("<p><a href=\"[link:subscription_unsubscribe_url]\">Unsubscribe</a> | <a href=\"[link:subscription_manage_url]\">Manage your subscription</a><br />Add your postal address here!</p>", 'mailpoet'),
                     "styles" => array(
                       "block" => array(
                         "backgroundColor" => "transparent"

lib/Config/PopulatorData/Templates/Restaurant.php

@@ -13,8 +13,8 @@ class Restaurant {
 
   function get() {
     return array(
-      'name' => __("Restaurant"),
-      'description' => __("What's fresh on the menu?"),
+      'name' => __("Restaurant", 'mailpoet'),
+      'description' => __("What's fresh on the menu?", 'mailpoet'),
       'readonly' => 0,
       'thumbnail' => $this->getThumbnail(),
       'body' => json_encode($this->getBody()),

lib/Config/PopulatorData/Templates/SimpleText.php

@@ -13,8 +13,8 @@ class SimpleText {
 
   function get() {
     return array(
-      'name' => __("Simple Text"),
-      'description' => __("A simple plain text template - just like a regular email."),
+      'name' => __("Simple Text", 'mailpoet'),
+      'description' => __("A simple plain text template - just like a regular email.", 'mailpoet'),
       'readonly' => 1,
       'thumbnail' => $this->getThumbnail(),
       'body' => json_encode($this->getBody()),
@@ -63,7 +63,7 @@ class SimpleText {
                     "type" => "image",
                     "link" => "",
                     "src" => $this->template_image_url . "/fake-logo.png",
-                    "alt" => __("Fake logo"),
+                    "alt" => __("Fake logo", 'mailpoet'),
                     "fullWidth" => false,
                     "width" => "598px",
                     "height" => "71px",
@@ -75,7 +75,7 @@ class SimpleText {
                   ),
                   array(
                     "type" => "text",
-                    "text" => __("<p style=\"text-align: left;\">Hi&nbsp;[subscriber:firstname | default:subscriber],</p>\n<p style=\"text-align: left;\"></p>\n<p style=\"text-align: left;\">In MailPoet, you can write emails in plain text,&nbsp;just like in a regular email.&nbsp;This can make your email newsletters&nbsp;more personal and attention-grabbing.</p>\n<p style=\"text-align: left;\"></p>\n<p style=\"text-align: left;\">Is this too&nbsp;simple?&nbsp;You can still style your text with basic&nbsp;formatting,&nbsp;like&nbsp;<strong>bold</strong>&nbsp;or <em>italics.</em></p>\n<p style=\"text-align: left;\"></p>\n<p style=\"text-align: left;\">Finally, you can also add a call-to-action button between 2 blocks of text, like this:</p>")
+                    "text" => __("<p style=\"text-align: left;\">Hi&nbsp;[subscriber:firstname | default:subscriber],</p>\n<p style=\"text-align: left;\"></p>\n<p style=\"text-align: left;\">In MailPoet, you can write emails in plain text,&nbsp;just like in a regular email.&nbsp;This can make your email newsletters&nbsp;more personal and attention-grabbing.</p>\n<p style=\"text-align: left;\"></p>\n<p style=\"text-align: left;\">Is this too&nbsp;simple?&nbsp;You can still style your text with basic&nbsp;formatting,&nbsp;like&nbsp;<strong>bold</strong>&nbsp;or <em>italics.</em></p>\n<p style=\"text-align: left;\"></p>\n<p style=\"text-align: left;\">Finally, you can also add a call-to-action button between 2 blocks of text, like this:</p>", 'mailpoet')
                   )
                 )
               )
@@ -110,7 +110,7 @@ class SimpleText {
                   ),
                   array(
                     "type" => "button",
-                    "text" => __("It's time to take action!"),
+                    "text" => __("It's time to take action!", 'mailpoet'),
                     "url" => "",
                     "styles" => array(
                       "block" => array(
@@ -131,11 +131,11 @@ class SimpleText {
                   ),
                   array(
                     "type" => "text",
-                    "text" => __("<p>Thanks for&nbsp;reading. See you soon!</p>\n<p></p>\n<p><strong><em>The MailPoet Team</em></strong></p>")
+                    "text" => __("<p>Thanks for&nbsp;reading. See you soon!</p>\n<p></p>\n<p><strong><em>The MailPoet Team</em></strong></p>", 'mailpoet')
                   ),
                   array(
                     "type" => "footer",
-                    "text" => __("<p><a href=\"[link:subscription_unsubscribe_url]\">Unsubscribe</a> | <a href=\"[link:subscription_manage_url]\">Manage your subscription</a><br />Add your postal address here!</p>"),
+                    "text" => __("<p><a href=\"[link:subscription_unsubscribe_url]\">Unsubscribe</a> | <a href=\"[link:subscription_manage_url]\">Manage your subscription</a><br />Add your postal address here!</p>", 'mailpoet'),
                     "styles" => array(
                       "block" => array(
                         "backgroundColor" => "transparent"

lib/Config/PopulatorData/Templates/StoreDiscount.php

@@ -13,8 +13,8 @@ class StoreDiscount {
 
   function get() {
     return array(
-      'name' => __("Store Discount"),
-      'description' => __("Store discount email with coupon and shopping suggestions"),
+      'name' => __("Store Discount", 'mailpoet'),
+      'description' => __("Store discount email with coupon and shopping suggestions", 'mailpoet'),
       'readonly' => 0,
       'thumbnail' => $this->getThumbnail(),
       'body' => json_encode($this->getBody()),
@@ -59,7 +59,7 @@ class StoreDiscount {
               "type" => "image",
               "link" => "",
               "src" => $this->template_image_url . "/bicycle-header3.png",
-              "alt" => __("bicycle-header3"),
+              "alt" => __("bicycle-header3", 'mailpoet'),
               "fullWidth" => false,
               "width" => "423px",
               "height" => "135px",
@@ -70,7 +70,7 @@ class StoreDiscount {
               )
             ), array(
               "type" => "text",
-              "text" => __("<p></p>\n<p>Hi&nbsp;[subscriber:firstname | default:reader]</p>\n<p class=\"\"></p>\n<p>Fancy 15% off your next order? Use this coupon&nbsp;on all your favourite products from our store&nbsp;until Wednesday. Just&nbsp;enter the code on the payments page and&nbsp;your discount will applied.</p>")
+              "text" => __("<p></p>\n<p>Hi&nbsp;[subscriber:firstname | default:reader]</p>\n<p class=\"\"></p>\n<p>Fancy 15% off your next order? Use this coupon&nbsp;on all your favourite products from our store&nbsp;until Wednesday. Just&nbsp;enter the code on the payments page and&nbsp;your discount will applied.</p>", 'mailpoet')
             ), array(
               "type" => "spacer",
               "styles" => array(
@@ -110,10 +110,10 @@ class StoreDiscount {
               )
             ), array(
               "type" => "text",
-              "text" => __("<h1 style=\"text-align: center;\"><em><strong>Get 15% discount off your next order</strong></em></h1>")
+              "text" => __("<h1 style=\"text-align: center;\"><em><strong>Get 15% discount off your next order</strong></em></h1>", 'mailpoet')
             ), array(
               "type" => "text",
-              "text" => __("<h2 style=\"text-align: center;\"><strong>USE CODE: WELOVEMAILPOET</strong></h2>")
+              "text" => __("<h2 style=\"text-align: center;\"><strong>USE CODE: WELOVEMAILPOET</strong></h2>", 'mailpoet')
             ), array(
               "type" => "divider",
               "styles" => array(
@@ -153,7 +153,7 @@ class StoreDiscount {
               )
             ), array(
               "type" => "button",
-              "text" => __("SHOP NOW"),
+              "text" => __("SHOP NOW", 'mailpoet'),
               "url" => "",
               "styles" => array(
                 "block" => array(
@@ -173,7 +173,7 @@ class StoreDiscount {
               )
             ), array(
               "type" => "text",
-              "text" => __("<h1 style=\"text-align: center;\"><strong><em>Use your discount on these great&nbsp;products...</em></strong></h1>")
+              "text" => __("<h1 style=\"text-align: center;\"><strong><em>Use your discount on these great&nbsp;products...</em></strong></h1>", 'mailpoet')
             ), array(
               "type" => "spacer",
               "styles" => array(
@@ -204,7 +204,7 @@ class StoreDiscount {
               "type" => "image",
               "link" => "",
               "src" => $this->template_image_url . "/red-icycle.jpg",
-              "alt" => __("red-icycle"),
+              "alt" => __("red-icycle", 'mailpoet'),
               "fullWidth" => false,
               "width" => "558px",
               "height" => "399px",
@@ -215,10 +215,10 @@ class StoreDiscount {
               )
             ), array(
               "type" => "text",
-              "text" => __("<h3 style=\"text-align: center;\">Lovely Red Bicycle</h3>\n<p>What can we say? It's a totally awesome red bike, and it's the first of its kind in our collection. No sweat!</p>\n<h3 style=\"text-align: center;\"><strong><span style=\"color: #488e88;\">$289.99</span></strong></h3>")
+              "text" => __("<h3 style=\"text-align: center;\">Lovely Red Bicycle</h3>\n<p>What can we say? It's a totally awesome red bike, and it's the first of its kind in our collection. No sweat!</p>\n<h3 style=\"text-align: center;\"><strong><span style=\"color: #488e88;\">$289.99</span></strong></h3>", 'mailpoet')
             ), array(
               "type" => "button",
-              "text" => __("Buy"),
+              "text" => __("Buy", 'mailpoet'),
               "url" => "",
               "styles" => array(
                 "block" => array(
@@ -249,7 +249,7 @@ class StoreDiscount {
               "type" => "image",
               "link" => "",
               "src" => $this->template_image_url . "/orange-bicycle.jpg",
-              "alt" => __("orange-bicycle"),
+              "alt" => __("orange-bicycle", 'mailpoet'),
               "fullWidth" => false,
               "width" => "639px",
               "height" => "457px",
@@ -260,10 +260,10 @@ class StoreDiscount {
               )
             ), array(
               "type" => "text",
-              "text" => __("<h3 style=\"text-align: center;\">Little Orange Bicycle</h3>\n<p>Another product that's just as awesome but it's the second type, and more orange, with some blue. Cool beans!</p>\n<h3 style=\"line-height: 22.4px; text-align: center;\"><span style=\"color: #488e88;\"><strong>$209.99</strong></span></h3>")
+              "text" => __("<h3 style=\"text-align: center;\">Little Orange Bicycle</h3>\n<p>Another product that's just as awesome but it's the second type, and more orange, with some blue. Cool beans!</p>\n<h3 style=\"line-height: 22.4px; text-align: center;\"><span style=\"color: #488e88;\"><strong>$209.99</strong></span></h3>", 'mailpoet')
             ), array(
               "type" => "button",
-              "text" => __("Buy"),
+              "text" => __("Buy", 'mailpoet'),
               "url" => "",
               "styles" => array(
                 "block" => array(
@@ -320,7 +320,7 @@ class StoreDiscount {
               )
             ), array(
               "type" => "text",
-              "text" => __("<p><em>Terms and Conditions:</em></p>\n<ul>\n<li><span style=\"line-height: 1.6em; background-color: inherit;\">Must be used by midnight EST December 15 2016.</span></li>\n<li><span style=\"line-height: 1.6em; background-color: inherit;\">Discount does not include shipping.</span></li>\n<li><span style=\"line-height: 1.6em; background-color: inherit;\">Cannot be used in conjunction with any other offer.</span></li>\n</ul>")
+              "text" => __("<p><em>Terms and Conditions:</em></p>\n<ul>\n<li><span style=\"line-height: 1.6em; background-color: inherit;\">Must be used by midnight EST December 15 2016.</span></li>\n<li><span style=\"line-height: 1.6em; background-color: inherit;\">Discount does not include shipping.</span></li>\n<li><span style=\"line-height: 1.6em; background-color: inherit;\">Cannot be used in conjunction with any other offer.</span></li>\n</ul>", 'mailpoet')
             ), array(
               "type" => "social",
               "iconSet" => "grey",
@@ -331,7 +331,7 @@ class StoreDiscount {
                 "image" => $this->social_icon_url . "/02-grey/Facebook.png",
                 "height" => "32px",
                 "width" => "32px",
-                "text" => __("Facebook")
+                "text" => __("Facebook", 'mailpoet')
               ), array(
                 "type" => "socialIcon",
                 "iconType" => "twitter",
@@ -339,11 +339,11 @@ class StoreDiscount {
                 "image" => $this->social_icon_url . "/02-grey/Twitter.png",
                 "height" => "32px",
                 "width" => "32px",
-                "text" => __("Twitter")
+                "text" => __("Twitter", 'mailpoet')
               ))
             ), array(
               "type" => "footer",
-              "text" => __("<p><a href=\"[link:subscription_unsubscribe_url]\">Unsubscribe</a> | <a href=\"[link:subscription_manage_url]\">Manage subscription</a></p>\n<p>1 Store Street, Shopville, CA 1345</p>"),
+              "text" => __("<p><a href=\"[link:subscription_unsubscribe_url]\">Unsubscribe</a> | <a href=\"[link:subscription_manage_url]\">Manage subscription</a></p>\n<p>1 Store Street, Shopville, CA 1345</p>", 'mailpoet'),
               "styles" => array(
                 "block" => array(
                   "backgroundColor" => "transparent"

lib/Config/PopulatorData/Templates/TravelEmail.php

@@ -13,8 +13,8 @@ class TravelEmail {
 
   function get() {
     return array(
-      'name' => __("Travel email"),
-      'description' => __("A little postcard from your trip"),
+      'name' => __("Travel email", 'mailpoet'),
+      'description' => __("A little postcard from your trip", 'mailpoet'),
       'readonly' => 0,
       'thumbnail' => $this->getThumbnail(),
       'body' => json_encode($this->getBody()),
@@ -51,7 +51,7 @@ class TravelEmail {
               "type" => "image",
               "link" => "",
               "src" => $this->template_image_url . "/header.png",
-              "alt" => __("Travelling Tales with Jane & Steven"),
+              "alt" => __("Travelling Tales with Jane & Steven", 'mailpoet'),
               "fullWidth" => true,
               "width" => "660px",
               "height" => "165px",
@@ -70,7 +70,7 @@ class TravelEmail {
               )
             ), array(
               "type" => "text",
-              "text" => __("<h1 style=\"text-align: center;\">Hi&nbsp;[subscriber:firstname | default:reader]!</h1>\n<p></p>\n<p>Greetings from New Zealand, we're here enjoying the sights and sounds (and bad smells!) of Rotarua. Yesterday we took advantage of the local amenities and visited&nbsp;the hot springs!&nbsp;</p>\n<p>Don't forget to stay up-to-date via twitter!</p>")
+              "text" => __("<h1 style=\"text-align: center;\">Hi&nbsp;[subscriber:firstname | default:reader]!</h1>\n<p></p>\n<p>Greetings from New Zealand, we're here enjoying the sights and sounds (and bad smells!) of Rotarua. Yesterday we took advantage of the local amenities and visited&nbsp;the hot springs!&nbsp;</p>\n<p>Don't forget to stay up-to-date via twitter!</p>", 'mailpoet')
             ), array(
               "type" => "social",
               "iconSet" => "circles",
@@ -81,11 +81,11 @@ class TravelEmail {
                 "image" => $this->social_icon_url . "/03-circles/Twitter.png",
                 "height" => "32px",
                 "width" => "32px",
-                "text" => __("Twitter")
+                "text" => __("Twitter", 'mailpoet')
               ))
             ), array(
               "type" => "text",
-              "text" => __("<h1 style=\"text-align: center;\"><strong>Photos from Rotarua</strong></h1>")
+              "text" => __("<h1 style=\"text-align: center;\"><strong>Photos from Rotarua</strong></h1>", 'mailpoet')
             ), array(
               "type" => "spacer",
               "styles" => array(
@@ -116,7 +116,7 @@ class TravelEmail {
               "type" => "image",
               "link" => "",
             "src" => $this->template_image_url . "/gallery1.jpg",
-              "alt" => __("hot thermals"),
+              "alt" => __("hot thermals", 'mailpoet'),
               "fullWidth" => false,
               "width" => "640px",
               "height" => "425px",
@@ -146,7 +146,7 @@ class TravelEmail {
               "type" => "image",
               "link" => "",
               "src" => $this->template_image_url . "/gallery2.jpg",
-              "alt" => __("The view from our campsite"),
+              "alt" => __("The view from our campsite", 'mailpoet'),
               "fullWidth" => false,
               "width" => "640px",
               "height" => "425px",
@@ -185,7 +185,7 @@ class TravelEmail {
               "type" => "image",
               "link" => "",
               "src" => $this->template_image_url . "/gallery3.jpg",
-              "alt" => __("Red sky at night"),
+              "alt" => __("Red sky at night", 'mailpoet'),
               "fullWidth" => false,
               "width" => "640px",
               "height" => "425px",
@@ -207,7 +207,7 @@ class TravelEmail {
               "type" => "image",
               "link" => "",
               "src" => $this->template_image_url . "/gallery4.jpg",
-              "alt" => __("Don't go chasing waterfalls"),
+              "alt" => __("Don't go chasing waterfalls", 'mailpoet'),
               "fullWidth" => false,
               "width" => "640px",
               "height" => "425px",
@@ -244,7 +244,7 @@ class TravelEmail {
               )
             ), array(
               "type" => "button",
-              "text" => __("View NZ Photo Gallery"),
+              "text" => __("View NZ Photo Gallery", 'mailpoet'),
               "url" => "",
               "styles" => array(
                 "block" => array(
@@ -293,7 +293,7 @@ class TravelEmail {
               )
             ), array(
               "type" => "text",
-              "text" => __("<h2><em>Here's our top recommendations in Rotarua</em></h2>")
+              "text" => __("<h2><em>Here's our top recommendations in Rotarua</em></h2>", 'mailpoet')
             ), array(
               "type" => "spacer",
               "styles" => array(
@@ -324,7 +324,7 @@ class TravelEmail {
               "type" => "image",
               "link" => "",
               "src" => $this->template_image_url . "/glow-worms.jpg",
-              "alt" => __("Glow worms, Waitomo Caves"),
+              "alt" => __("Glow worms, Waitomo Caves", 'mailpoet'),
               "fullWidth" => true,
               "width" => "640px",
               "height" => "428px",
@@ -335,7 +335,7 @@ class TravelEmail {
               )
             ), array(
               "type" => "text",
-              "text" => __("<p><em><a href=\"http://www.waitomo.com/Waitomo-Glowworm-Caves/Pages/default.aspx\"><strong>Waitomo Glow Worm Caves</strong></a></em></p>")
+              "text" => __("<p><em><a href=\"http://www.waitomo.com/Waitomo-Glowworm-Caves/Pages/default.aspx\"><strong>Waitomo Glow Worm Caves</strong></a></em></p>", 'mailpoet')
             ))
           ), array(
             "type" => "container",
@@ -349,7 +349,7 @@ class TravelEmail {
               "type" => "image",
               "link" => "",
               "src" => $this->template_image_url . "/luge.jpg",
-              "alt" => __("luge"),
+              "alt" => __("luge", 'mailpoet'),
               "fullWidth" => false,
               "width" => "375px",
               "height" => "500px",
@@ -360,7 +360,7 @@ class TravelEmail {
               )
             ), array(
               "type" => "text",
-              "text" => __("<p><em><strong><a href=\"http://www.skyline.co.nz/rotorua/ssr_luge/\">Luge!</a></strong></em></p>")
+              "text" => __("<p><em><strong><a href=\"http://www.skyline.co.nz/rotorua/ssr_luge/\">Luge!</a></strong></em></p>", 'mailpoet')
             ))
           ), array(
             "type" => "container",
@@ -374,7 +374,7 @@ class TravelEmail {
               "type" => "image",
               "link" => "",
               "src" => $this->template_image_url . "/holiday-park.jpg",
-              "alt" => __("holiday-park"),
+              "alt" => __("holiday-park", 'mailpoet'),
               "fullWidth" => true,
               "width" => "640px",
               "height" => "425px",
@@ -385,7 +385,7 @@ class TravelEmail {
               )
             ), array(
               "type" => "text",
-              "text" => __("<p><em><strong><a href=\"http://rotoruathermal.co.nz/\">Roturua Thermal Holiday Park</a></strong></em></p>")
+              "text" => __("<p><em><strong><a href=\"http://rotoruathermal.co.nz/\">Roturua Thermal Holiday Park</a></strong></em></p>", 'mailpoet')
             ))
           ))
         ), array(
@@ -414,7 +414,7 @@ class TravelEmail {
               )
             ), array(
               "type" => "text",
-              "text" => __("<p>Tomorrow we're heading towards Taupo where we'll visit the&nbsp;'Craters of the moon' and go prawn fishing!&nbsp;Hopefully the weather will stay good.</p>\n<p></p>\n<p>Keep on travellin'</p>\n<p>Jane &amp; Steven</p>")
+              "text" => __("<p>Tomorrow we're heading towards Taupo where we'll visit the&nbsp;'Craters of the moon' and go prawn fishing!&nbsp;Hopefully the weather will stay good.</p>\n<p></p>\n<p>Keep on travellin'</p>\n<p>Jane &amp; Steven</p>", 'mailpoet')
             ))
           ))
         ), array(
@@ -464,7 +464,7 @@ class TravelEmail {
               )
             ), array(
               "type" => "footer",
-              "text" => __("<p><a href=\"[link:subscription_unsubscribe_url]\">Unsubscribe</a> | <a href=\"[link:subscription_manage_url]\">Manage subscription</a></p>"),
+              "text" => __("<p><a href=\"[link:subscription_unsubscribe_url]\">Unsubscribe</a> | <a href=\"[link:subscription_manage_url]\">Manage subscription</a></p>", 'mailpoet'),
               "styles" => array(
                 "block" => array(
                   "backgroundColor" => "transparent"

lib/Config/PopulatorData/Templates/WelcomeBlank12Column.php

@@ -13,8 +13,8 @@ class WelcomeBlank12Column {
 
   function get() {
     return array(
-      'name' => __("Welcome Email: Blank 1:2 Column"),
-      'description' => __("A blank Welcome Email template with a 1:2 column layout."),
+      'name' => __("Welcome Email: Blank 1:2 Column", 'mailpoet'),
+      'description' => __("A blank Welcome Email template with a 1:2 column layout.", 'mailpoet'),
       'readonly' => 1,
       'thumbnail' => $this->getThumbnail(),
       'body' => json_encode($this->getBody()),
@@ -52,7 +52,7 @@ class WelcomeBlank12Column {
                 "blocks" => array(
                   array(
                     "type" => "header",
-                    "text" => __("Display problems?&nbsp;<a href=\"[link:newsletter_view_in_browser_url]\">Open this email in your web browser</a>"),
+                    "text" => __("Display problems?&nbsp;<a href=\"[link:newsletter_view_in_browser_url]\">Open this email in your web browser</a>", 'mailpoet'),
                     "styles" => array(
                       "block" => array(
                         "backgroundColor" => "transparent"
@@ -104,7 +104,7 @@ class WelcomeBlank12Column {
                     "type" => "image",
                     "link" => "",
                     "src" => $this->template_image_url . "/fake-logo.png",
-                    "alt" => __("Fake logo"),
+                    "alt" => __("Fake logo", 'mailpoet'),
                     "fullWidth" => false,
                     "width" => "598px",
                     "height" => "71px",
@@ -116,7 +116,7 @@ class WelcomeBlank12Column {
                   ),
                   array(
                     "type" => "text",
-                    "text" => __("<h1 style=\"text-align: center;\"><strong>Hi, new subscriber!</strong></h1>\n<p></p>\n<p>[subscriber:firstname | default:Subscriber],</p>\n<p></p>\n<p>You recently joined our list and we'd like to give&nbsp;you a warm welcome!</p>")
+                    "text" => __("<h1 style=\"text-align: center;\"><strong>Hi, new subscriber!</strong></h1>\n<p></p>\n<p>[subscriber:firstname | default:Subscriber],</p>\n<p></p>\n<p>You recently joined our list and we'd like to give&nbsp;you a warm welcome!</p>", 'mailpoet')
                   ),
                   array(
                     "type" => "divider",
@@ -163,11 +163,11 @@ class WelcomeBlank12Column {
                 "blocks" => array(
                   array(
                     "type" => "text",
-                    "text" => __("<h3>Our Most Popular Posts</h3>")
+                    "text" => __("<h3>Our Most Popular Posts</h3>", 'mailpoet')
                   ),
                   array(
                     "type" => "text",
-                    "text" => __("<ul>\n<li><a href=\"http://www.mailpoet.com/the-importance-of-focus-when-writing/\">The Importance of Focus When Writing</a></li>\n<li><a href=\"http://www.mailpoet.com/write-great-subject-line/\">How to Write a Great Subject Line</a></li>\n<li><a href=\"http://www.mailpoet.com/just-sit-write-advice-motivation-ernest-hemingway/\">Just Sit Down and Write &ndash; Advice on Motivation from Ernest Hemingway</a></li>\n</ul>")
+                    "text" => __("<ul>\n<li><a href=\"http://www.mailpoet.com/the-importance-of-focus-when-writing/\">The Importance of Focus When Writing</a></li>\n<li><a href=\"http://www.mailpoet.com/write-great-subject-line/\">How to Write a Great Subject Line</a></li>\n<li><a href=\"http://www.mailpoet.com/just-sit-write-advice-motivation-ernest-hemingway/\">Just Sit Down and Write &ndash; Advice on Motivation from Ernest Hemingway</a></li>\n</ul>", 'mailpoet')
                   )
                 )
               ),
@@ -182,15 +182,15 @@ class WelcomeBlank12Column {
                 "blocks" => array(
                   array(
                     "type" => "text",
-                    "text" => __("<h3>What's&nbsp;Next?</h3>")
+                    "text" => __("<h3>What's&nbsp;Next?</h3>", 'mailpoet')
                   ),
                   array(
                     "type" => "text",
-                    "text" => __("<p>Add a single button to your newsletter in order to have one clear call-to-action, which will increase your click rates.</p>")
+                    "text" => __("<p>Add a single button to your newsletter in order to have one clear call-to-action, which will increase your click rates.</p>", 'mailpoet')
                   ),
                   array(
                     "type" => "button",
-                    "text" => __("Read up!"),
+                    "text" => __("Read up!", 'mailpoet'),
                     "url" => "",
                     "styles" => array(
                       "block" => array(
@@ -281,7 +281,7 @@ class WelcomeBlank12Column {
                   ),
                   array(
                     "type" => "footer",
-                    "text" => __("<p><a href=\"[link:subscription_unsubscribe_url]\">Unsubscribe</a> | <a href=\"[link:subscription_manage_url]\">Manage your subscription</a><br />Add your postal address here!</p>"),
+                    "text" => __("<p><a href=\"[link:subscription_unsubscribe_url]\">Unsubscribe</a> | <a href=\"[link:subscription_manage_url]\">Manage your subscription</a><br />Add your postal address here!</p>", 'mailpoet'),
                     "styles" => array(
                       "block" => array(
                         "backgroundColor" => "transparent"

lib/Config/PopulatorData/Templates/WelcomeBlank1Column.php

@@ -13,8 +13,8 @@ class WelcomeBlank1Column {
 
   function get() {
     return array(
-      'name' => __("Welcome Email: Blank 1 Column"),
-      'description' => __("A blank Welcome Email template with a 1 column layout."),
+      'name' => __("Welcome Email: Blank 1 Column", 'mailpoet'),
+      'description' => __("A blank Welcome Email template with a 1 column layout.", 'mailpoet'),
       'readonly' => 1,
       'thumbnail' => $this->getThumbnail(),
       'body' => json_encode($this->getBody()),
@@ -52,7 +52,7 @@ class WelcomeBlank1Column {
                 "blocks" => array(
                   array(
                     "type" => "header",
-                    "text" => __("Display problems?&nbsp;<a href=\"[link:newsletter_view_in_browser_url]\">Open this email in your web browser</a>"),
+                    "text" => __("Display problems?&nbsp;<a href=\"[link:newsletter_view_in_browser_url]\">Open this email in your web browser</a>", 'mailpoet'),
                     "styles" => array(
                       "block" => array(
                         "backgroundColor" => "transparent"
@@ -104,7 +104,7 @@ class WelcomeBlank1Column {
                     "type" => "image",
                     "link" => "",
                     "src" => $this->template_image_url . "/fake-logo.png",
-                    "alt" => __("Fake logo"),
+                    "alt" => __("Fake logo", 'mailpoet'),
                     "fullWidth" => false,
                     "width" => "598px",
                     "height" => "71px",
@@ -116,7 +116,7 @@ class WelcomeBlank1Column {
                   ),
                   array(
                     "type" => "text",
-                    "text" => __("<h1 style=\"text-align: center;\"><strong>Hi,&nbsp;new subscriber!</strong></h1>\n<p></p>\n<p>[subscriber:firstname | default:Subscriber],</p>\n<p></p>\n<p>You recently joined our list and we'd like to give&nbsp;you a warm welcome!</p>\n<p></p>\n<p>Want to get to know us better? Check&nbsp;out&nbsp;some of our most popular&nbsp;articles:&nbsp;</p>\n<ol>\n<li><a href=\"http://www.mailpoet.com/the-importance-of-focus-when-writing/\">The Importance of Focus When Writing</a></li>\n<li><a href=\"http://www.mailpoet.com/write-great-subject-line/\">How to Write a Great Subject Line</a></li>\n<li><a href=\"http://www.mailpoet.com/just-sit-write-advice-motivation-ernest-hemingway/\">Just Sit Down and Write &ndash; Advice on Motivation from Ernest Hemingway</a></li>\n</ol>")
+                    "text" => __("<h1 style=\"text-align: center;\"><strong>Hi,&nbsp;new subscriber!</strong></h1>\n<p></p>\n<p>[subscriber:firstname | default:Subscriber],</p>\n<p></p>\n<p>You recently joined our list and we'd like to give&nbsp;you a warm welcome!</p>\n<p></p>\n<p>Want to get to know us better? Check&nbsp;out&nbsp;some of our most popular&nbsp;articles:&nbsp;</p>\n<ol>\n<li><a href=\"http://www.mailpoet.com/the-importance-of-focus-when-writing/\">The Importance of Focus When Writing</a></li>\n<li><a href=\"http://www.mailpoet.com/write-great-subject-line/\">How to Write a Great Subject Line</a></li>\n<li><a href=\"http://www.mailpoet.com/just-sit-write-advice-motivation-ernest-hemingway/\">Just Sit Down and Write &ndash; Advice on Motivation from Ernest Hemingway</a></li>\n</ol>", 'mailpoet')
                   )
                 )
               )
@@ -190,7 +190,7 @@ class WelcomeBlank1Column {
                   ),
                   array(
                     "type" => "footer",
-                    "text" => __("<p><a href=\"[link:subscription_unsubscribe_url]\">Unsubscribe</a> | <a href=\"[link:subscription_manage_url]\">Manage your subscription</a><br />Add your postal address here!</p>"),
+                    "text" => __("<p><a href=\"[link:subscription_unsubscribe_url]\">Unsubscribe</a> | <a href=\"[link:subscription_manage_url]\">Manage your subscription</a><br />Add your postal address here!</p>", 'mailpoet'),
                     "styles" => array(
                       "block" => array(
                         "backgroundColor" => "transparent"

lib/Config/Shortcodes.php

@@ -81,7 +81,7 @@ class Shortcodes {
     if(empty($newsletters)) {
       return apply_filters(
         'mailpoet_archive_no_newsletters',
-        __('Oops! There are no newsletters to display.')
+        __('Oops! There are no newsletters to display.', 'mailpoet')
       );
     } else {
       $title = apply_filters('mailpoet_archive_title', '');
@@ -116,7 +116,7 @@ class Shortcodes {
     $preview_url = NewsletterUrl::getViewInBrowserUrl($newsletter);
 
     return '<a href="'.esc_attr($preview_url).'" target="_blank" title="'
-      .esc_attr(__('Preview in a new tab')).'">'
+      .esc_attr(__('Preview in a new tab', 'mailpoet')).'">'
       .esc_attr($newsletter->subject).
     '</a>';
   }

lib/Cron/CronHelper.php

@@ -16,7 +16,6 @@ class CronHelper {
 
   static function createDaemon($token) {
     $daemon = array(
-      'status' => Daemon::STATUS_STARTING,
       'token' => $token
     );
     self::saveDaemon($daemon);
@@ -39,12 +38,6 @@ class CronHelper {
     );
   }
 
-  static function stopDaemon() {
-    $daemon = self::getDaemon();
-    $daemon['status'] = Daemon::STATUS_STOPPED;
-    return self::saveDaemon($daemon);
-  }
-
   static function deleteDaemon() {
     return Setting::deleteValue(self::DAEMON_SETTING);
   }
@@ -87,13 +80,13 @@ class CronHelper {
     $fp = @fsockopen($parsed_url['host'], $port, $errno, $errstr, 1);
     if($fp) return sprintf('%s://%s', $parsed_url['scheme'], $parsed_url['host']);
     // 4. throw an error if all connection attempts failed
-    throw new \Exception(__('Site URL is unreachable.'));
+    throw new \Exception(__('Site URL is unreachable.', 'mailpoet'));
   }
 
   static function enforceExecutionLimit($timer) {
     $elapsed_time = microtime(true) - $timer;
     if($elapsed_time >= self::DAEMON_EXECUTION_LIMIT) {
-      throw new \Exception(__('Maximum execution time has been reached.'));
+      throw new \Exception(__('Maximum execution time has been reached.', 'mailpoet'));
     }
   }
 }

lib/Cron/Daemon.php

@@ -1,86 +1,82 @@
 <?php
 namespace MailPoet\Cron;
-
 use MailPoet\Cron\Workers\Scheduler as SchedulerWorker;
 use MailPoet\Cron\Workers\SendingQueue\SendingQueue as SendingQueueWorker;
 
-require_once(ABSPATH . 'wp-includes/pluggable.php');
-
 if(!defined('ABSPATH')) exit;
+require_once(ABSPATH . 'wp-includes/pluggable.php');
 
 class Daemon {
   public $daemon;
-  public $data;
-  public $refreshed_token;
-  const STATUS_STOPPED = 'stopped';
-  const STATUS_STOPPING = 'stopping';
-  const STATUS_STARTED = 'started';
-  const STATUS_STARTING = 'starting';
+  public $request_data;
+  public $timer;
   const REQUEST_TIMEOUT = 5;
-  private $timer;
 
-  function __construct($data) {
-    if(empty($data)) $this->abortWithError(__('Invalid or missing Cron data.'));
-    ignore_user_abort();
+  function __construct($request_data = false) {
+    $this->request_data = $request_data;
     $this->daemon = CronHelper::getDaemon();
     $this->token = CronHelper::createToken();
-    $this->data = $data;
     $this->timer = microtime(true);
   }
 
   function run() {
+    ignore_user_abort(true);
+    if(!$this->request_data) {
+      $error = __('Invalid or missing request data.', 'mailpoet');
+    } else {
+      if(!$this->daemon) {
+        $error = __('Daemon does not exist.', 'mailpoet');
+      } else {
+        if(!isset($this->request_data['token']) ||
+          $this->request_data['token'] !== $this->daemon['token']
+        ) {
+          $error = 'Invalid or missing token.';
+        }
+      }
+    }
+    if(!empty($error)) {
+      return $this->abortWithError($error);
+    }
     $daemon = $this->daemon;
-    if(!$daemon) {
-      $this->abortWithError(__('Daemon does not exist.'));
-    }
-    if(!isset($this->data['token']) ||
-      $this->data['token'] !== $daemon['token']
-    ) {
-      $this->abortWithError(__('Invalid or missing token.'));
-    }
     $daemon['token'] = $this->token;
     CronHelper::saveDaemon($daemon);
-    $this->abortIfStopped($daemon);
     try {
-      $scheduler = new SchedulerWorker($this->timer);
-      $scheduler->process();
-      $queue = new SendingQueueWorker($this->timer);
-      $queue->process();
+      $this->executeScheduleWorker();
+      $this->executeQueueWorker();
     } catch(\Exception $e) {
       // continue processing, no need to handle errors
     }
+    // if workers took less time to execute than the daemon execution limit,
+    // pause daemon execution to ensure that daemon runs only once every X seconds
     $elapsed_time = microtime(true) - $this->timer;
     if($elapsed_time < CronHelper::DAEMON_EXECUTION_LIMIT) {
-      sleep(CronHelper::DAEMON_EXECUTION_LIMIT - $elapsed_time);
+      $this->pauseExecution(CronHelper::DAEMON_EXECUTION_LIMIT - $elapsed_time);
     }
-    // after each execution, re-read daemon data in case its status was changed
-    // its status has changed
+    // after each execution, re-read daemon data in case it changed
     $daemon = CronHelper::getDaemon();
     if(!$daemon || $daemon['token'] !== $this->token) {
-      $this->terminateRequest();
+      return $this->terminateRequest();
     }
-    $this->abortIfStopped($daemon);
-    if($daemon['status'] === self::STATUS_STARTING) {
-      $daemon['status'] = self::STATUS_STARTED;
-    }
-    CronHelper::saveDaemon($daemon);
-    $this->callSelf();
+    return $this->callSelf();
   }
 
-  function abortIfStopped($daemon) {
-    if($daemon['status'] === self::STATUS_STOPPED) {
-      $this->terminateRequest();
-    }
-    if($daemon['status'] === self::STATUS_STOPPING) {
-      $daemon['status'] = self::STATUS_STOPPED;
-      CronHelper::saveDaemon($daemon);
-      $this->terminateRequest();
-    }
+  function pauseExecution($pause_time) {
+    return sleep($pause_time);
+  }
+
+  function executeScheduleWorker() {
+    $scheduler = new SchedulerWorker($this->timer);
+    return $scheduler->process();
+  }
+
+  function executeQueueWorker() {
+    $queue = new SendingQueueWorker($this->timer);
+    return $queue->process();
   }
 
   function callSelf() {
     CronHelper::accessDaemon($this->token, self::REQUEST_TIMEOUT);
-    $this->terminateRequest();
+    return $this->terminateRequest();
   }
 
   function abortWithError($message) {

lib/Cron/Workers/Scheduler.php

@@ -10,9 +10,8 @@ use MailPoet\Models\SubscriberSegment;
 use MailPoet\Util\Helpers;
 use MailPoet\Newsletter\Scheduler\Scheduler as NewsletterScheduler;
 
-require_once(ABSPATH . 'wp-includes/pluggable.php');
-
 if(!defined('ABSPATH')) exit;
+require_once(ABSPATH . 'wp-includes/pluggable.php');
 
 class Scheduler {
   public $timer;
@@ -26,7 +25,7 @@ class Scheduler {
 
   function process() {
     $scheduled_queues = self::getScheduledQueues();
-    if(!count($scheduled_queues)) return;
+    if(!count($scheduled_queues)) return false;
     foreach($scheduled_queues as $i => $queue) {
       $newsletter = Newsletter::filter('filterWithOptions')
         ->findOne($queue->newsletter_id);
@@ -47,30 +46,30 @@ class Scheduler {
     $subscriber = unserialize($queue->subscribers);
     if(empty($subscriber['to_process'][0])) {
       $queue->delete();
-      return;
+      return false;
     }
     $subscriber_id = (int)$subscriber['to_process'][0];
     if($newsletter->event === 'segment') {
-      if($this->verifyMailPoetSubscriber($subscriber_id, $newsletter, $queue) === false) {
-        return;
+      if($this->verifyMailpoetSubscriber($subscriber_id, $newsletter, $queue) === false) {
+        return false;
       }
     } else {
       if($newsletter->event === 'user') {
         if($this->verifyWPSubscriber($subscriber_id, $newsletter, $queue) === false) {
-          return;
+          return false;
         }
       }
     }
     $queue->status = null;
     $queue->save();
+    return true;
   }
 
   function processPostNotificationNewsletter($newsletter, $queue) {
     // ensure that segments exist
     $segments = $newsletter->segments()->findArray();
     if(empty($segments)) {
-      $this->deleteQueueOrUpdateNextRunDate($queue, $newsletter);
-      return;
+      return $this->deleteQueueOrUpdateNextRunDate($queue, $newsletter);
     }
     $segment_ids = array_map(function($segment) {
       return (int)$segment['id'];
@@ -83,13 +82,12 @@ class Scheduler {
     $subscribers = array_unique($subscribers);
 
     if(empty($subscribers)) {
-      $this->deleteQueueOrUpdateNextRunDate($queue, $newsletter);
-      return;
+      return $this->deleteQueueOrUpdateNextRunDate($queue, $newsletter);
     }
 
     // create a duplicate newsletter that acts as a history record
     $notification_history = $this->createNotificationHistory($newsletter->id);
-    if(!$notification_history) return;
+    if(!$notification_history) return false;
 
     // queue newsletter for delivery
     $queue->newsletter_id = $notification_history->id;
@@ -101,6 +99,7 @@ class Scheduler {
     $queue->count_total = $queue->count_to_process = count($subscribers);
     $queue->status = null;
     $queue->save();
+    return true;
   }
 
   function processScheduledStandardNewsletter($newsletter, $queue) {
@@ -108,7 +107,6 @@ class Scheduler {
     $segment_ids = array_map(function($segment) {
       return $segment['id'];
     }, $segments);
-
     $subscribers = Subscriber::getSubscribedInSegments($segment_ids)
       ->findArray();
     $subscribers = Helpers::arrayColumn($subscribers, 'subscriber_id');
@@ -123,9 +121,10 @@ class Scheduler {
     $queue->count_total = $queue->count_to_process = count($subscribers);
     $queue->status = null;
     $queue->save();
+    return true;
   }
 
-  function verifyMailPoetSubscriber($subscriber_id, $newsletter, $queue) {
+  function verifyMailpoetSubscriber($subscriber_id, $newsletter, $queue) {
     $subscriber = Subscriber::findOne($subscriber_id);
     // check if subscriber is in proper segment
     $subscriber_in_segment =
@@ -184,7 +183,7 @@ class Scheduler {
       $notification_history :
       false;
   }
-  
+
   static function getScheduledQueues() {
     return SendingQueue::where('status', 'scheduled')
       ->whereLte('scheduled_at', Carbon::createFromTimestamp(current_time('timestamp')))

lib/Cron/Workers/SendingQueue/SendingQueue.php

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

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

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

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

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

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

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

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

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

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

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

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

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

lib/Form/Block/Base.php

@@ -7,7 +7,7 @@ abstract class Base {
 
     if($block['id'] === 'email') {
       $rules['required'] = true;
-      $rules['error-message'] = __('Please specify a valid email address');
+      $rules['error-message'] = __('Please specify a valid email address', 'mailpoet');
     }
 
     if($block['id'] === 'segments') {
@@ -15,7 +15,7 @@ abstract class Base {
       $rules['mincheck'] = 1;
       $rules['group'] = $block['id'];
       $rules['errors-container'] = '.mailpoet_error_'.$block['id'];
-      $rules['required-message'] = __('Please select a list');
+      $rules['required-message'] = __('Please select a list', 'mailpoet');
     }
 
     if(!empty($block['params']['required'])) {
@@ -25,7 +25,7 @@ abstract class Base {
     if(!empty($block['params']['validate'])) {
       if($block['params']['validate'] === 'phone') {
         $rules['pattern'] = "^[\d\+\-\.\(\)\/\s]*$";
-        $rules['error-message'] = __('Please specify a valid phone number');
+        $rules['error-message'] = __('Please specify a valid phone number', 'mailpoet');
       } else {
         $rules['type'] = $block['params']['validate'];
       }
@@ -34,7 +34,7 @@ abstract class Base {
     if(in_array($block['type'], array('radio', 'checkbox'))) {
       $rules['group'] = 'custom_field_'.$block['id'];
       $rules['errors-container'] = '.mailpoet_error_'.$block['id'];
-      $rules['required-message'] = __('Please select at least one option');
+      $rules['required-message'] = __('Please select at least one option', 'mailpoet');
     }
 
     if($block['type'] === 'date') {

lib/Form/Block/Checkbox.php

@@ -1,6 +1,8 @@
 <?php
 namespace MailPoet\Form\Block;
 
+if(!defined('ABSPATH')) exit;
+
 class Checkbox extends Base {
 
   static function render($block) {
@@ -22,7 +24,6 @@ class Checkbox extends Base {
 
     foreach($options as $option) {
       $html .= '<label class="mailpoet_checkbox_label">';
-      $html .= '<input type="hidden" name="'.$field_name.'" value="0" />';
       $html .= '<input type="checkbox" class="mailpoet_checkbox" ';
 
       $html .= 'name="'.$field_name.'" ';
@@ -50,5 +51,4 @@ class Checkbox extends Base {
 
     return $html;
   }
-}
-
+}

lib/Form/Block/Date.php

@@ -1,6 +1,8 @@
 <?php
 namespace MailPoet\Form\Block;
 
+if(!defined('ABSPATH')) exit;
+
 use Carbon\Carbon;
 
 class Date extends Base {
@@ -70,27 +72,27 @@ class Date extends Base {
         $block['selected'] = $day;
         $html .= '<select class="mailpoet_date_day" ';
         $html .= static::getInputValidation($block, array(
-          'required-message' => __('Please select a day')
+          'required-message' => __('Please select a day', 'mailpoet')
         ));
-        $html .= 'name="'.$field_name.'[day]" placeholder="'.__('Day').'">';
+        $html .= 'name="'.$field_name.'[day]" placeholder="'.__('Day', 'mailpoet').'">';
         $html .= static::getDays($block);
         $html .= '</select>';
       } else if($date_selector === 'MM') {
         $block['selected'] = $month;
         $html .= '<select class="mailpoet_date_month" ';
         $html .= static::getInputValidation($block, array(
-          'required-message' => __('Please select a month')
+          'required-message' => __('Please select a month', 'mailpoet')
         ));
-        $html .= 'name="'.$field_name.'[month]" placeholder="'.__('Month').'">';
+        $html .= 'name="'.$field_name.'[month]" placeholder="'.__('Month', 'mailpoet').'">';
         $html .= static::getMonths($block);
         $html .= '</select>';
       } else if($date_selector === 'YYYY') {
         $block['selected'] = $year;
         $html .= '<select class="mailpoet_date_year" ';
         $html .= static::getInputValidation($block, array(
-          'required-message' => __('Please select a year')
+          'required-message' => __('Please select a year', 'mailpoet')
         ));
-        $html .= 'name="'.$field_name.'[year]" placeholder="'.__('Year').'">';
+        $html .= 'name="'.$field_name.'[year]" placeholder="'.__('Year', 'mailpoet').'">';
         $html .= static::getYears($block);
         $html .= '</select>';
       }
@@ -103,10 +105,10 @@ class Date extends Base {
 
   static function getDateTypes() {
     return array(
-      'year_month_day' => __('Year, month, day'),
-      'year_month' => __('Year, month'),
-      'month' => __('Month (January, February,...)'),
-      'year' => __('Year')
+      'year_month_day' => __('Year, month, day', 'mailpoet'),
+      'year_month' => __('Year, month', 'mailpoet'),
+      'month' => __('Month (January, February,...)', 'mailpoet'),
+      'year' => __('Year', 'mailpoet')
     );
   }
 
@@ -119,9 +121,9 @@ class Date extends Base {
     );
   }
   static function getMonthNames() {
-    return array(__('January'), __('February'), __('March'), __('April'),
-      __('May'), __('June'), __('July'), __('August'), __('September'),
-      __('October'), __('November'), __('December')
+    return array(__('January', 'mailpoet'), __('February', 'mailpoet'), __('March', 'mailpoet'), __('April', 'mailpoet'),
+      __('May', 'mailpoet'), __('June', 'mailpoet'), __('July', 'mailpoet'), __('August', 'mailpoet'), __('September', 'mailpoet'),
+      __('October', 'mailpoet'), __('November', 'mailpoet'), __('December', 'mailpoet')
     );
   }
 
@@ -138,7 +140,7 @@ class Date extends Base {
     $html = '';
 
     // empty value label
-    $html .= '<option value="">'.__('Month').'</option>';
+    $html .= '<option value="">'.__('Month', 'mailpoet').'</option>';
 
     for($i = 1; $i < 13; $i++) {
       $is_selected = ($i === $block['selected']) ? 'selected="selected"' : '';
@@ -168,7 +170,7 @@ class Date extends Base {
     $html = '';
 
     // empty value label
-    $html .= '<option value="">'.__('Year').'</option>';
+    $html .= '<option value="">'.__('Year', 'mailpoet').'</option>';
 
     // return years as an array
     for($i = (int)$block['to']; $i > (int)($block['from'] - 1); $i--) {
@@ -194,7 +196,7 @@ class Date extends Base {
     $html = '';
 
     // empty value label
-    $html .= '<option value="">'.__('Day').'</option>';
+    $html .= '<option value="">'.__('Day', 'mailpoet').'</option>';
 
     // return days as an array
     for($i = 1; $i < 32; $i++) {

lib/Form/Block/Radio.php

@@ -1,6 +1,8 @@
 <?php
 namespace MailPoet\Form\Block;
 
+if(!defined('ABSPATH')) exit;
+
 class Radio extends Base {
 
   static function render($block) {

lib/Form/Block/Segment.php

@@ -1,6 +1,8 @@
 <?php
 namespace MailPoet\Form\Block;
 
+if(!defined('ABSPATH')) exit;
+
 class Segment extends Base {
 
   static function render($block) {

lib/Form/Block/Select.php

@@ -1,6 +1,8 @@
 <?php
 namespace MailPoet\Form\Block;
 
+if(!defined('ABSPATH')) exit;
+
 class Select extends Base {
 
   static function render($block) {

lib/Form/Block/Submit.php

@@ -1,6 +1,8 @@
 <?php
 namespace MailPoet\Form\Block;
 
+if(!defined('ABSPATH')) exit;
+
 class Submit extends Base {
 
   static function render($block) {

lib/Form/Block/Text.php

@@ -1,6 +1,8 @@
 <?php
 namespace MailPoet\Form\Block;
 
+if(!defined('ABSPATH')) exit;
+
 class Text extends Base {
 
   static function render($block) {

lib/Form/Block/Textarea.php

@@ -1,6 +1,8 @@
 <?php
 namespace MailPoet\Form\Block;
 
+if(!defined('ABSPATH')) exit;
+
 class Textarea extends Base {
   static function render($block) {
     $html = '';

lib/Form/Util/Export.php

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

lib/Form/Widget.php

@@ -15,9 +15,9 @@ class Widget extends \WP_Widget {
   function __construct () {
     return parent::__construct(
       'mailpoet_form',
-      __('MailPoet Form'),
+      __('MailPoet Form', 'mailpoet'),
       array(
-        'description' => __('Add a newsletter subscription form')
+        'description' => __('Add a newsletter subscription form', 'mailpoet')
       )
     );
   }
@@ -40,7 +40,7 @@ class Widget extends \WP_Widget {
     $instance = wp_parse_args(
       (array)$instance,
       array(
-        'title' => __("Subscribe to Our Newsletter")
+        'title' => __("Subscribe to Our Newsletter", 'mailpoet')
       )
     );
 
@@ -55,7 +55,7 @@ class Widget extends \WP_Widget {
     // get forms list
     $forms = Form::getPublished()->orderByAsc('name')->findArray();
     ?><p>
-      <label for="<?php $this->get_field_id( 'title' ) ?>"><?php _e( 'Title:' ); ?></label>
+      <label for="<?php $this->get_field_id( 'title' ) ?>"><?php _e('Title:', 'mailpoet'); ?></label>
       <input
         type="text"
         class="widefat"
@@ -75,7 +75,7 @@ class Widget extends \WP_Widget {
       </select>
     </p>
     <p>
-      <a href="javascript:;" onClick="createSubscriptionForm()" class="mailpoet_form_new"><?php _e("Create a new form"); ?></a>
+      <a href="javascript:;" onClick="createSubscriptionForm()" class="mailpoet_form_new"><?php _e('Create a new form', 'mailpoet'); ?></a>
     </p>
     <script type="text/javascript">
     function createSubscriptionForm() {
@@ -148,12 +148,17 @@ class Widget extends \WP_Widget {
           'after_title' => (!empty($after_title) ? $after_title : '')
         );
 
-        // check if the form was successfully submitted via POST (non ajax)
+        // (POST) non ajax success/error variables
         $data['success'] = (
           (isset($_GET['mailpoet_success']))
           &&
           ((int)$_GET['mailpoet_success'] === (int)$form['id'])
         );
+        $data['error'] = (
+          (isset($_GET['mailpoet_error']))
+          &&
+          ((int)$_GET['mailpoet_error'] === (int)$form['id'])
+        );
 
         // generate security token
         $data['token'] = Security::generateToken();

lib/Listing/BulkAction.php

@@ -26,7 +26,7 @@ class BulkAction {
 
     if(!method_exists($this->model_class, $bulk_action_method)) {
       throw new \Exception(
-        $this->model_class. ' has not method "'.$bulk_action_method.'"'
+        $this->model_class. ' has no method "'.$bulk_action_method.'"'
       );
     }
 

lib/Listing/Handler.php

@@ -15,6 +15,11 @@ class Handler {
     $this->model_class = $model_class;
     $this->model = \Model::factory($this->model_class);
 
+    // check if sort order was specified or default to "asc"
+    $sort_order = (!empty($data['sort_order'])) ? $data['sort_order'] : 'asc';
+    // constrain sort order value to either be "asc" or "desc"
+    $sort_order = ($sort_order === 'asc') ? 'asc' : 'desc';
+
     $this->data = array(
       // extra parameters
       'params' => (isset($data['params']) ? $data['params'] : array()),
@@ -28,7 +33,7 @@ class Handler {
       'search' => (isset($data['search']) ? $data['search'] : null),
       // sorting
       'sort_by' => (!empty($data['sort_by']) ? $data['sort_by'] : 'id'),
-      'sort_order' => (!empty($data['sort_order']) ? $data['sort_order'] : 'asc'),
+      'sort_order' => $sort_order,
       // grouping
       'group' => (isset($data['group']) ? $data['group'] : null),
       // filters
@@ -106,6 +111,7 @@ class Handler {
       );
     }
 
+    // get items and total count
     if(method_exists($this->model_class, 'listingQuery')) {
       $custom_query = call_user_func_array(
         array($this->model_class, 'listingQuery'),
@@ -135,7 +141,6 @@ class Handler {
         ->findMany();
     }
 
-
     return array(
       'count' => $count,
       'filters' => $filters,

lib/Mailer/Mailer.php

@@ -1,18 +1,16 @@
 <?php
 namespace MailPoet\Mailer;
-
 use MailPoet\Models\Setting;
 
-require_once(ABSPATH . 'wp-includes/pluggable.php');
-
 if(!defined('ABSPATH')) exit;
+require_once(ABSPATH . 'wp-includes/pluggable.php');
 
 class Mailer {
   public $mailer_config;
   public $sender;
   public $reply_to;
   public $mailer_instance;
-  const MAILER_CONFIG = 'mta';
+  const MAILER_CONFIG_SETTING_NAME = 'mta';
   const SENDING_LIMIT_INTERVAL_MULTIPLIER = 60;
   const METHOD_MAILPOET = 'MailPoet';
   const METHOD_MAILGUN = 'MailGun';
@@ -24,13 +22,13 @@ class Mailer {
 
   function __construct($mailer = false, $sender = false, $reply_to = false) {
     $this->mailer_config = self::getMailerConfig($mailer);
-    $this->sender = $this->getSender($sender);
-    $this->reply_to = $this->getReplyTo($reply_to);
+    $this->sender = $this->getSenderNameAndAddress($sender);
+    $this->reply_to = $this->getReplyToNameAndAddress($reply_to);
     $this->mailer_instance = $this->buildMailer();
   }
 
   function send($newsletter, $subscriber) {
-    $subscriber = $this->transformSubscriber($subscriber);
+    $subscriber = $this->formatSubscriberNameAndEmailAddress($subscriber);
     return $this->mailer_instance->send($newsletter, $subscriber);
   }
 
@@ -93,15 +91,15 @@ class Mailer {
         );
         break;
       default:
-        throw new \Exception(__('Mailing method does not exist'));
+        throw new \Exception(__('Mailing method does not exist', 'mailpoet'));
     }
     return $mailer_instance;
   }
 
   static function getMailerConfig($mailer = false) {
     if(!$mailer) {
-      $mailer = Setting::getValue(self::MAILER_CONFIG);
-      if(!$mailer || !isset($mailer['method'])) throw new \Exception(__('Mailer is not configured'));
+      $mailer = Setting::getValue(self::MAILER_CONFIG_SETTING_NAME);
+      if(!$mailer || !isset($mailer['method'])) throw new \Exception(__('Mailer is not configured', 'mailpoet'));
     }
     if(empty($mailer['frequency'])) {
       $default_settings = Setting::getDefaults();
@@ -115,10 +113,10 @@ class Mailer {
     return $mailer;
   }
 
-  function getSender($sender = false) {
+  function getSenderNameAndAddress($sender = false) {
     if(empty($sender)) {
       $sender = Setting::getValue('sender', array());
-      if(empty($sender['address'])) throw new \Exception(__('Sender name and email are not configured'));
+      if(empty($sender['address'])) throw new \Exception(__('Sender name and email are not configured', 'mailpoet'));
     }
     return array(
       'from_name' => $sender['name'],
@@ -127,15 +125,15 @@ class Mailer {
     );
   }
 
-  function getReplyTo($reply_to = false) {
+  function getReplyToNameAndAddress($reply_to = array()) {
     if(!$reply_to) {
       $reply_to = Setting::getValue('reply_to', null);
-      if(!$reply_to) {
-        $reply_to = array(
-          'name' => $this->sender['from_name'],
-          'address' => $this->sender['from_email']
-        );
-      }
+      $reply_to['name'] = (!empty($reply_to['name'])) ?
+        $reply_to['name'] :
+        $this->sender['from_name'];
+      $reply_to['address'] = (!empty($reply_to['address'])) ?
+        $reply_to['address'] :
+        $this->sender['from_email'];
     }
     if(empty($reply_to['address'])) {
       $reply_to['address'] = $this->sender['from_email'];
@@ -147,7 +145,8 @@ class Mailer {
     );
   }
 
-  function transformSubscriber($subscriber) {
+  function formatSubscriberNameAndEmailAddress($subscriber) {
+    $subscriber = (is_object($subscriber)) ? $subscriber->asArray() : $subscriber;
     if(!is_array($subscriber)) return $subscriber;
     if(isset($subscriber['address'])) $subscriber['email'] = $subscriber['address'];
     $first_name = (isset($subscriber['first_name'])) ? $subscriber['first_name'] : '';

lib/Mailer/MailerLog.php

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

lib/Mailer/Methods/AmazonSES.php

@@ -17,11 +17,19 @@ class AmazonSES {
   public $reply_to;
   public $date;
   public $date_without_time;
+  const SES_REGIONS = array(
+    'US East (N. Virginia)' => 'us-east-1',
+    'US West (Oregon)' => 'us-west-2',
+    'EU (Ireland)' => 'eu-west-1'
+  );
 
   function __construct($region, $access_key, $secret_key, $sender, $reply_to) {
     $this->aws_access_key = $access_key;
     $this->aws_secret_key = $secret_key;
-    $this->aws_region = $region;
+    $this->aws_region = (in_array($region, self::SES_REGIONS)) ? $region : false;
+    if(!$this->aws_region) {
+      throw new \Exception(__('Unsupported Amazon SES region.', 'mailpoet'));
+    }
     $this->aws_endpoint = sprintf('email.%s.amazonaws.com', $this->aws_region);
     $this->aws_signing_algorithm = 'AWS4-HMAC-SHA256';
     $this->aws_service = 'ses';

lib/Models/CustomField.php

@@ -11,10 +11,10 @@ class CustomField extends Model {
   function __construct() {
     parent::__construct();
     $this->addValidations('name', array(
-      'required' => __('Please specify a name')
+      'required' => __('Please specify a name', 'mailpoet')
     ));
     $this->addValidations('type', array(
-      'required' => __('Please specify a type')
+      'required' => __('Please specify a type', 'mailpoet')
     ));
   }
 

lib/Models/Form.php

@@ -10,7 +10,7 @@ class Form extends Model {
     parent::__construct();
 
     $this->addValidations('name', array(
-      'required' => __('Please specify a name')
+      'required' => __('Please specify a name', 'mailpoet')
     ));
   }
 
@@ -47,12 +47,12 @@ class Form extends Model {
     return array(
       array(
         'name' => 'all',
-        'label' => __('All'),
+        'label' => __('All', 'mailpoet'),
         'count' => Form::getPublished()->count()
       ),
       array(
         'name' => 'trash',
-        'label' => __('Trash'),
+        'label' => __('Trash', 'mailpoet'),
         'count' => Form::getTrashed()->count()
       )
     );

lib/Models/Model.php

@@ -50,7 +50,7 @@ class Model extends \Sudzy\ValidModel {
             $column = $matches[1];
             $this->setError(
               sprintf(
-                __('Another record already exists. Please specify a different "%1$s".'),
+                __('Another record already exists. Please specify a different "%1$s".', 'mailpoet'),
                 $column
               )
             );
@@ -77,7 +77,7 @@ class Model extends \Sudzy\ValidModel {
 
   static function bulkTrash($orm) {
     $model = get_called_class();
-    return self::bulkAction($orm, function($ids) use($model) {
+    $count = self::bulkAction($orm, function($ids) use($model) {
       self::rawExecute(join(' ', array(
           'UPDATE `'.$model::$_table.'`',
           'SET `deleted_at` = NOW()',
@@ -86,13 +86,17 @@ class Model extends \Sudzy\ValidModel {
         $ids
       );
     });
+
+    return array('count' => $count);
   }
 
   static function bulkDelete($orm) {
     $model = get_called_class();
-    return self::bulkAction($orm, function($ids) use($model) {
+    $count = self::bulkAction($orm, function($ids) use($model) {
       $model::whereIn('id', $ids)->deleteMany();
     });
+
+    return array('count' => $count);
   }
 
   function restore() {
@@ -101,7 +105,7 @@ class Model extends \Sudzy\ValidModel {
 
   static function bulkRestore($orm) {
     $model = get_called_class();
-    return self::bulkAction($orm, function($ids) use($model) {
+    $count = self::bulkAction($orm, function($ids) use($model) {
       self::rawExecute(join(' ', array(
           'UPDATE `'.$model::$_table.'`',
           'SET `deleted_at` = NULL',
@@ -110,6 +114,8 @@ class Model extends \Sudzy\ValidModel {
         $ids
       );
     });
+
+    return array('count' => $count);
   }
 
   static function bulkAction($orm, $callback = false) {
@@ -145,14 +151,11 @@ class Model extends \Sudzy\ValidModel {
     $duplicate->set_expr('updated_at', 'NOW()');
     $duplicate->set_expr('deleted_at', 'NULL');
 
-    if($duplicate->save()) {
-      return $duplicate;
-    } else {
-      return false;
-    }
+    $duplicate->save();
+    return $duplicate;
   }
 
-  private function setTimestamp() {
+  function setTimestamp() {
     if($this->created_at === null) {
       $this->set_expr('created_at', 'NOW()');
     }

lib/Models/Newsletter.php

@@ -1,12 +1,12 @@
 <?php
 namespace MailPoet\Models;
+use MailPoet\Newsletter\Renderer\Renderer;
 use MailPoet\Util\Helpers;
 
 if(!defined('ABSPATH')) exit;
 
 class Newsletter extends Model {
   public static $_table = MP_NEWSLETTERS_TABLE;
-
   const TYPE_STANDARD = 'standard';
   const TYPE_WELCOME = 'welcome';
   const TYPE_NOTIFICATION = 'notification';
@@ -22,9 +22,8 @@ class Newsletter extends Model {
 
   function __construct() {
     parent::__construct();
-
     $this->addValidations('type', array(
-      'required' => __('Please specify a type')
+      'required' => __('Please specify a type', 'mailpoet')
     ));
   }
 
@@ -246,6 +245,11 @@ class Newsletter extends Model {
     return $this;
   }
 
+  function render() {
+    $renderer = new Renderer($this);
+    return $renderer->render();
+  }
+
   function getStatistics() {
     $statistics_query = SendingQueue::tableAlias('queues')
       ->selectExpr(
@@ -305,7 +309,7 @@ class Newsletter extends Model {
     $segments = Segment::orderByAsc('name')->findMany();
     $segment_list = array();
     $segment_list[] = array(
-      'label' => __('All Lists'),
+      'label' => __('All Lists', 'mailpoet'),
       'value' => ''
     );
 
@@ -404,7 +408,7 @@ class Newsletter extends Model {
     $groups = array(
       array(
         'name' => 'all',
-        'label' => __('All'),
+        'label' => __('All', 'mailpoet'),
         'count' => Newsletter::getPublished()
           ->filter('filterType', $type)
           ->count()
@@ -416,7 +420,7 @@ class Newsletter extends Model {
         $groups = array_merge($groups, array(
           array(
             'name' => self::STATUS_DRAFT,
-            'label' => __('Draft'),
+            'label' => __('Draft', 'mailpoet'),
             'count' => Newsletter::getPublished()
               ->filter('filterType', $type)
               ->filter('filterStatus', self::STATUS_DRAFT)
@@ -424,7 +428,7 @@ class Newsletter extends Model {
           ),
           array(
             'name' => self::STATUS_SCHEDULED,
-            'label' => __('Scheduled'),
+            'label' => __('Scheduled', 'mailpoet'),
             'count' => Newsletter::getPublished()
               ->filter('filterType', $type)
               ->filter('filterStatus', self::STATUS_SCHEDULED)
@@ -432,7 +436,7 @@ class Newsletter extends Model {
           ),
           array(
             'name' => self::STATUS_SENDING,
-            'label' => __('Sending'),
+            'label' => __('Sending', 'mailpoet'),
             'count' => Newsletter::getPublished()
               ->filter('filterType', $type)
               ->filter('filterStatus', self::STATUS_SENDING)
@@ -440,7 +444,7 @@ class Newsletter extends Model {
           ),
           array(
             'name' => self::STATUS_SENT,
-            'label' => __('Sent'),
+            'label' => __('Sent', 'mailpoet'),
             'count' => Newsletter::getPublished()
               ->filter('filterType', $type)
               ->filter('filterStatus', self::STATUS_SENT)
@@ -454,7 +458,7 @@ class Newsletter extends Model {
         $groups = array_merge($groups, array(
           array(
             'name' => self::STATUS_ACTIVE,
-            'label' => __('Active'),
+            'label' => __('Active', 'mailpoet'),
             'count' => Newsletter::getPublished()
               ->filter('filterType', $type)
               ->filter('filterStatus', self::STATUS_ACTIVE)
@@ -462,7 +466,7 @@ class Newsletter extends Model {
           ),
           array(
             'name' => self::STATUS_DRAFT,
-            'label' => __('Not active'),
+            'label' => __('Not active', 'mailpoet'),
             'count' => Newsletter::getPublished()
               ->filter('filterType', $type)
               ->filter('filterStatus', self::STATUS_DRAFT)
@@ -474,7 +478,7 @@ class Newsletter extends Model {
 
     $groups[] = array(
       'name' => 'trash',
-      'label' => __('Trash'),
+      'label' => __('Trash', 'mailpoet'),
       'count' => Newsletter::getTrashed()
         ->filter('filterType', $type)
         ->count()

lib/Models/NewsletterOptionField.php

@@ -9,10 +9,10 @@ class NewsletterOptionField extends Model {
   function __construct() {
     parent::__construct();
     $this->addValidations('name', array(
-      'required' => __('Please specify a name')
+      'required' => __('Please specify a name', 'mailpoet')
     ));
     $this->addValidations('newsletter_type', array(
-      'required' => __('Please specify a newsletter type')
+      'required' => __('Please specify a newsletter type', 'mailpoet')
     ));
   }
 

lib/Models/NewsletterTemplate.php

@@ -10,10 +10,10 @@ class NewsletterTemplate extends Model {
     parent::__construct();
 
     $this->addValidations('name', array(
-      'required' => __('Please specify a name')
+      'required' => __('Please specify a name', 'mailpoet')
     ));
     $this->addValidations('body', array(
-      'required' => __('The template body cannot be empty')
+      'required' => __('The template body cannot be empty', 'mailpoet')
     ));
   }
 

lib/Models/Segment.php

@@ -10,7 +10,7 @@ class Segment extends Model {
     parent::__construct();
 
     $this->addValidations('name', array(
-      'required' => __('Please specify a name')
+      'required' => __('Please specify a name', 'mailpoet')
     ));
   }
 
@@ -100,9 +100,9 @@ class Segment extends Model {
       // create the wp users segment
       $wp_segment = Segment::create();
       $wp_segment->hydrate(array(
-        'name' => __('WordPress Users'),
+        'name' => __('WordPress Users', 'mailpoet'),
         'description' =>
-          __('This lists containts all of your WordPress users'),
+          __('This lists containts all of your WordPress users', 'mailpoet'),
         'type' => 'wp_users'
       ));
       $wp_segment->save();
@@ -119,12 +119,12 @@ class Segment extends Model {
     return array(
       array(
         'name' => 'all',
-        'label' => __('All'),
+        'label' => __('All', 'mailpoet'),
         'count' => Segment::getPublished()->count()
       ),
       array(
         'name' => 'trash',
-        'label' => __('Trash'),
+        'label' => __('Trash', 'mailpoet'),
         'count' => Segment::getTrashed()->count()
       )
     );
@@ -143,7 +143,41 @@ class Segment extends Model {
     $query = self::selectMany(array(self::$_table.'.id', self::$_table.'.name'))
       ->selectExpr(
         self::$_table.'.*, ' .
-        'COUNT(IF('.MP_SUBSCRIBER_SEGMENT_TABLE.'.status="' . Subscriber::STATUS_SUBSCRIBED .'" AND '.MP_SUBSCRIBERS_TABLE.'.deleted_at IS NULL,1,NULL)) `subscribers`'
+        'COUNT(IF('.
+          MP_SUBSCRIBER_SEGMENT_TABLE.'.status="'.Subscriber::STATUS_SUBSCRIBED.'"'
+          .' AND '.
+          MP_SUBSCRIBERS_TABLE.'.deleted_at IS NULL'
+          .' AND '.
+          MP_SUBSCRIBERS_TABLE.'.status="'.Subscriber::STATUS_SUBSCRIBED.'"'
+          .', 1, NULL)) `subscribers`'
+      )
+      ->leftOuterJoin(
+        MP_SUBSCRIBER_SEGMENT_TABLE,
+        array(self::$_table.'.id', '=', MP_SUBSCRIBER_SEGMENT_TABLE.'.segment_id'))
+      ->leftOuterJoin(
+        MP_SUBSCRIBERS_TABLE,
+        array(MP_SUBSCRIBER_SEGMENT_TABLE.'.subscriber_id', '=', MP_SUBSCRIBERS_TABLE.'.id'))
+      ->groupBy(self::$_table.'.id')
+      ->groupBy(self::$_table.'.name')
+      ->orderByAsc(self::$_table.'.name')
+      ->whereNull(self::$_table.'.deleted_at');
+
+    if(!empty($type)) {
+      $query->where(self::$_table.'.type', $type);
+    }
+
+    return $query->findArray();
+  }
+
+  static function getSegmentsForImport() {
+    $query = self::selectMany(array(self::$_table.'.id', self::$_table.'.name'))
+      ->selectExpr(
+        self::$_table.'.*, ' .
+        'COUNT(IF('.
+          MP_SUBSCRIBER_SEGMENT_TABLE.'.status="'.Subscriber::STATUS_SUBSCRIBED.'"'
+          .' AND '.
+          MP_SUBSCRIBERS_TABLE.'.deleted_at IS NULL'
+          .', 1, NULL)) `subscribers`'
       )
       ->leftOuterJoin(
         MP_SUBSCRIBER_SEGMENT_TABLE,
@@ -176,7 +210,7 @@ class Segment extends Model {
       'AND relation.status = "' . Subscriber::STATUS_SUBSCRIBED . '" ' .
       'GROUP BY segments.id) ' .
       'UNION ALL ' .
-      '(SELECT 0 as id, "' . __('Not in a List') . '" as name, COUNT(*) as subscribers ' .
+      '(SELECT 0 as id, "' . __('Not in a List', 'mailpoet') . '" as name, COUNT(*) as subscribers ' .
       'FROM ' . MP_SUBSCRIBERS_TABLE . ' subscribers ' .
       'LEFT JOIN ' . MP_SUBSCRIBER_SEGMENT_TABLE . ' relation on relation.subscriber_id = subscribers.id ' .
       (($withConfirmedSubscribers) ?
@@ -212,7 +246,7 @@ class Segment extends Model {
   }
 
   static function bulkTrash($orm) {
-    return parent::bulkAction($orm, function($ids) {
+    $count = parent::bulkAction($orm, function($ids) {
       parent::rawExecute(join(' ', array(
         'UPDATE `'.self::$_table.'`',
         'SET `deleted_at` = NOW()',
@@ -220,14 +254,18 @@ class Segment extends Model {
         'AND `type` = "default"'
       )), $ids);
     });
+
+    return array('count' => $count);
   }
 
   static function bulkDelete($orm) {
-    return parent::bulkAction($orm, function($ids) {
+    $count = parent::bulkAction($orm, function($ids) {
       // delete segments (only default)
       Segment::whereIn('id', $ids)
         ->where('type', 'default')
         ->deleteMany();
     });
+
+    return array('count' => $count);
   }
 }

lib/Models/SendingQueue.php

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

lib/Models/Setting.php

@@ -19,7 +19,7 @@ class Setting extends Model {
     parent::__construct();
 
     $this->addValidations('name', array(
-      'required' => __('Please specify a name')
+      'required' => __('Please specify a name', 'mailpoet')
     ));
   }
 
@@ -45,8 +45,8 @@ class Setting extends Model {
       ),
       '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.\n\nPlease confirm 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")
+        'subject' => sprintf(__('Confirm your subscription to %1$s', 'mailpoet'), get_option('blogname')),
+        'body' => __("Hello!\n\nHurray! You've subscribed to our site.\n\nPlease confirm 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", 'mailpoet')
       ),
       'tracking' => array(
         'enabled' => true

lib/Models/Subscriber.php

@@ -18,17 +18,18 @@ class Subscriber extends Model {
     parent::__construct();
 
     $this->addValidations('email', array(
-      'required' => __('Please enter your email address'),
-      'isEmail' => __('Your email address is invalid!')
+      'required' => __('Please enter your email address', 'mailpoet'),
+      'isEmail' => __('Your email address is invalid!', 'mailpoet')
     ));
   }
 
-  static function findOne($id = null) {
+  static function findOne($id = false) {
     if(is_int($id) || (string)(int)$id === $id) {
       return parent::findOne($id);
-    } else {
+    } else if(strlen(trim($id)) > 0) {
       return parent::where('email', $id)->findOne();
     }
+    return false;
   }
 
   function segments() {
@@ -72,72 +73,73 @@ class Subscriber extends Model {
   }
 
   function sendConfirmationEmail() {
-    if($this->status === self::STATUS_UNCONFIRMED) {
-      $signup_confirmation = Setting::getValue('signup_confirmation');
+    $signup_confirmation = Setting::getValue('signup_confirmation');
 
-      $segments = $this->segments()->findMany();
-      $segment_names = array_map(function($segment) {
-        return $segment->name;
-      }, $segments);
-
-      $body = nl2br($signup_confirmation['body']);
-
-      // replace list of segments shortcode
-      $body = str_replace(
-        '[lists_to_confirm]',
-        '<strong>'.join(', ', $segment_names).'</strong>',
-        $body
-      );
-
-      // replace activation link
-      $body = str_replace(
-        array(
-          '[activation_link]',
-          '[/activation_link]'
-        ),
-        array(
-          '<a href="'.esc_attr(Subscription\Url::getConfirmationUrl($this)).'">',
-          '</a>'
-        ),
-        $body
-      );
-
-      // build email data
-      $email = array(
-        'subject' => $signup_confirmation['subject'],
-        'body' => array(
-          'html' => $body,
-          'text' => $body
-        )
-      );
-
-      // convert subscriber to array
-      $subscriber = $this->asArray();
-
-      // set from
-      $from = (
-        !empty($signup_confirmation['from'])
-        && !empty($signup_confirmation['from']['address'])
-      ) ? $signup_confirmation['from']
-        : false;
-
-      // set reply to
-      $reply_to = (
-        !empty($signup_confirmation['reply_to'])
-        && !empty($signup_confirmation['reply_to']['address'])
-      ) ? $signup_confirmation['reply_to']
-        : false;
-
-      // send email
-      try {
-        $mailer = new Mailer(false, $from, $reply_to);
-        return $mailer->send($email, $subscriber);
-      } catch(\Exception $e) {
-        $this->setError($e->getMessage());
-        return false;
-      }
+    if((bool)$signup_confirmation['enabled'] === false) {
+      return false;
+    }
+
+    $segments = $this->segments()->findMany();
+    $segment_names = array_map(function($segment) {
+      return $segment->name;
+    }, $segments);
+
+    $body = nl2br($signup_confirmation['body']);
+
+    // replace list of segments shortcode
+    $body = str_replace(
+      '[lists_to_confirm]',
+      '<strong>'.join(', ', $segment_names).'</strong>',
+      $body
+    );
+
+    // replace activation link
+    $body = str_replace(
+      array(
+        '[activation_link]',
+        '[/activation_link]'
+      ),
+      array(
+        '<a href="'.esc_attr(Subscription\Url::getConfirmationUrl($this)).'">',
+        '</a>'
+      ),
+      $body
+    );
+
+    // build email data
+    $email = array(
+      'subject' => $signup_confirmation['subject'],
+      'body' => array(
+        'html' => $body,
+        'text' => $body
+      )
+    );
+
+    // convert subscriber to array
+    $subscriber = $this->asArray();
+
+    // set from
+    $from = (
+      !empty($signup_confirmation['from'])
+      && !empty($signup_confirmation['from']['address'])
+    ) ? $signup_confirmation['from']
+      : false;
+
+    // set reply to
+    $reply_to = (
+      !empty($signup_confirmation['reply_to'])
+      && !empty($signup_confirmation['reply_to']['address'])
+    ) ? $signup_confirmation['reply_to']
+      : false;
+
+    // send email
+    try {
+      $mailer = new Mailer(false, $from, $reply_to);
+      return $mailer->send($email, $subscriber);
+    } catch(\Exception $e) {
+      $this->setError($e->getMessage());
+      return false;
     }
-    return false;
   }
 
   static function generateToken($email = null) {
@@ -148,53 +150,52 @@ class Subscriber extends Model {
   }
 
   static function verifyToken($email, $token) {
-    return (self::generateToken($email) === $token);
+    return hash_equals(self::generateToken($email), $token);
   }
 
   static function subscribe($subscriber_data = array(), $segment_ids = array()) {
-    if(empty($subscriber_data) or empty($segment_ids)) {
-      return false;
-    }
-
     $signup_confirmation_enabled = (bool)Setting::getValue(
       'signup_confirmation.enabled'
     );
 
-    $subscriber = self::createOrUpdate($subscriber_data);
-    $errors = $subscriber->getErrors();
+    $subscriber = self::findOne($subscriber_data['email']);
+
+    if($subscriber === false) {
+      // create new subscriber
+      $subscriber = self::createOrUpdate($subscriber_data);
+      if($subscriber->getErrors() !== false) {
+        return $subscriber;
+      }
 
-    if($errors === false && $subscriber->id > 0) {
       $subscriber = self::findOne($subscriber->id);
+    }
 
-      // restore deleted subscriber
-      if($subscriber->deleted_at !== null) {
-        $subscriber->setExpr('deleted_at', 'NULL');
+    // restore trashed subscriber
+    if($subscriber->deleted_at !== null) {
+      $subscriber->setExpr('deleted_at', 'NULL');
+    }
+
+    // set status depending on signup confirmation setting
+    if($subscriber->status !== self::STATUS_SUBSCRIBED) {
+      if($signup_confirmation_enabled === true) {
+        $subscriber->set('status', self::STATUS_UNCONFIRMED);
+      } else {
+        $subscriber->set('status', self::STATUS_SUBSCRIBED);
       }
+    }
 
-      if($subscriber->status !== self::STATUS_SUBSCRIBED) {
-        // auto subscribe when signup confirmation is disabled
-        if($signup_confirmation_enabled === true) {
-          $subscriber->set('status', self::STATUS_UNCONFIRMED);
-        } else {
-          $subscriber->set('status', self::STATUS_SUBSCRIBED);
-        }
-      }
+    if($subscriber->save()) {
+      // link subscriber to segments
+      SubscriberSegment::subscribeToSegments($subscriber, $segment_ids);
 
-      if($subscriber->save()) {
-        // link subscriber to segments
-        SubscriberSegment::subscribeToSegments($subscriber, $segment_ids);
+      // signup confirmation
+      $subscriber->sendConfirmationEmail();
 
-        // signup confirmation
-        if($subscriber->status !== self::STATUS_SUBSCRIBED) {
-          $subscriber->sendConfirmationEmail();
-        }
-
-        // welcome email
-        Scheduler::scheduleSubscriberWelcomeNotification(
-          $subscriber->id,
-          $segment_ids
-        );
-      }
+      // welcome email
+      Scheduler::scheduleSubscriberWelcomeNotification(
+        $subscriber->id,
+        $segment_ids
+      );
     }
 
     return $subscriber;
@@ -217,13 +218,13 @@ class Subscriber extends Model {
     $segments = Segment::orderByAsc('name')->findMany();
     $segment_list = array();
     $segment_list[] = array(
-      'label' => __('All Lists'),
+      'label' => __('All Lists', 'mailpoet'),
       'value' => ''
     );
 
     $subscribers_without_segment = self::filter('withoutSegments')->count();
     $subscribers_without_segment_label = sprintf(
-      __('Subscribers without a list (%s)'),
+      __('Subscribers without a list (%s)', 'mailpoet'),
       number_format($subscribers_without_segment)
     );
 
@@ -279,27 +280,27 @@ class Subscriber extends Model {
     return array(
       array(
         'name' => 'all',
-        'label' => __('All'),
+        'label' => __('All', 'mailpoet'),
         'count' => self::getPublished()->count()
       ),
       array(
         'name' => self::STATUS_SUBSCRIBED,
-        'label' => __('Subscribed'),
+        'label' => __('Subscribed', 'mailpoet'),
         'count' => self::filter(self::STATUS_SUBSCRIBED)->count()
       ),
       array(
         'name' => self::STATUS_UNCONFIRMED,
-        'label' => __('Unconfirmed'),
+        'label' => __('Unconfirmed', 'mailpoet'),
         'count' => self::filter(self::STATUS_UNCONFIRMED)->count()
       ),
       array(
         'name' => self::STATUS_UNSUBSCRIBED,
-        'label' => __('Unsubscribed'),
+        'label' => __('Unsubscribed', 'mailpoet'),
         'count' => self::filter(self::STATUS_UNSUBSCRIBED)->count()
       ),
       array(
         'name' => 'trash',
-        'label' => __('Trash'),
+        'label' => __('Trash', 'mailpoet'),
         'count' => self::getTrashed()->count()
       )
     );
@@ -537,7 +538,7 @@ class Subscriber extends Model {
 
     if($segment === false) return false;
 
-    $subscribers_count = parent::bulkAction($orm,
+    $count = parent::bulkAction($orm,
       function($subscriber_ids) use($segment) {
         SubscriberSegment::subscribeManyToSegments(
           $subscriber_ids, array($segment->id)
@@ -546,7 +547,7 @@ class Subscriber extends Model {
     );
 
     return array(
-      'subscribers' => $subscribers_count,
+      'count' => $count,
       'segment' => $segment->name
     );
   }
@@ -557,7 +558,7 @@ class Subscriber extends Model {
 
     if($segment === false) return false;
 
-    $subscribers_count = parent::bulkAction($orm,
+    $count = parent::bulkAction($orm,
       function($subscriber_ids) use($segment) {
         SubscriberSegment::deleteManySubscriptions($subscriber_ids);
         SubscriberSegment::subscribeManyToSegments(
@@ -567,7 +568,7 @@ class Subscriber extends Model {
     );
 
     return array(
-      'subscribers' => $subscribers_count,
+      'count' => $count,
       'segment' => $segment->name
     );
   }
@@ -578,7 +579,7 @@ class Subscriber extends Model {
 
     if($segment === false) return false;
 
-    $subscribers_count = $orm->count();
+    $count = $orm->count();
 
     parent::bulkAction($orm, function($subscriber_ids) use($segment) {
       SubscriberSegment::deleteManySubscriptions(
@@ -587,19 +588,21 @@ class Subscriber extends Model {
     });
 
     return array(
-      'subscribers' => $subscribers_count,
+      'count' => $count,
       'segment' => $segment->name
     );
   }
 
   static function bulkRemoveFromAllLists($orm, $data = array()) {
-    $subscribers_count = $orm->count();
+    $count = $orm->count();
 
     parent::bulkAction($orm, function($subscriber_ids) {
       SubscriberSegment::deleteManySubscriptions($subscriber_ids);
     });
 
-    return $subscribers_count;
+    return array(
+      'count' => $count
+    );
   }
 
   static function bulkSendConfirmationEmail($orm) {
@@ -614,13 +617,22 @@ class Subscriber extends Model {
           $emails_sent++;
         }
       }
-      return $emails_sent;
     }
-    return false;
+
+    return array(
+      'count' => $emails_sent
+    );
+  }
+
+  static function getTotalSubscribers() {
+    return self::whereIn('status', array(
+      self::STATUS_SUBSCRIBED,
+      self::STATUS_UNCONFIRMED
+    ))->count();
   }
 
   static function bulkTrash($orm) {
-    return parent::bulkAction($orm, function($subscriber_ids) {
+    $count = parent::bulkAction($orm, function($subscriber_ids) {
       self::rawExecute(join(' ', array(
           'UPDATE `'.self::$_table.'`',
           'SET `deleted_at` = NOW()',
@@ -632,10 +644,12 @@ class Subscriber extends Model {
         $subscriber_ids
       );
     });
+
+    return array('count' => $count);
   }
 
   static function bulkDelete($orm) {
-    return parent::bulkAction($orm, function($subscriber_ids) {
+    $count = parent::bulkAction($orm, function($subscriber_ids) {
       // delete all subscriber/segment relationships
       SubscriberSegment::deleteManySubscriptions($subscriber_ids);
 
@@ -644,6 +658,8 @@ class Subscriber extends Model {
         ->whereNull('wp_user_id')
         ->deleteMany();
     });
+
+    return array('count' => $count);
   }
 
   static function subscribed($orm) {

lib/Newsletter/Editor/PostContentManager.php

@@ -77,7 +77,7 @@ class PostContentManager {
     // remove embedded video and replace with links
     $content = preg_replace(
       '#<iframe.*?src=\"(.+?)\".*><\/iframe>#',
-      '<a href="$1">'.__('Click here to view media.').'</a>',
+      '<a href="$1">'.__('Click here to view media.', 'mailpoet').'</a>',
       $content
     );
 

lib/Newsletter/Scheduler/Scheduler.php

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

lib/Newsletter/Shortcodes/Categories/Link.php

@@ -24,7 +24,7 @@ class Link {
         return sprintf(
           '<a target="_blank" href="%s">%s</a>',
           $url,
-          __('Unsubscribe')
+          __('Unsubscribe', 'mailpoet')
         );
 
       case 'subscription_unsubscribe_url':
@@ -43,7 +43,7 @@ class Link {
         return sprintf(
           '<a target="_blank" href="%s">%s</a>',
           $url,
-          __('Manage subscription')
+          __('Manage subscription', 'mailpoet')
         );
 
       case 'subscription_manage_url':
@@ -60,7 +60,7 @@ class Link {
         return sprintf(
           '<a target="_blank" href="%s">%s</a>',
           $url,
-          __('View in your browser')
+          __('View in your browser', 'mailpoet')
         );
 
       case 'newsletter_view_in_browser_url':

lib/Newsletter/Shortcodes/Categories/Newsletter.php

@@ -1,9 +1,9 @@
 <?php
 namespace MailPoet\Newsletter\Shortcodes\Categories;
-
 use MailPoet\Models\SendingQueue;
 use MailPoet\Newsletter\Shortcodes\ShortcodesHelper;
 
+if(!defined('ABSPATH')) exit;
 require_once( ABSPATH . "wp-includes/pluggable.php" );
 
 class Newsletter {
@@ -54,4 +54,4 @@ class Newsletter {
       $posts->posts[0]->to_array() :
       false;
   }
-}
+}