MailPoet Newsletters (Previous) - Version 2.7.11

Version Description

  • 2017-07-17 =
  • Improved welcome and update pages
Download this release

Release Info

Developer wysija
Plugin Icon 128x128 MailPoet Newsletters (Previous)
Version 2.7.11
Comparing to
See all releases

Code changes from version 2.7.10 to 2.7.11

Files changed (15) hide show
  1. controllers/back/campaigns.php +37 -63
  2. core/base.php +1 -1
  3. helpers/back.php +3 -2
  4. helpers/mailer.php +1 -2
  5. index.php +1 -1
  6. languages/wysija-newsletters-bg_BG.mo +0 -0
  7. languages/wysija-newsletters-da_DK.mo +0 -0
  8. languages/wysija-newsletters-es_AR.mo +0 -0
  9. languages/wysija-newsletters-fa_IR.mo +0 -0
  10. languages/wysija-newsletters-ja.mo +0 -0
  11. languages/wysija-newsletters-nb_NO.mo +0 -0
  12. languages/wysija-newsletters-nl_NL.mo +0 -0
  13. languages/wysija-newsletters-pl_PL.mo +0 -0
  14. readme.txt +4 -1
  15. views/back/campaigns.php +59 -4
controllers/back/campaigns.php CHANGED
@@ -115,69 +115,43 @@ class WYSIJA_control_back_campaigns extends WYSIJA_control_back {
115
  $welcome_video_link = $video_language['en_EN'];
116
  }
117
 
118
- $this->data['sections'][] = array(
119
- 'title' => __('Stay up to date! Subscribe to our newsletters', WYSIJA) . '<span id="poll_result"></span>',
120
- 'format' => 'normal',
121
- 'paragraphs' => array('<div class="mpoet-update-subscribe" ><h4></h4><div class="mpoet-update-subscribe-left"> <p>'.__('We send a monthly newsletter with the following:',WYSIJA).'</p>' .
122
- '<ul>' .
123
- '<li>'.__('Important plugin updates',WYSIJA).'</li>' .
124
- '<li>'.__('Coupons',WYSIJA).'</li>' .
125
- '<li>'.__('Tips for you, or your customers',WYSIJA).'</li>' .
126
- '<li>'.__('What we’re working on',WYSIJA).'</li>' .
127
- '<li>'.__('News from us, the team',WYSIJA).'</li>' .
128
- '</ul>
129
- <p>View <a target="_blank" href="http://www.mailpoet.com/?wysija-page=1&controller=email&action=view&email_id=1181&wysijap=subscriptions-3">an example blog post email</a> and <a target="_blank" href="http://www.mailpoet.com/?wysija-page=1&controller=email&action=view&email_id=64&wysijap=subscriptions-2">an example newsletter</a>.</p>
130
- </div>' .
131
- '<div class="mpoet-update-subscribe-right">' .
132
-
133
- '<iframe width="380" scrolling="no" frameborder="0" src="http://www.mailpoet.com/?wysija-page=1&controller=subscribers&action=wysija_outter&wysija_form=5&external_site=1&wysijap=subscriptions-3" class="iframe-wysija" vspace="0" tabindex="0" style="position: static; top: 0pt; margin: 0px; border-style: none; height: 180px; left: 0pt; visibility: visible; background-color: #f1f1f1!important;" marginwidth="0" marginheight="0" hspace="0" allowtransparency="true" title="Subscription Wysija"></iframe>
134
- </div>
135
- <div style="clear:both;"></div>
136
-
137
- </div>',
138
- )
139
- );
140
-
141
- $this->data['sections'][]=array(
142
- 'title'=>__('First Time? See it in Action',WYSIJA),
143
- 'format'=>'normal',
144
- 'paragraphs'=>array(
145
- __('You can start by watching this video by one of our users.',WYSIJA),
146
- $welcome_video_link
147
- )
148
- );
149
-
150
- // Check if user is already sharing data, and hide the share link.
151
- if (!$model_config->getValue('analytics')) {
152
- $share_section = array(
153
- 'title' => __('Share your data', WYSIJA),
154
- 'content' => str_replace(
155
- array('[link]', '[/link]', '[ajaxlink]', '[/ajaxlink]'), array('<a title="Anonymous Data" target="_blank" href="http://support.mailpoet.com/knowledgebase/share-your-data/?utm_source=wpadmin&utm_campaign=welcome_page">', '</a>', '<a id="share_analytics" href="javascript:;">', '</a>'), __("We know too little about our users. We're looking for [link]anonymous data[/link] to build a better plugin. [ajaxlink]Yes, count me in![/ajaxlink]", WYSIJA))
156
- );
157
- } else {
158
- $share_section = array(
159
- 'title' => __('Share your data', WYSIJA),
160
- 'content' => str_replace(
161
- array('[link]', '[/link]'), array('<a title="Anonymous Data" target="_blank" href="http://support.mailpoet.com/knowledgebase/share-your-data/?utm_source=wpadmin&utm_campaign=welcome_page">', '</a>', '<a id="share_analytics" href="javascript:;">', '</a>'), __("We know too little about our users. We're looking for [link]anonymous data[/link] to build a better plugin. Thanks, you're already sharing!", WYSIJA))
162
- );
163
- }
164
-
165
- $this->data['sections'][] = array(
166
- 'title' => __('What You Can Do', WYSIJA),
167
- 'cols' => array(
168
- array(
169
- 'title' => __('5 minute newbie guide', WYSIJA),
170
- 'content' => __('Your MailPoet comes with an example newsletter. You\'ll see it when you close this welcome page. Edit it to start playing with it.', WYSIJA)
171
- ),
172
- $share_section,
173
- array(
174
- 'title' => __('Help yourself. Or let us help you.', WYSIJA),
175
- 'content' => str_replace(
176
- array('[link]', '[/link]'), array('<a href="http://support.mailpoet.com/" target="_blank" title="On our blog!">', '</a>'), __('We got documentation and a ticket system on [link]support.mailpoet.com[/link]. We answer within 24h.', WYSIJA))
177
- )
178
- ),
179
- 'format' => 'three-col',
180
- );
181
 
182
  $this->viewObj->skip_header = true;
183
 
115
  $welcome_video_link = $video_language['en_EN'];
116
  }
117
 
118
+ $this->data['sections'][] = array(
119
+ 'title' => __('A new and better MailPoet is coming this September', WYSIJA),
120
+ 'format' => 'title-content',
121
+ 'paragraphs' => array('
122
+ <iframe src="https://player.vimeo.com/video/223581490" width="640" height="360" frameborder="0" webkitallowfullscreen="" mozallowfullscreen="" allowfullscreen=""></iframe>
123
+ <ul style="list-style: disc inside none">
124
+ <li>'.__('MailPoet version 3 is completely rewritten', WYSIJA).'</li>
125
+ <li>'.__('New email designer', WYSIJA).'</li>
126
+ <li>'.__('Responsive templates', WYSIJA).'</li>
127
+ <li>'.__('Fast user interface', WYSIJA).'</li>
128
+ <li>'.__('Same easy configuration', WYSIJA).'</li>
129
+ <li>'.__('Weekly releases', WYSIJA).'</li>
130
+ <li>'.__('Version 2 and 3 can live side by side', WYSIJA).'</li>
131
+ <li><a href="http://beta.docs.mailpoet.com/article/189-comparison-of-mailpoet-2-and-3?utm_source=mp2&amp;utm_medium=welcomeupdate&amp;utm_campaign=comparison">'.__('Comparison table of both versions', WYSIJA).'</a></li>
132
+ <li>'.$this->viewObj->replace_link_shortcode(__('Try [link]the online demo[/link]', WYSIJA), 'http://demo3.mailpoet.com/launch/?utm_source=mp2&amp;utm_medium=updatewelcome&amp;utm_campaign=demo3').'</li>
133
+ <li>'.__('Multisite works, but not officially supported. Please test MailPoet 3 on a staging server', WYSIJA).'</li>
134
+ <li>'.__('Right-to-left languages works, but can be improved', WYSIJA).'</li>
135
+ <li>'.
136
+ $this->viewObj->replace_link_shortcode(
137
+ $this->viewObj->replace_link_shortcode(
138
+ __('Get in touch in the [link]forums[/link] for further help. Customers can reach via our [link]support page[/link]', WYSIJA),
139
+ 'https://wordpress.org/support/plugin/wysija-newsletters'
140
+ ),
141
+ 'https://www.mailpoet.com/support/'
142
+ ).'</li>
143
+ </ul>
144
+ <br>
145
+ <h3 style="font-size: 25px; color: #626262; font-weight: 600;"><strong>'.__('Comes with a 1-click migration tool:', WYSIJA).'</strong></h3>
146
+ <ul style="list-style: disc inside none">
147
+ <li>'.__('Your subscribers, lists, forms and settings will be migrated', WYSIJA).'</li>
148
+ <li>'.__('Automatic emails will not be migrated', WYSIJA).'</li>
149
+ <li>'.__('Archive of sent emails will not be migrated', WYSIJA).'</li>
150
+ <li>'.__('Your statistics will not be migrated', WYSIJA).'</li>
151
+ </ul>
152
+ <a class="button-primary" href="plugin-install.php?s=mailpoet&tab=search&type=author">'.__('Download MailPoet 3 now', WYSIJA).'</a>
153
+ ')
154
+ );
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
155
 
156
  $this->viewObj->skip_header = true;
157
 
core/base.php CHANGED
@@ -19,7 +19,7 @@ class WYSIJA_object{
19
  * Static variable holding core MailPoet's version
20
  * @var array
21
  */
22
- static $version = '2.7.10';
23
 
24
  function __construct(){}
25
 
19
  * Static variable holding core MailPoet's version
20
  * @var array
21
  */
22
+ static $version = '2.7.11';
23
 
24
  function __construct(){}
25
 
helpers/back.php CHANGED
@@ -343,10 +343,11 @@ class WYSIJA_help_back extends WYSIJA_help{
343
  $truelinkhelp .= '<p>'.__('MailPoet Version: ',WYSIJA).'<strong>'.WYSIJA::get_version().'</strong></p>';
344
 
345
  $this->menus=array(
346
- 'campaigns'=>array('title'=>'MailPoet'),
347
  'subscribers'=>array('title'=>__('Subscribers',WYSIJA)), // if the key "subscribers" is changed, please change in the filter "wysija_menus" as well.
348
  'config'=>array('title'=>__('Settings',WYSIJA)),
349
- 'premium'=>array('title'=>__('Premium',WYSIJA))
 
350
  );
351
  $this->menus = apply_filters('wysija_menus', $this->menus);
352
  $this->menuHelp = $truelinkhelp;
343
  $truelinkhelp .= '<p>'.__('MailPoet Version: ',WYSIJA).'<strong>'.WYSIJA::get_version().'</strong></p>';
344
 
345
  $this->menus=array(
346
+ 'campaigns'=>array('title'=>'MailPoet'. ' <span class="update-plugins"><span class="update-count">1</span></span>'),
347
  'subscribers'=>array('title'=>__('Subscribers',WYSIJA)), // if the key "subscribers" is changed, please change in the filter "wysija_menus" as well.
348
  'config'=>array('title'=>__('Settings',WYSIJA)),
349
+ 'premium'=>array('title'=>__('Premium',WYSIJA)),
350
+ 'mp3'=>array('title'=>__('Try MailPoet 3 Now!',WYSIJA))
351
  );
352
  $this->menus = apply_filters('wysija_menus', $this->menus);
353
  $this->menuHelp = $truelinkhelp;
helpers/mailer.php CHANGED
@@ -1001,10 +1001,9 @@ class WYSIJA_help_mailer extends PHPMailer {
1001
  }
1002
  }
1003
  }else{
1004
- //make sure that broken url don't fuck the reidrection up like a space before http://
1005
  $email_url=trim($email_url);
1006
  if($modelConf->getValue('urlstats_base64')){
1007
- $cururl=base64_encode($email_url);
1008
  }else{
1009
  $cururl=$email_url;
1010
  }
1001
  }
1002
  }
1003
  }else{
 
1004
  $email_url=trim($email_url);
1005
  if($modelConf->getValue('urlstats_base64')){
1006
+ $cururl=rtrim(base64_encode($email_url), '=');
1007
  }else{
1008
  $cururl=$email_url;
1009
  }
index.php CHANGED
@@ -3,7 +3,7 @@
3
  Plugin Name: MailPoet Newsletters
4
  Plugin URI: http://www.mailpoet.com/
5
  Description: Create and send newsletters or automated emails. Capture subscribers with a widget. Import and manage your lists. MailPoet is a sweet plugin maintained and supported with love.
6
- Version: 2.7.10
7
  Author: MailPoet
8
  Author URI: http://www.mailpoet.com/
9
  License: GPLv2 or later
3
  Plugin Name: MailPoet Newsletters
4
  Plugin URI: http://www.mailpoet.com/
5
  Description: Create and send newsletters or automated emails. Capture subscribers with a widget. Import and manage your lists. MailPoet is a sweet plugin maintained and supported with love.
6
+ Version: 2.7.11
7
  Author: MailPoet
8
  Author URI: http://www.mailpoet.com/
9
  License: GPLv2 or later
languages/wysija-newsletters-bg_BG.mo CHANGED
Binary file
languages/wysija-newsletters-da_DK.mo CHANGED
Binary file
languages/wysija-newsletters-es_AR.mo CHANGED
Binary file
languages/wysija-newsletters-fa_IR.mo CHANGED
Binary file
languages/wysija-newsletters-ja.mo CHANGED
Binary file
languages/wysija-newsletters-nb_NO.mo CHANGED
Binary file
languages/wysija-newsletters-nl_NL.mo CHANGED
Binary file
languages/wysija-newsletters-pl_PL.mo CHANGED
Binary file
readme.txt CHANGED
@@ -3,7 +3,7 @@ Contributors: wysija
3
  Tags: newsletter, newsletters, email newsletter, email subscription, newsletter signup, post notification, autoresponder, newsletter alert, auto newsletter, automatic post notification, email newsletters, email signup, auto post notifications, newsletter widget, newsletter builder, subscribe widget, signup widget, email subscription, newsletter plugin, widget, subscription, emailing, mailpoet, wysija, mandrill, sendgrid
4
  Requires at least: 3.5
5
  Tested up to: 4.7.4
6
- Stable tag: 2.7.10
7
  Send newsletters post notifications or autoresponders from WordPress easily, and beautifully. Start to capture subscribers with our widget now.
8
 
9
  == Description ==
@@ -132,6 +132,9 @@ Our [support site](http://support.mailpoet.com/) has plenty of articles and a ti
132
 
133
  == Changelog ==
134
 
 
 
 
135
  = 2.7.10 - 2017-04-20 =
136
  * Introduced minor changes to the premium page
137
 
3
  Tags: newsletter, newsletters, email newsletter, email subscription, newsletter signup, post notification, autoresponder, newsletter alert, auto newsletter, automatic post notification, email newsletters, email signup, auto post notifications, newsletter widget, newsletter builder, subscribe widget, signup widget, email subscription, newsletter plugin, widget, subscription, emailing, mailpoet, wysija, mandrill, sendgrid
4
  Requires at least: 3.5
5
  Tested up to: 4.7.4
6
+ Stable tag: 2.7.11
7
  Send newsletters post notifications or autoresponders from WordPress easily, and beautifully. Start to capture subscribers with our widget now.
8
 
9
  == Description ==
132
 
133
  == Changelog ==
134
 
135
+ = 2.7.11 - 2017-07-17 =
136
+ * Improved welcome and update pages
137
+
138
  = 2.7.10 - 2017-04-20 =
139
  * Introduced minor changes to the premium page
140
 
views/back/campaigns.php CHANGED
@@ -2817,9 +2817,9 @@ class WYSIJA_view_back_campaigns extends WYSIJA_view_back {
2817
  ?>
2818
  <div id="update-page" class="about-wrap mpoet-page">
2819
 
2820
- <h1><?php echo sprintf(__('Welcome to %1$s', WYSIJA), '<span class="version">MailPoet '.WYSIJA::get_version())."</span>"; ?></h1>
2821
 
2822
- <div class="about-text"><?php echo $data['abouttext'] ?></div>
2823
  <?php
2824
  foreach ($data['sections'] as $section) {
2825
 
@@ -2834,7 +2834,7 @@ class WYSIJA_view_back_campaigns extends WYSIJA_view_back {
2834
  <div class="changelog <?php echo $class_added ?>">
2835
  <h2><?php echo $section['title'] . $link_hide ?></h2>
2836
 
2837
- <div class="feature-section <?php echo $section['format'] ?>">
2838
  <?php
2839
  switch ($section['format']) {
2840
  case 'three-col':
@@ -2875,7 +2875,7 @@ class WYSIJA_view_back_campaigns extends WYSIJA_view_back {
2875
  }
2876
  ?>
2877
 
2878
- <a class="button-primary" href="admin.php?page=wysija_campaigns"><?php _e('Thanks! Now take me to MailPoet.', WYSIJA); ?></a>
2879
 
2880
  </div>
2881
 
@@ -2883,6 +2883,20 @@ class WYSIJA_view_back_campaigns extends WYSIJA_view_back {
2883
  <?php
2884
  }
2885
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
2886
  function whats_new($data) {
2887
 
2888
  $helper_readme = WYSIJA::get('readme', 'helper');
@@ -2910,6 +2924,7 @@ class WYSIJA_view_back_campaigns extends WYSIJA_view_back {
2910
  }else{
2911
  $data['abouttext'] = __('You updated! It\'s like having the next gadget, but better.', WYSIJA);
2912
  }
 
2913
 
2914
 
2915
  // this is a flag to have a pretty clean update page where teh only call to action is our survey
@@ -2918,6 +2933,44 @@ class WYSIJA_view_back_campaigns extends WYSIJA_view_back {
2918
  $is_multisite = is_multisite();
2919
  $is_network_admin = WYSIJA::current_user_can('manage_network');
2920
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
2921
 
2922
  if ($is_multisite) {
2923
  if ($is_network_admin) {
@@ -2955,6 +3008,7 @@ class WYSIJA_view_back_campaigns extends WYSIJA_view_back {
2955
 
2956
 
2957
  $msg = $model_config->getValue('ignore_msgs');
 
2958
  if ( !isset($msg['ctaupdate']) && $show_survey === false ) {
2959
  $data['sections'][] = array(
2960
  'title' => __('Keep this plugin essentially free', WYSIJA),
@@ -2971,6 +3025,7 @@ class WYSIJA_view_back_campaigns extends WYSIJA_view_back {
2971
  'format' => 'review-follow',
2972
  );
2973
  }
 
2974
 
2975
  /* if( $show_survey ){
2976
  $data['sections'][] = array(
2817
  ?>
2818
  <div id="update-page" class="about-wrap mpoet-page">
2819
 
2820
+ <h1><?php echo __('Try the new (and much better) MailPoet now', WYSIJA); ?></h1>
2821
 
2822
+ <div class="about-text" style="visibility:hidden"><?php echo $data['abouttext'] ?></div>
2823
  <?php
2824
  foreach ($data['sections'] as $section) {
2825
 
2834
  <div class="changelog <?php echo $class_added ?>">
2835
  <h2><?php echo $section['title'] . $link_hide ?></h2>
2836
 
2837
+ <div class="feature-sec tion <?php echo $section['format'] ?>">
2838
  <?php
2839
  switch ($section['format']) {
2840
  case 'three-col':
2875
  }
2876
  ?>
2877
 
2878
+ <a class="button-primary" href="admin.php?page=wysija_campaigns"><?php _e("No thanks! I'll use MailPoet version 2 for now", WYSIJA); ?></a>
2879
 
2880
  </div>
2881
 
2883
  <?php
2884
  }
2885
 
2886
+ public function replace_link_shortcode($text, $url) {
2887
+ $count = 1;
2888
+ return preg_replace(
2889
+ '/\[\/link\]/',
2890
+ '</a>',
2891
+ preg_replace(
2892
+ '/\[link\]/',
2893
+ sprintf('<a href="%s">', $url),
2894
+ $text,
2895
+ $count
2896
+ ),
2897
+ $count
2898
+ );
2899
+ }
2900
  function whats_new($data) {
2901
 
2902
  $helper_readme = WYSIJA::get('readme', 'helper');
2924
  }else{
2925
  $data['abouttext'] = __('You updated! It\'s like having the next gadget, but better.', WYSIJA);
2926
  }
2927
+ $data['abouttext'] = '';
2928
 
2929
 
2930
  // this is a flag to have a pretty clean update page where teh only call to action is our survey
2933
  $is_multisite = is_multisite();
2934
  $is_network_admin = WYSIJA::current_user_can('manage_network');
2935
 
2936
+ $data['sections'][] = array(
2937
+ 'title' => __('A new and better MailPoet is coming this September', WYSIJA),
2938
+ 'format' => 'title-content',
2939
+ 'content' => '
2940
+ <iframe src="https://player.vimeo.com/video/223581490" width="640" height="360" frameborder="0" webkitallowfullscreen="" mozallowfullscreen="" allowfullscreen=""></iframe>
2941
+ <ul><li>'.__('MailPoet version 3 is completely rewritten', WYSIJA).'</li>
2942
+ <li>'.__('New email designer', WYSIJA).'</li>
2943
+ <li>'.__('Responsive templates', WYSIJA).'</li>
2944
+ <li>'.__('Fast user interface', WYSIJA).'</li>
2945
+ <li>'.__('Same easy configuration', WYSIJA).'</li>
2946
+ <li>'.__('Weekly releases', WYSIJA).'</li>
2947
+ <li>'.__('Version 2 and 3 can live side by side', WYSIJA).'</li>
2948
+ <li><a href="http://beta.docs.mailpoet.com/article/189-comparison-of-mailpoet-2-and-3?utm_source=mp2&amp;utm_medium=welcomeupdate&amp;utm_campaign=comparison">'.__('Comparison table of both versions', WYSIJA).'</a></li>
2949
+ <li>'.$this->replace_link_shortcode(__('Try [link]the online demo[/link]', WYSIJA), 'http://demo3.mailpoet.com/launch/?utm_source=mp2&amp;utm_medium=updatewelcome&amp;utm_campaign=demo3').'</li>
2950
+ <li>'.__('Multisite works, but not officially supported. Please test MailPoet 3 on a staging server', WYSIJA).'</li>
2951
+ <li>'.__('Right-to-left languages works, but can be improved', WYSIJA).'</li>
2952
+ <li>'.
2953
+ $this->replace_link_shortcode(
2954
+ $this->replace_link_shortcode(
2955
+ __('Get in touch in the [link]forums[/link] for further help. Customers can reach via our [link]support page[/link]', WYSIJA),
2956
+ 'https://wordpress.org/support/plugin/wysija-newsletters'
2957
+ ),
2958
+ 'https://www.mailpoet.com/support/'
2959
+ ).'</li>
2960
+ </ul>
2961
+ <br>
2962
+ <h3><strong>'.__('Comes with a 1-click migration tool:', WYSIJA).'</strong></h3>
2963
+ <ul>
2964
+ <li>'.__('Your subscribers, lists, forms and settings will be migrated', WYSIJA).'</li>
2965
+ <li>'.__('Automatic emails will not be migrated', WYSIJA).'</li>
2966
+ <li>'.__('Archive of sent emails will not be migrated', WYSIJA).'</li>
2967
+ <li>'.__('Your statistics will not be migrated', WYSIJA).'</li>
2968
+
2969
+
2970
+ </ul>
2971
+ <a class="button-primary" href="plugin-install.php?s=mailpoet&tab=search&type=author">'.__('Download MailPoet 3 now', WYSIJA).'</a>
2972
+ '
2973
+ );
2974
 
2975
  if ($is_multisite) {
2976
  if ($is_network_admin) {
3008
 
3009
 
3010
  $msg = $model_config->getValue('ignore_msgs');
3011
+ /*
3012
  if ( !isset($msg['ctaupdate']) && $show_survey === false ) {
3013
  $data['sections'][] = array(
3014
  'title' => __('Keep this plugin essentially free', WYSIJA),
3025
  'format' => 'review-follow',
3026
  );
3027
  }
3028
+ */
3029
 
3030
  /* if( $show_survey ){
3031
  $data['sections'][] = array(