MailPoet Newsletters (Previous) - Version 2.6.14

Version Description

  • 2014-11-26 =
  • Fixed all of the RTL issues on delivered newsletters and their web version
  • Fixed issue when importing subscribers with new custom fields
  • Fixed duplicated Monthly post notifications issue
  • Fixed View in Browser version deactivation
  • Removed option to switch to Beta
Download this release

Release Info

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

Code changes from version 2.6.13 to 2.6.14

Files changed (44) hide show
  1. classes/WJ_Import.php +1 -1
  2. controllers/back.php +9 -4
  3. controllers/back/campaigns.php +12 -6
  4. core/base.php +1 -1
  5. css/admin-campaigns.css +1 -1
  6. css/admin-config.css +1 -1
  7. css/admin.css +1 -1
  8. css/rtl.css +1 -1
  9. helpers/autonews.php +31 -10
  10. helpers/back.php +6 -38
  11. helpers/licence.php +9 -6
  12. helpers/wj_engine.php +27 -19
  13. index.php +1 -1
  14. js/admin-campaigns-welcome_new.js +1 -1
  15. js/admin-wysija.js +1 -1
  16. languages/wysija-newsletters-ar.mo +0 -0
  17. languages/wysija-newsletters-ca.mo +0 -0
  18. languages/wysija-newsletters-cs_CZ.mo +0 -0
  19. languages/wysija-newsletters-el.mo +0 -0
  20. languages/wysija-newsletters-es_419.mo +0 -0
  21. languages/wysija-newsletters-es_ES.mo +0 -0
  22. languages/wysija-newsletters-fa_IR.mo +0 -0
  23. languages/wysija-newsletters-fr_FR.mo +0 -0
  24. languages/wysija-newsletters-hu_HU.mo +0 -0
  25. languages/wysija-newsletters-it_IT.mo +0 -0
  26. languages/wysija-newsletters-ja.mo +0 -0
  27. languages/wysija-newsletters-lt_LT.mo +0 -0
  28. languages/wysija-newsletters-lv.mo +0 -0
  29. languages/wysija-newsletters-nl_NL.mo +0 -0
  30. languages/wysija-newsletters-pt_PT.mo +0 -0
  31. languages/wysija-newsletters-ro_RO.mo +0 -0
  32. languages/wysija-newsletters-ru_RU.mo +0 -0
  33. languages/wysija-newsletters-sk_SK.mo +0 -0
  34. languages/wysija-newsletters-sq.mo +0 -0
  35. languages/wysija-newsletters-sv_SE.mo +0 -0
  36. models/config.php +17 -9
  37. models/user_history.php +1 -1
  38. readme.txt +12 -7
  39. tools/templates/newsletter/email/block_content.html +1 -1
  40. tools/templates/newsletter/email/css.html +6 -3
  41. tools/templates/newsletter/email/email_template.html +5 -5
  42. views/back/campaigns.php +47 -43
  43. views/back/config.php +1 -41
  44. views/back/subscribers.php +1 -1
classes/WJ_Import.php CHANGED
@@ -113,7 +113,7 @@ class WJ_Import extends WYSIJA_object {
113
  // we're going through all of the selected value in each dropdown when importing
114
  foreach($this->_match as $csv_column_number => $column_in_user_table){
115
 
116
- if (!is_string($column_in_user_table) OR preg_match('|[^a-z0-9#_.-]|i',$column_in_user_table) !== 0 ){
117
  continue;
118
  }
119
  // Reduce matching twice the same column
113
  // we're going through all of the selected value in each dropdown when importing
114
  foreach($this->_match as $csv_column_number => $column_in_user_table){
115
 
116
+ if (!is_string($column_in_user_table) OR preg_match('|[^a-z0-9#_\|.-]|i',$column_in_user_table) !== 0 ){
117
  continue;
118
  }
119
  // Reduce matching twice the same column
controllers/back.php CHANGED
@@ -263,7 +263,10 @@ class WYSIJA_control_back extends WYSIJA_control{
263
 
264
  if(defined('WYSIJA_REDIRECT')) $this->redirectProcess();
265
 
266
- $this->checkTotalSubscribers();
 
 
 
267
  }
268
 
269
  function checkTotalSubscribers(){
@@ -337,11 +340,13 @@ class WYSIJA_control_back extends WYSIJA_control{
337
 
338
  if((int)$totalSubscribers>1900){
339
  if((int)$totalSubscribers>2000){
 
340
  $url_checkout = $helper_licence->get_url_checkout('over200');
341
  $this->error(str_replace(array('[link]','[/link]'),
342
- array('<a title="'.__('Get Premium now',WYSIJA).'" target="_blank" href="'.$url_checkout.'">','</a>'),
343
- sprintf(__('Yikes. You\'re over the limit of 2000 subscribers for the free version of MailPoet (%1$s in total). Sending is disabled now. Please upgrade your version to [link]premium[/link] to send without limits.',WYSIJA)
344
- ,$totalSubscribers)),true);
 
345
  }else{
346
  $url_checkout = $helper_licence->get_url_checkout('near200');
347
  $this->notice(str_replace(array('[link]','[/link]'),
263
 
264
  if(defined('WYSIJA_REDIRECT')) $this->redirectProcess();
265
 
266
+ if( !empty( $_REQUEST['page'] ) && $_REQUEST['page'] !== 'wysija_premium'){
267
+ $this->checkTotalSubscribers();
268
+ }
269
+
270
  }
271
 
272
  function checkTotalSubscribers(){
340
 
341
  if((int)$totalSubscribers>1900){
342
  if((int)$totalSubscribers>2000){
343
+
344
  $url_checkout = $helper_licence->get_url_checkout('over200');
345
  $this->error(str_replace(array('[link]','[/link]'),
346
+ array('<a title="'.__('Get Premium now',WYSIJA).'" target="_blank" href="'.$url_checkout.'">','</a>'),
347
+ sprintf(__('Yikes. You\'re over the limit of 2000 subscribers for the free version of MailPoet (%1$s in total). Sending is disabled now. Please upgrade your version to [link]premium[/link] to send without limits.',WYSIJA)
348
+ ,$totalSubscribers)),true);
349
+
350
  }else{
351
  $url_checkout = $helper_licence->get_url_checkout('near200');
352
  $this->notice(str_replace(array('[link]','[/link]'),
controllers/back/campaigns.php CHANGED
@@ -210,15 +210,21 @@ class WYSIJA_control_back_campaigns extends WYSIJA_control_back {
210
  $dt = get_option('wysijey');
211
 
212
  if (isset($_REQUEST['xtz']) && $dt === $_REQUEST['xtz']) {
213
- $dataconf = array('premium_key' => base64_encode(get_option('home') . time()), 'premium_val' => time());
 
 
 
 
214
  $this->notice(__('Premium version is valid for your site.', WYSIJA));
215
  } else {
216
  $dataconf = array('premium_key' => '', 'premium_val' => '');
 
 
 
 
 
 
217
 
218
- $helper_licence = WYSIJA::get('licence', 'helper');
219
- $url_premium = 'http://www.mailpoet.com/checkout/?wysijadomain=' . $dt . '&nc=1&utm_source=wpadmin&utm_campaign=error_licence_activation';
220
-
221
- $this->error(str_replace(array('[link]', '[/link]'), array('<a href="' . $url_premium . '" target="_blank">', '</a>'), __('Premium licence does not exist for your site. Purchase it [link]here[/link].', WYSIJA)), 1);
222
  }
223
  WYSIJA::update_option('wysicheck', false);
224
  $modelConf = WYSIJA::get('config', 'model');
@@ -1593,7 +1599,7 @@ class WYSIJA_control_back_campaigns extends WYSIJA_control_back {
1593
  if ($this->filters){
1594
  $this->modelObj->setConditions($this->filters);
1595
  }
1596
-
1597
 
1598
  // Count emails by status and type
1599
  $emails_by_status = $this->count_emails_by_status();
210
  $dt = get_option('wysijey');
211
 
212
  if (isset($_REQUEST['xtz']) && $dt === $_REQUEST['xtz']) {
213
+ $dataconf = array(
214
+ 'premium_key' => base64_encode(get_option('home') . time()),
215
+ 'premium_val' => time(),
216
+ 'premium_expire_at' => (int)$_REQUEST['expire_at']
217
+ );
218
  $this->notice(__('Premium version is valid for your site.', WYSIJA));
219
  } else {
220
  $dataconf = array('premium_key' => '', 'premium_val' => '');
221
+ if(!empty($_REQUEST['expire_at'])){
222
+ $dataconf['premium_expire_at'] = (int)$_REQUEST['expire_at'];
223
+ }else{
224
+ $url_premium = 'http://www.mailpoet.com/checkout/?wysijadomain=' . $dt . '&nc=1&utm_source=wpadmin&utm_campaign=error_licence_activation';
225
+ $this->error(str_replace(array('[link]', '[/link]'), array('<a href="' . $url_premium . '" target="_blank">', '</a>'), __('Premium licence does not exist for your site. Purchase it [link]here[/link].', WYSIJA)), 1);
226
+ }
227
 
 
 
 
 
228
  }
229
  WYSIJA::update_option('wysicheck', false);
230
  $modelConf = WYSIJA::get('config', 'model');
1599
  if ($this->filters){
1600
  $this->modelObj->setConditions($this->filters);
1601
  }
1602
+
1603
 
1604
  // Count emails by status and type
1605
  $emails_by_status = $this->count_emails_by_status();
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.6.13';
23
 
24
  function WYSIJA_object(){
25
 
19
  * Static variable holding core MailPoet's version
20
  * @var array
21
  */
22
+ static $version = '2.6.14';
23
 
24
  function WYSIJA_object(){
25
 
css/admin-campaigns.css CHANGED
@@ -1 +1 @@
1
- #wysija-app{padding-top:10px}.icon32{margin-top:0px !important}#posts-filter{clear:both}#wysija-app h2{display:inline}#icon-edit-news{background:url(../img/mail-big.png) no-repeat scroll 0 5px transparent}#TB_window{display:block}.moredetails{display:none}.sending,.scheduled{background-color:#d5f0e6}.autonl.sending{background-color:#D7E6F2}#wysija-campaign .listmissing{background-color:#EFD5D5}#preview-receiver{width:230px;vertical-align:middle;margin:0 5px 0 0}.ml-submit{margin:15px 15px 0 15px}.automatic-nl{display:none}#titlediv .titlebox{font-size:1.7em;background-color:#FFFFFF;border-color:#CCCCCC;line-height:100%;outline:medium none;padding:3px 8px;width:100%}label .description{cursor:auto}.about-wrap .feature-section.three-col div{float:left;width:28%}#socials-block div{float:none;margin:5px 5px 2px 0;width:100%}.progress_bar{padding-bottom:10px}.progress_bar .bar{display:block;width:100%;height:22px;float:left;margin-right:10px;background:#eef6fc;border:1px solid #bbbbbb;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;line-height:22px;position:relative}.progress_bar .progress{display:block;background:#69b1e9;height:100%}.progress_bar .percent{height:100%;position:absolute;top:0px;left:10px}#wysija-badge{position:absolute;top:0;right:0;color:#fff;text-shadow:0 1px 0 rgba(0,0,0,0.3);padding-top:91px;height:50px;width:173px;font-weight:bold;font-size:14px;text-align:center;margin:0 -5px;background:url("http://s-plugins.wordpress.org/wysija-newsletters/assets/wysija-badge.png") no-repeat}#review-follow{position:relative;height:177px}#review-follow div{float:left;top:0}#review-follow .review-left{background:url("http://s-plugins.wordpress.org/wysija-newsletters/assets/update_page/save-the-kitten.jpg") no-repeat;height:175px;background-color:#f8f8f8;border-top:1px solid #efefef;border-bottom:1px solid #efefef;padding-right:10px}#review-follow h4{margin:0 !important}#review-follow .review-left.small{width:450px}#review-follow .review-left.medium{width:490px}#review-follow .review-left.large{width:540px}#review-follow .small .description{margin-top:24px}#review-follow .medium .description{margin-top:20px}#review-follow .large .description{margin-top:18px}#review-follow .review-left p{margin-left:20px}#review-follow .review-right{background:url("http://s-plugins.wordpress.org/wysija-newsletters/assets/update_page/arrow_middle.jpg") no-repeat scroll -30px 0 #f8f8f8;border-bottom:1px solid #EFEFEF;border-top:1px solid #EFEFEF;height:175px;width:24px}#review-follow #mailpoet-subscribe{margin-left:0px;margin-top:10px}#review-follow .subscribe-middle{width:220px;height:175px;background-color:#f8f8f8;border-top:1px solid #efefef;border-bottom:1px solid #efefef}#review-follow .socials{margin-left:30px}#review-follow .follow-left{width:220px;height:175px;background-color:#f8f8f8;border-top:1px solid #efefef;border-bottom:1px solid #efefef}#review-follow .follow-right{background:url("http://s-plugins.wordpress.org/wysija-newsletters/assets/update_page/arrow_right.jpg") no-repeat;width:100px;height:175px}#review-follow .follow-right38{background:url("http://s-plugins.wordpress.org/wysija-newsletters/assets/update_page/arrow-right-38.jpg") no-repeat;width:100px;height:175px}#review-follow .review-left .description{margin-left:146px}#review-follow .link-cat-review{height:140px;left:20px;position:absolute;top:21px;width:120px;outline:medium none}a.ctaupdate,span.ctaupdate{font-size:12px}.pds-links,.pds-totalvotes-outer{display:none !important}#polldaddy_embed_0{width:680px;margin-left:-30px}span.local_time{margin-left:10px}#hook_newsletter_top .hook-column{width:50%}.card-title{font-weight:bold}.report-card{padding-top:10px}.googletrackingcode .action_buttons{padding-left:44px;padding-top:5px}.googletrackingcode span{font-weight:bold}.mpoet-page h1{font-size:34px}.mpoet-page h1,.mpoet-page h2,.mpoet-page h3,.mpoet-page h4{color:#626262;font-weight:bold}.mpoet-page h1 span.version{color:#5e869b}.mpoet-update-subscribe p{font-size:12px}.mpoet-update-subscribe li{font-size:12px;line-height:10px}.mpoet-update-subscribe-left,.mpoet-update-subscribe-right{float:left}.mpoet-update-subscribe-left{margin-right:50px}.about-wrap .feature-section .mpoet-update-subscribe-left p{margin-top:0;margin-bottom:5px}.about-wrap .feature-section .mpoet-update-subscribe-left ul{margin-top:5px;margin-bottom:5px}#update-page{margin-top:0px}
1
+ #wysija-app{padding-top:10px}.icon32{margin-top:0px !important}#posts-filter{clear:both}#wysija-app h2{display:inline}#icon-edit-news{background:url(../img/mail-big.png) no-repeat scroll 0 5px transparent}#TB_window{display:block}.moredetails{display:none}.sending,.scheduled{background-color:#d5f0e6}.autonl.sending{background-color:#D7E6F2}#wysija-campaign .listmissing{background-color:#EFD5D5}#preview-receiver{width:230px;vertical-align:middle;margin:0 5px 0 0}.ml-submit{margin:15px 15px 0 15px}.automatic-nl{display:none}#titlediv .titlebox{font-size:1.7em;background-color:#FFFFFF;border-color:#CCCCCC;line-height:100%;outline:medium none;padding:3px 8px;width:100%}label .description{cursor:auto}.about-wrap .feature-section.three-col div{float:left;width:28%}#socials-block div{float:none;margin:5px 5px 2px 0;width:100%}.progress_bar{padding-bottom:10px}.progress_bar .bar{display:block;width:100%;height:22px;float:left;margin-right:10px;background:#eef6fc;border:1px solid #bbbbbb;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;line-height:22px;position:relative}.progress_bar .progress{display:block;background:#69b1e9;height:100%}.progress_bar .percent{height:100%;position:absolute;top:0px;left:10px}#wysija-badge{position:absolute;top:0;right:0;color:#fff;text-shadow:0 1px 0 rgba(0,0,0,0.3);padding-top:91px;height:50px;width:173px;font-weight:bold;font-size:14px;text-align:center;margin:0 -5px;background:url("http://s-plugins.wordpress.org/wysija-newsletters/assets/wysija-badge.png") no-repeat}#review-follow{position:relative;height:177px}#review-follow div{float:left;top:0}#review-follow .review-left{background:url("http://s-plugins.wordpress.org/wysija-newsletters/assets/update_page/save-the-kitten.jpg") no-repeat;height:175px;background-color:#f8f8f8;border-top:1px solid #efefef;border-bottom:1px solid #efefef;padding-right:10px}#review-follow h4{margin:0 !important}#review-follow .review-left.small{width:450px}#review-follow .review-left.medium{width:490px}#review-follow .review-left.large{width:540px}#review-follow .small .description{margin-top:24px}#review-follow .medium .description{margin-top:20px}#review-follow .large .description{margin-top:18px}#review-follow .review-left p{margin-left:20px}#review-follow .review-right{background:url("http://s-plugins.wordpress.org/wysija-newsletters/assets/update_page/arrow_middle.jpg") no-repeat scroll -30px 0 #f8f8f8;border-bottom:1px solid #EFEFEF;border-top:1px solid #EFEFEF;height:175px;width:24px}#review-follow #mailpoet-subscribe{margin-left:0px;margin-top:10px}#review-follow .subscribe-middle{width:220px;height:175px;background-color:#f8f8f8;border-top:1px solid #efefef;border-bottom:1px solid #efefef}#review-follow .socials{margin-left:30px}#review-follow .follow-left{width:220px;height:175px;background-color:#f8f8f8;border-top:1px solid #efefef;border-bottom:1px solid #efefef}#review-follow .follow-right{background:url("http://s-plugins.wordpress.org/wysija-newsletters/assets/update_page/arrow_right.jpg") no-repeat;width:100px;height:175px}#review-follow .follow-right38{background:url("http://s-plugins.wordpress.org/wysija-newsletters/assets/update_page/arrow-right-38.jpg") no-repeat;width:100px;height:175px}#review-follow .review-left .description{margin-left:146px}#review-follow .link-cat-review{height:140px;left:20px;position:absolute;top:21px;width:120px;outline:medium none}a.ctaupdate,span.ctaupdate{font-size:12px}.pds-links,.pds-totalvotes-outer{display:none !important}#polldaddy_embed_0{width:680px;margin-left:-30px}span.local_time{margin-left:10px}#hook_newsletter_top .hook-column{width:50%}.card-title{font-weight:bold}.report-card{padding-top:10px}.googletrackingcode .action_buttons{padding-left:44px;padding-top:5px}.googletrackingcode span{font-weight:bold}.mpoet-page h1{font-size:34px}.mpoet-page h1,.mpoet-page h2,.mpoet-page h3,.mpoet-page h4{color:#626262;font-weight:bold}.mpoet-page h1 span.version{color:#5e869b}.mpoet-update-subscribe p{font-size:12px}.mpoet-update-subscribe li{font-size:12px;line-height:10px}.mpoet-update-subscribe-left,.mpoet-update-subscribe-right{float:left}.mpoet-update-subscribe-left{margin-right:50px}.about-wrap .feature-section .mpoet-update-subscribe-left p{margin-top:0;margin-bottom:5px}.about-wrap .feature-section .mpoet-update-subscribe-left ul{margin-top:5px;margin-bottom:5px}#update-page{margin-top:0px}.mp_php_alert{margin:5px 0 15px;background-color:#fff;border-left:4px solid #7ad03a;box-shadow:0 1px 1px 0 rgba(0,0,0,0.1);padding:1px 12px;outline:0 none}
css/admin-config.css CHANGED
@@ -1 +1 @@
1
- tr.title_row>td{padding-left:0}#wysija-tabs a{font-size:14px}#wysija-tabs a:focus{outline:0 none}#wysija-settings .premium_activated{color:#0074A2;font-size:1.2em;padding:15px 0 20px 0}#wysija-settings .premium_activated i{font-size:1.5em;margin:0 6px 3px 0;vertical-align:bottom}p.submit{padding:1em 1.4em 1em 0}span.title{font-size:16px;margin:0;color:#000}.mailpoet-frequency_inner_texting{padding:0 10px}.mailpoet-frequency_warning{margin-top:10px}#wysija-settings input[type="checkbox"],#wysija-settings input[type="radio"]{margin-right:6px;vertical-align:baseline}#wysija-settings label input[type="checkbox"],#cron_page_hit_trigger-1{margin-left:0}#wysija-settings .button-secondary{margin-left:6px}#wysija-settings .form-table th{width:300px}#wysija-settings .form-table th.row{border:1px solid #AAAAAA}#warning-msg-frequency{background-color:#FFFFE0;border-color:#E6DB55}#warning-msg-frequency{border-radius:3px 3px 3px 3px;border-style:solid;border-width:1px;margin:5px 15px 2px;padding:0 0.6em}#warning-msg-frequency ul{margin:0}#wysija-settings .form-table th.rolestitle{padding:10px 0 10px 10px;text-align:left;vertical-align:middle;width:220px}#wysija-settings .form-table th.rolestable{padding:3px;text-align:center;vertical-align:middle;width:110px;word-wrap:break-word}#wysija-settings .form-table td.rolestable{padding:6px 0;text-align:center}#wysija-settings .form-table td.title{padding:10px 0 10px 10px;text-align:left;vertical-align:middle}#wysija-settings .form-table td.title p{margin:0}#wysija-settings .form-table td{vertical-align:top}#wysija-settings #bounce .intro{margin:10px 0 20px 10px}#wysija-settings #bounce #bounce-process-auto,#wysija-settings #bounce #bounce-connector{margin-left:0 !important}#wysija-settings #sendingmethod .methods{border-bottom:1px solid #000}#wysija-settings #sendingmethod .choice-sending-method-site{border-top:1px solid #cccccc}#wysija-settings #sendingmethod .choice-sending-method-site th,#wysija-settings #sendingmethod .choice-sending-method-site td{padding-top:18px}label.dkim{margin-right:20px}.cronleft,.cronright{float:left}.cronleft{width:20px;margin-right:10px}#cron_manual_linkname p{margin:0}.labelcheck{float:left;margin-right:15px}.checkbox_optin_label{margin:6px 6px 0 0;float:left}.checkbox_optin_value{float:left;width:500px}#smtp-rest-label{display:none;margin-left:10px}#wysija-settings #multisite #form-ms-config th{width:455px}#wysija-settings #multisite #ms-sendingmethod th{width:300px}#wysija-settings #multisite .intro{margin:0 0 0 10px}#wysija-settings #sendingmethod .methods input,#wysija-settings #multisite .methods input{margin:0 5px 0 0;float:left}#wysija-settings #sendingmethod .methods h3,#wysija-settings #multisite .methods p.title{float:left;margin:0 !important}#wysija-settings #multisite .choice-one-for-all{display:none}#wysija-settings a.view_all{font-style:italic}#wysija-settings .cronright label{display:block;margin-bottom:10px}#wysija-settings .cronright label span{margin-left:36px}#wysija-settings .capabilities_form{width:400px}span.icon{display:block;height:20px;width:20px;cursor:pointer}.geeky-option a,.geeky-option span{float:left}.show-more-geeky-options span{background:url(../img/controls/icons.png) no-repeat -200px 0}.show-more-geeky-options:hover span{background:url(../img/controls/icons.png) no-repeat -200px -20px}.hide-geeky-options span{background:url(../img/controls/icons.png) no-repeat -220px 0}.hide-geeky-options:hover span{background:url(../img/controls/icons.png) no-repeat -220px -20px}@-webkit-keyframes opacity{0%{opacity:1}100%{opacity:0}}@-moz-keyframes opacity{0%{opacity:1}100%{opacity:0}}.wysija-button-loading{text-align:center;margin:100px 0 0 0}.wysija-button-loading span{-webkit-animation-name:opacity;-webkit-animation-duration:1s;-webkit-animation-iteration-count:infinite;-moz-animation-name:opacity;-moz-animation-duration:1s;-moz-animation-iteration-count:infinite}.wysija-button-loading span:nth-child(2){-webkit-animation-delay:100ms;-moz-animation-delay:100ms}.wysija-button-loading span:nth-child(3){-webkit-animation-delay:300ms;-moz-animation-delay:300ms}.links-page{display:none;margin-left:10px}.new_form{margin:16px 0}.new_form a{font-size:16px !important}
1
+ tr.title_row>td{padding-left:0}#wysija-tabs a{font-size:14px}#wysija-tabs a:focus{outline:0 none}#wysija-settings .premium_activated{color:#0074A2;font-size:1.2em;padding:15px 0 20px 0}#wysija-settings .premium_activated i{font-size:1.5em;margin:0 6px 3px 0;vertical-align:bottom}#wysija-settings .premium_activated .expiring_at{color:#666;font-size:12px}p.submit{padding:1em 1.4em 1em 0}span.title{font-size:16px;margin:0;color:#000}.mailpoet-frequency_inner_texting{padding:0 10px}.mailpoet-frequency_warning{margin-top:10px}#wysija-settings input[type="checkbox"],#wysija-settings input[type="radio"]{margin-right:6px;vertical-align:baseline}#wysija-settings label input[type="checkbox"],#cron_page_hit_trigger-1{margin-left:0}#wysija-settings .button-secondary{margin-left:6px}#wysija-settings .form-table th{width:300px}#wysija-settings .form-table th.row{border:1px solid #AAAAAA}#warning-msg-frequency{background-color:#FFFFE0;border-color:#E6DB55}#warning-msg-frequency{border-radius:3px 3px 3px 3px;border-style:solid;border-width:1px;margin:5px 15px 2px;padding:0 0.6em}#warning-msg-frequency ul{margin:0}#wysija-settings .form-table th.rolestitle{padding:10px 0 10px 10px;text-align:left;vertical-align:middle;width:220px}#wysija-settings .form-table th.rolestable{padding:3px;text-align:center;vertical-align:middle;width:110px;word-wrap:break-word}#wysija-settings .form-table td.rolestable{padding:6px 0;text-align:center}#wysija-settings .form-table td.title{padding:10px 0 10px 10px;text-align:left;vertical-align:middle}#wysija-settings .form-table td.title p{margin:0}#wysija-settings .form-table td{vertical-align:top}#wysija-settings #bounce .intro{margin:10px 0 20px 10px}#wysija-settings #bounce #bounce-process-auto,#wysija-settings #bounce #bounce-connector{margin-left:0 !important}#wysija-settings #sendingmethod .methods{border-bottom:1px solid #000}#wysija-settings #sendingmethod .choice-sending-method-site{border-top:1px solid #cccccc}#wysija-settings #sendingmethod .choice-sending-method-site th,#wysija-settings #sendingmethod .choice-sending-method-site td{padding-top:18px}label.dkim{margin-right:20px}.cronleft,.cronright{float:left}.cronleft{width:20px;margin-right:10px}#cron_manual_linkname p{margin:0}.labelcheck{float:left;margin-right:15px}.checkbox_optin_label{margin:6px 6px 0 0;float:left}.checkbox_optin_value{float:left;width:500px}#smtp-rest-label{display:none;margin-left:10px}#wysija-settings #multisite #form-ms-config th{width:455px}#wysija-settings #multisite #ms-sendingmethod th{width:300px}#wysija-settings #multisite .intro{margin:0 0 0 10px}#wysija-settings #sendingmethod .methods input,#wysija-settings #multisite .methods input{margin:0 5px 0 0;float:left}#wysija-settings #sendingmethod .methods h3,#wysija-settings #multisite .methods p.title{float:left;margin:0 !important}#wysija-settings #multisite .choice-one-for-all{display:none}#wysija-settings a.view_all{font-style:italic}#wysija-settings .cronright label{display:block;margin-bottom:10px}#wysija-settings .cronright label span{margin-left:36px}#wysija-settings .capabilities_form{width:400px}span.icon{display:block;height:20px;width:20px;cursor:pointer}.geeky-option a,.geeky-option span{float:left}.show-more-geeky-options span{background:url(../img/controls/icons.png) no-repeat -200px 0}.show-more-geeky-options:hover span{background:url(../img/controls/icons.png) no-repeat -200px -20px}.hide-geeky-options span{background:url(../img/controls/icons.png) no-repeat -220px 0}.hide-geeky-options:hover span{background:url(../img/controls/icons.png) no-repeat -220px -20px}@-webkit-keyframes opacity{0%{opacity:1}100%{opacity:0}}@-moz-keyframes opacity{0%{opacity:1}100%{opacity:0}}.wysija-button-loading{text-align:center;margin:100px 0 0 0}.wysija-button-loading span{-webkit-animation-name:opacity;-webkit-animation-duration:1s;-webkit-animation-iteration-count:infinite;-moz-animation-name:opacity;-moz-animation-duration:1s;-moz-animation-iteration-count:infinite}.wysija-button-loading span:nth-child(2){-webkit-animation-delay:100ms;-moz-animation-delay:100ms}.wysija-button-loading span:nth-child(3){-webkit-animation-delay:300ms;-moz-animation-delay:300ms}.links-page{display:none;margin-left:10px}.new_form{margin:16px 0}.new_form a{font-size:16px !important}
css/admin.css CHANGED
@@ -1 +1 @@
1
- .clearfix:after{content:".";display:block;height:0;clear:both;visibility:hidden}.clearfix{display:inline-table}* html .clearfix{height:1%}.clearfix{display:block}#wysija-app .column-date{width:70px}#wysija-app .column-clic,#wysija-app .column-opened,#wysija-app .column-emails{width:80px}#wysija-app .column-list-names{width:120px}#wysija-app .menuslinks{margin:20px 0}#statscontainer{height:200px;width:400px}#wysistats1{width:400px}#wysistats1 h3{text-align:center}#wysistats2,#wysistats3{width:200px;padding:30px 0 0 20px}#wysistats3{height:200px;overflow:auto}#wysistats2 ul li,#wysistats .title{font-weight:bold;font-size:14px;margin-top:0}#wysistats3 ol li{font-style:italic;font-size:10px;color:#444}#wysistats3 ol li em{font-size:11px;font-weight:bold}th.sorted,th.sortable{cursor:pointer}div#wysija-app .xdetailed-updated li,div#wysija-app .xdetailed-errors li,div#wysija-app .updated li,div#wysija-app .error li{margin:6px 0}.xdetailed-errors,.xdetailed-updated{border-radius:3px 3px 3px 3px;border-style:solid;border-width:1px;margin:5px 15px 2px;padding:0 0.6em}.xdetailed-updated{background-color:#FFFFE0;border-color:#E6DB55;color:#000;display:none}.xdetailed-errors{background-color:#FFEBE8;border-color:#888888;color:#000;display:none}label input[type="checkbox"],label input[type="radio"]{margin:0 5px 0 15px}label:first-child input[type="checkbox"],label:first-child input[type="radio"]{margin-left:0}label.title{font-weight:bold;font-size:14px}.wrap .button-secondary2{background-color:#6697BF;font-family:sans-serif;font-size:12px;color:#FFFFFF;text-decoration:none;text-shadow:0 1px 0 #777777;box-shadow:1px 1px 0 #AAAAAA;margin-left:4px;padding:3px 8px;position:relative;top:-3px;border-radius:3px;-moz-border-radius:3px;-khtml-border-radius:3px;-webkit-border-radius:3px}.wrap .button-secondary2:hover,.wrap .wcurrent{background-color:#1C73B5}.wrap #theme-view .button-secondary2{top:2px}.dots{margin:0 4px}#wysija-pagination{text-align:center}.tablenav .tablenav-pages a,.tablenav-pages span.current{margin:0 2px}.total-pages{padding:0px 3px}input.searchbox{width:225px}.wysija-premium img{display:none}#TB_load,#TB_window,#TB_overlay,.ui-dialog{z-index:100000 !important}.ui-widget-overlay{z-index:9998 !important;background-image:none !important}p.label{font-size:13px}.wysija_popup_content{padding:10px 20px 0 20px}.wysija_popup_content h3{margin:0 0 20px 0}a.linkignore{color:#BC0B0B}a.linkignore:hover,a.submitsynch:hover{color:#FF0000}a.submitsynch{color:#52aa05}body{min-width:0 !important}.warning-msg{background-color:#FFFFE0;border-color:#E6DB55}.warning-msg{border-radius:3px 3px 3px 3px;border-style:solid;border-width:1px;margin:5px 15px 2px;padding:0 0.6em}.warning-msg ul{margin:0}span.warning-msg{padding:7px}.about-wrap h3{padding-top:0px}.about-text{margin-bottom:1em;margin-top:0;min-height:20px}.wysija-unsubscribed-on{color:#bbb}.clear_select_all,.force_to_select_all_link{text-align:center}.batch-select{background-color:#E0E0E0;color:#555555;border-bottom:1px solid #e5e5e5}.clear_select_all a:hover,.force_to_select_all_link a:hover{text-decoration:underline;cursor:pointer !important}#wysija-app .notice-msg{background-color:#FFFFE0;border-color:#E6DB55}#wysija-app .error-msg{background-color:#FFEBE8;border-color:#CC0000}#wysija-app .wysija-msg .notice-msg,#wysija-app .wysija-msg .error-msg{border-radius:3px 3px 3px 3px;border-style:solid;border-width:1px;margin:5px 0 15px;padding:0 0.6em}.mpoet-page .changelog .review-follow-kitten{overflow:visible}
1
+ .clearfix:after{content:".";display:block;height:0;clear:both;visibility:hidden}.clearfix{display:inline-table}* html .clearfix{height:1%}.clearfix{display:block}#wysija-app .column-date{width:70px}#wysija-app .column-clic,#wysija-app .column-opened,#wysija-app .column-emails{width:80px}#wysija-app .column-list-names{width:120px}#wysija-app .menuslinks{margin:20px 0}#statscontainer{height:200px;width:400px}#wysistats1{width:400px}#wysistats1 h3{text-align:center}#wysistats2,#wysistats3{width:200px;padding:30px 0 0 20px}#wysistats3{height:200px;overflow:auto}#wysistats2 ul li,#wysistats .title{font-weight:bold;font-size:14px;margin-top:0}#wysistats3 ol li{font-style:italic;font-size:10px;color:#444}#wysistats3 ol li em{font-size:11px;font-weight:bold}th.sorted,th.sortable{cursor:pointer}div#wysija-app .xdetailed-updated li,div#wysija-app .xdetailed-errors li,div#wysija-app .updated li,div#wysija-app .error li{margin:6px 0}.xdetailed-errors,.xdetailed-updated{border-radius:3px 3px 3px 3px;border-style:solid;border-width:1px;margin:5px 15px 2px;padding:0 0.6em}.xdetailed-updated{background-color:#FFFFE0;border-color:#E6DB55;color:#000;display:none}.xdetailed-errors{background-color:#FFEBE8;border-color:#888888;color:#000;display:none}label input[type="checkbox"],label input[type="radio"]{margin:0 5px 0 15px}label:first-child input[type="checkbox"],label:first-child input[type="radio"]{margin-left:0}label.title{font-weight:bold;font-size:14px}.wrap .button-secondary2{background-color:#6697BF;font-family:sans-serif;font-size:12px;color:#FFFFFF;text-decoration:none;text-shadow:0 1px 0 #777777;box-shadow:1px 1px 0 #AAAAAA;margin-left:4px;padding:3px 8px;position:relative;top:-3px;border-radius:3px;-moz-border-radius:3px;-khtml-border-radius:3px;-webkit-border-radius:3px}.wrap .button-secondary2:hover,.wrap .wcurrent{background-color:#1C73B5}.wrap #theme-view .button-secondary2{top:2px}.dots{margin:0 4px}#wysija-pagination{text-align:center}.tablenav .tablenav-pages a,.tablenav-pages span.current{margin:0 2px}.total-pages{padding:0px 3px}input.searchbox{width:225px}.wysija-premium img{display:none}#TB_load,#TB_window,#TB_overlay,.ui-dialog{z-index:100000 !important}.ui-widget-overlay{z-index:9998 !important;background-image:none !important}p.label{font-size:13px}.wysija_popup_content{padding:10px 20px 0 20px}.wysija_popup_content h3{margin:0 0 20px 0}a.linkignore,a.mp_negative{color:#BC0B0B}a.linkignore:hover,a.submitsynch:hover{color:#FF0000}a.submitsynch{color:#52aa05}body{min-width:0 !important}.warning-msg{background-color:#FFFFE0;border-color:#E6DB55}.warning-msg{border-radius:3px 3px 3px 3px;border-style:solid;border-width:1px;margin:5px 15px 2px;padding:0 0.6em}.warning-msg ul{margin:0}span.warning-msg{padding:7px}.about-wrap h3{padding-top:0px}.about-text{margin-bottom:1em;margin-top:0;min-height:20px}.wysija-unsubscribed-on{color:#bbb}.clear_select_all,.force_to_select_all_link{text-align:center}.batch-select{background-color:#E0E0E0;color:#555555;border-bottom:1px solid #e5e5e5}.clear_select_all a:hover,.force_to_select_all_link a:hover{text-decoration:underline;cursor:pointer !important}#wysija-app .notice-msg{background-color:#FFFFE0;border-color:#E6DB55}#wysija-app .error-msg{background-color:#FFEBE8;border-color:#CC0000}#wysija-app .wysija-msg .notice-msg,#wysija-app .wysija-msg .error-msg{border-radius:3px 3px 3px 3px;border-style:solid;border-width:1px;margin:5px 0 15px;padding:0 0.6em}.mpoet-page .changelog .review-follow-kitten{overflow:visible}
css/rtl.css CHANGED
@@ -1 +1 @@
1
- body{direction:rtl;unicode-bidi:embed}input#url{direction:ltr}.xdetailed-errors,.xdetailed-updated{margin:2px 15px 5px}.wysija-footer,.wysija-version{margin:0 165px 0 20px}label input[type="checkbox"],label input[type="radio"]{margin:0 15px 0 5px}input.searchsub.button{float:none}a.button-primary.install{float:none}#review-follow div{float:right}.about-wrap .feature-section.three-col div{float:right}#wysija-badge{left:0;right:auto}.dividers ul{overflow-x:auto;overflow-y:auto}.submit-box{text-align:left}.submit-box #insert-selection,.submit-box #back-selection{margin:10px 0 0 10px}#toggle-advanced{left:10px;top:0;right:auto}.articles #basic .search-box{float:left}.articles #basic .filters-box{float:right}.articles #search-submit{margin:0 0 0 14px}.articles .cpt-type{left:0;right:auto;border-right:1px solid #ccc;border-left:0 none}#advanced div.block{padding:0.8em 1em 0.8em 0}#advanced label{float:right}#image_width_slider{float:right}#slider_info{float:right}#advanced label.radio{float:right;margin:0 0 0 9px}#advanced label.radio input{margin:0 0 0 2px}#advanced div.group{float:right}#results .thumbnail{float:right;margin:0 0 0 10px}#results li .checkbox{cursor:pointer;margin:0 11px 0 0}#results li .checkbox_container{float:right}#results li label{float:right}#loading-icon{left:auto;right:16px;top:16px}.submit-box #loading-message{left:auto;right:39px}.wysija-footer,.wysija-version{margin:0 165px 0 20px}.wysija-version .social-foot{float:right}body.rtl #wysija_wrapper{right:0 !important}#wysija_popup_title h3{float:right;margin-right:10px}#wysija_popup_close{float:left;margin-left:10px}#wysija_toolbar{right:657px}.wj_images li,.wj_themes li{float:right}.wj_images #wj_images_preview,.wj_themes #wj_themes_preview{left:295px;right:auto}.wj_content a.wysija_item,.wysija_widget{padding:0 10px 0 0}.wj_styles form label{margin:0 3px 0 0}.wj_styles #aUnderlineInput{margin-right:10px !important}.wysija_item_settings{left:15px;right:auto}#wysija_toggle_images{left:5px;right:auto}#review-follow .review-left.large{float:right}#review-follow .review-left{background-position:100% 0}#review-follow div{float:right}#review-follow .review-left .description{margin-right:146px;margin-left:0px}#review-follow .review-right{background-image:url("http://s-plugins.wordpress.org/wysija-newsletters/assets/update_page/arrow_middle-rtl.jpg");background-position:100% 0}#review-follow .follow-right{background-image:url("http://s-plugins.wordpress.org/wysija-newsletters/assets/update_page/arrow_right-rtl.jpg");background-position:100% 0}#review-follow .follow-right38{background-image:url("http://s-plugins.wordpress.org/wysija-newsletters/assets/update_page/arrow-right-38-rtl.jpg");background-position:100% 0}#wysija-settings input[type="checkbox"],#wysija-settings input[type="radio"],#wysija-settings label input[type="checkbox"]{margin-left:6px}label:first-child input[type="checkbox"],label:first-child input[type="radio"],label input[type="checkbox"],label input[type="radio"]{margin:0 15px 0 5px}.linknamecboxes,.labelcheck,.geeky-option a,.geeky-option span{float:right}.checkbox_optin_label{margin:6px 0 0 6px;float:right}.checkbox_optin_value{float:right}#wysija-settings .form-table th.rolestitle{text-align:right}.cronleft{float:right;margin:0 0 0 10px}.popup_content.autopost{width:auto}.popup_content{margin:10px 10px 0 10px}#wysija-settings #sendingmethod .methods h3,#wysija-settings #multisite .methods p.title{float:right}#wysija-settings #sendingmethod .methods input,#wysija-settings #multisite .methods input{float:right;margin:0 0 0 5px}h2.title span,h2.title form{float:right;margin-left:5px;margin-right:0px}#wysija_form_toolbar{right:679px !important;left:auto !important}#wysija_form_toolbar a.wysija_form_item,.wysija_form_widget{padding-right:7px}.form_widget_settings p label{float:right;clear:right;width:200px}.form_widget_settings .selection .is_selected{float:right;margin:3px 6px 0 0 !important}.form_widget_settings .selection label{float:right;margin:0 5px 0 0}.form_widget_settings .selection .handle,.form_widget_settings .selection .remove{float:left;margin:3px 0 0 3px}.popup_content.inline_form p input,.popup_content.inline_form p select,.popup_content.inline_form p .group{float:right}.submit_button{margin:20px 0 20px 10px;text-align:left}.popup_content.inline_form .submit_button{margin:20px 0 0 4px}.popup_content.inline_form label.radio,.popup_content.inline_form .group label{float:right}.popup_content.inline_form input[type="radio"],.popup_content.inline_form input[type="checkbox"]{margin:0 0 0 3px}.wysija_form_item_settings{left:35px;right:auto !important}.wysija_form_item_delete{left:15px;right:auto !important}.bookmarks .networks label,.bookmarks .networks input{float:right}#results li .checkbox{margin-left:10px}.add span{float:right}.themes #wj_paginator{float:left;margin-right:0;margin-left:10px}
1
+ body{direction:rtl;unicode-bidi:embed}input#url{direction:ltr}.xdetailed-errors,.xdetailed-updated{margin:2px 15px 5px}.wysija-footer,.wysija-version{margin:0 165px 0 20px}label input[type="checkbox"],label input[type="radio"]{margin:0 15px 0 5px}input.searchsub.button{float:none}a.button-primary.install{float:none}#review-follow div{float:right}.about-wrap .feature-section.three-col div{float:right}#wysija-badge{left:0;right:auto}.dividers ul{overflow-x:auto;overflow-y:auto}.submit-box{text-align:left}.submit-box #insert-selection,.submit-box #back-selection{margin:10px 0 0 10px}#toggle-advanced{left:10px;top:0;right:auto}.articles #basic .search-box{float:left}.articles #basic .filters-box{float:right}.articles #search-submit{margin:0 0 0 14px}.articles .cpt-type{left:0;right:auto;border-right:1px solid #ccc;border-left:0 none}#advanced div.block{padding:0.8em 1em 0.8em 0}#advanced label{float:right}#image_width_slider{float:right}#slider_info{float:right}#advanced label.radio{float:right;margin:0 0 0 9px}#advanced label.radio input{margin:0 0 0 2px}#advanced div.group{float:right}#results .thumbnail{float:right;margin:0 0 0 10px}#results li .checkbox{cursor:pointer;margin:0 11px 0 0}#results li .checkbox_container{float:right}#results li label{float:right}#loading-icon{left:auto;right:16px;top:16px}.submit-box #loading-message{left:auto;right:39px}.wysija-footer,.wysija-version{margin:0 165px 0 20px}.wysija-version .social-foot{float:right}body.rtl #wysija_wrapper{right:0 !important}#wysija_popup_title h3{float:right;margin-right:10px}#wysija_popup_close{float:left;margin-left:10px}#wysija_toolbar{right:657px}.wj_images li,.wj_themes li{float:right}.wj_images #wj_images_preview,.wj_themes #wj_themes_preview{left:295px;right:auto}.wj_content a.wysija_item,.wysija_widget{padding:0 10px 0 0}.wj_styles form label{margin:0 3px 0 0}.wj_styles #aUnderlineInput{margin-right:10px !important}.wysija_item_settings{left:15px;right:auto}#wysija_toggle_images{left:5px;right:auto}#review-follow .review-left.large{float:right}#review-follow .review-left{background-position:100% 0}#review-follow div{float:right}#review-follow .review-left .description{margin-right:146px;margin-left:0px}#review-follow .review-right{background-image:url("http://s-plugins.wordpress.org/wysija-newsletters/assets/update_page/arrow_middle-rtl.jpg");background-position:100% 0}#review-follow .follow-right{background-image:url("http://s-plugins.wordpress.org/wysija-newsletters/assets/update_page/arrow_right-rtl.jpg");background-position:100% 0}#review-follow .follow-right38{background-image:url("http://s-plugins.wordpress.org/wysija-newsletters/assets/update_page/arrow-right-38-rtl.jpg");background-position:100% 0}#wysija-settings input[type="checkbox"],#wysija-settings input[type="radio"],#wysija-settings label input[type="checkbox"]{margin-left:6px}label:first-child input[type="checkbox"],label:first-child input[type="radio"],label input[type="checkbox"],label input[type="radio"]{margin:0 15px 0 5px}.linknamecboxes,.labelcheck,.geeky-option a,.geeky-option span{float:right}.checkbox_optin_label{margin:6px 0 0 6px;float:right}.checkbox_optin_value{float:right}#wysija-settings .form-table th.rolestitle{text-align:right}.cronleft{float:right;margin:0 0 0 10px}.popup_content{margin:10px 10px 0 10px}#wysija-settings #sendingmethod .methods h3,#wysija-settings #multisite .methods p.title{float:right}#wysija-settings #sendingmethod .methods input,#wysija-settings #multisite .methods input{float:right;margin:0 0 0 5px}h2.title span,h2.title form{float:right;margin-left:5px;margin-right:0px}#wysija_form_toolbar{right:679px !important;left:auto !important}#wysija_form_toolbar a.wysija_form_item,.wysija_form_widget{padding-right:7px}.form_widget_settings p label{float:right;clear:right;width:200px}.form_widget_settings .selection .is_selected{float:right;margin:3px 6px 0 0 !important}.form_widget_settings .selection label{float:right;margin:0 5px 0 0}.form_widget_settings .selection .handle,.form_widget_settings .selection .remove{float:left;margin:3px 0 0 3px}.popup_content.inline_form p input,.popup_content.inline_form p select,.popup_content.inline_form p .group{float:right}.submit_button{margin:20px 0 20px 10px;text-align:left}.popup_content.inline_form .submit_button{margin:20px 0 0 4px}.popup_content.inline_form label.radio,.popup_content.inline_form .group label{float:right}.popup_content.inline_form.autopost label,.popup_content.inline_form.autopost div.group{float:right}.popup_content.inline_form input[type="radio"],.popup_content.inline_form input[type="checkbox"]{margin:0 0 0 3px}.wysija_form_item_settings{left:35px;right:auto !important}.wysija_form_item_delete{left:15px;right:auto !important}.bookmarks .networks label,.bookmarks .networks input{float:right}#results li .checkbox{margin-left:10px}.add span{float:right}.themes #wj_paginator{float:left;margin-right:0;margin-left:10px}
helpers/autonews.php CHANGED
@@ -95,18 +95,39 @@ class WYSIJA_help_autonews extends WYSIJA_object {
95
  $time_current_month=date('m',$now);
96
  $time_current_year=date('y',$now);
97
 
98
- //trigger has to be next month
99
- if($time_current_day > $email['params']['autonl']['daynumber']) {
100
-
101
- if((int)$time_current_month === 12) {
102
- //year +1
103
- $time_current_month=1;
104
- $time_current_year++;
105
- }else{
106
- //current year
107
- $time_current_month++;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
108
  }
109
  }
 
 
 
 
110
  $schedule_at=strtotime($time_current_month.'/'.$email['params']['autonl']['daynumber'].'/'.$time_current_year.' '.$email['params']['autonl']['time']);
111
  break;
112
  case 'monthlyevery': // monthly every X Day of the week
95
  $time_current_month=date('m',$now);
96
  $time_current_year=date('y',$now);
97
 
98
+ // we increment the next date to next months in two cases
99
+ // 1 - if we're setting the next date using the interface in step 1 or step 3 of the newsletter edition and the current day is greater to the selected day
100
+ if(isset( $_POST['save-reactivate'] ) || isset( $_POST['submit-send'] ) ){
101
+ //trigger has to be next month
102
+ if($time_current_day > $email['params']['autonl']['daynumber']) {
103
+
104
+ if((int)$time_current_month === 12) {
105
+ //year +1
106
+ $time_current_month=1;
107
+ $time_current_year++;
108
+ }else{
109
+ //current year
110
+ $time_current_month++;
111
+ }
112
+ }
113
+ // 2 - if we're setting the next date automatically and the date is already passed
114
+ }else{
115
+ if($helper_toolbox->localtime_to_servertime($schedule_at) < $now) {
116
+
117
+ if((int)$time_current_month === 12) {
118
+ //year +1
119
+ $time_current_month=1;
120
+ $time_current_year++;
121
+ }else{
122
+ //current year
123
+ $time_current_month++;
124
+ }
125
  }
126
  }
127
+
128
+ //3 - otherwise we stay in the same month
129
+
130
+
131
  $schedule_at=strtotime($time_current_month.'/'.$email['params']['autonl']['daynumber'].'/'.$time_current_year.' '.$email['params']['autonl']['time']);
132
  break;
133
  case 'monthlyevery': // monthly every X Day of the week
helpers/back.php CHANGED
@@ -340,11 +340,6 @@ class WYSIJA_help_back extends WYSIJA_help{
340
  $finds = array('[link]','[/link]');
341
  $replace = array('<a target="_blank" href="http://support.mailpoet.com" title="support.mailpoet.com">','</a>');
342
  $truelinkhelp = '<p>'.str_replace($finds,$replace,$linkcontent).'</p>';
343
-
344
- $extra = '<a href="admin.php?page=wysija_config&scroll_to=beta_mode_setting#tab-advanced" title="'.__('Switch to beta',WYSIJA).'">'.__('Switch to beta',WYSIJA).'</a>';
345
-
346
- $truelinkhelp .= '<p>'.str_replace($finds,$replace,$extra).'</p>';
347
-
348
  $truelinkhelp .= '<p>'.__('MailPoet Version: ',WYSIJA).'<strong>'.WYSIJA::get_version().'</strong></p>';
349
 
350
  $this->menus=array(
@@ -601,21 +596,6 @@ class WYSIJA_help_back extends WYSIJA_help{
601
  if (strpos($screen->base, 'wysija')===false)
602
  return $text;
603
 
604
- $title = esc_attr((WYSIJA::is_beta()?__('Revert to stable',WYSIJA):__('Switch to beta',WYSIJA)));
605
- $warn_message = esc_attr((WYSIJA::is_beta()?__('Confirm going back to the stable version?',WYSIJA):__('Great! But the beta version might be buggy, and we expect you to report any bugs. Confirm to installing the Beta version?',WYSIJA)));
606
-
607
- $args = array(
608
- 'page' => 'wysija_config',
609
- 'action' => 'packager-switch',
610
- '_wpnonce' => wp_create_nonce('packager-switch'),
611
- );
612
- if (WYSIJA::is_beta())
613
- $args["stable"] = 1;
614
-
615
- $switch_link = esc_attr(add_query_arg($args, admin_url('admin.php')));
616
-
617
- $switch_text = esc_attr((WYSIJA::is_beta()?__('Revert to Stable', WYSIJA):__('Switch to Beta', WYSIJA)));
618
-
619
  $version_link = esc_url(add_query_arg(
620
  array(
621
  'page' => 'wysija_campaigns',
@@ -624,24 +604,12 @@ class WYSIJA_help_back extends WYSIJA_help{
624
  admin_url('admin.php')
625
  ));
626
 
627
- $premium = false;
628
- if (is_plugin_active('wysija-newsletters-premium/index.php')){
629
- $premium = WYSIJA::get_version('wysija-newsletters-premium/index.php');
630
- }
631
-
632
- return
633
- ((is_multisite() && WYSIJA::current_user_can('manage_network')) || (!is_multisite() && WYSIJA::current_user_can('switch_themes'))?
634
- "<span class='wrap'>" .
635
- "<a id='switch_to_package' href='{$switch_link}' title='{$title}' data-warn='{$warn_message}' class='add-new-h2'>{$switch_text}</a>" .
636
- (WYSIJA::is_beta()?"<a target='_blank' class='add-new-h2' href='http://support.mailpoet.com/feedback/?utm_source=wpadmin&utm_campaign=contact_beta'>" . __( 'Report Bugs', WYSIJA ) . "</a>":"") .
637
- "</span>"
638
- :"") .
639
- "</p>" .
640
  "<p class='alignright'>" .
641
- __("MailPoet Version", WYSIJA) . ": <a href='{$version_link}'>" . esc_attr(WYSIJA::get_version()) . "</a>" .
642
- ($premium?
643
- " | " .
644
- __("Premium", WYSIJA) . ": " . esc_attr($premium) . "</a>"
645
- :"");
646
  }
647
  }
340
  $finds = array('[link]','[/link]');
341
  $replace = array('<a target="_blank" href="http://support.mailpoet.com" title="support.mailpoet.com">','</a>');
342
  $truelinkhelp = '<p>'.str_replace($finds,$replace,$linkcontent).'</p>';
 
 
 
 
 
343
  $truelinkhelp .= '<p>'.__('MailPoet Version: ',WYSIJA).'<strong>'.WYSIJA::get_version().'</strong></p>';
344
 
345
  $this->menus=array(
596
  if (strpos($screen->base, 'wysija')===false)
597
  return $text;
598
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
599
  $version_link = esc_url(add_query_arg(
600
  array(
601
  'page' => 'wysija_campaigns',
604
  admin_url('admin.php')
605
  ));
606
 
607
+ $version_string = "</p>" .
 
 
 
 
 
 
 
 
 
 
 
 
608
  "<p class='alignright'>" .
609
+ __("MailPoet Version", WYSIJA) . ": <a href='{$version_link}'>" . esc_attr(WYSIJA::get_version()) . "</a>";
610
+
611
+ $version_string = apply_filters('mailpoet_back_footer', $version_string);
612
+ return $version_string;
613
+
614
  }
615
  }
helpers/licence.php CHANGED
@@ -14,13 +14,13 @@ class WYSIJA_help_licence extends WYSIJA_help{
14
  * @param string $source
15
  * @return string
16
  */
17
- function get_url_checkout($source = 'not_specified'){
18
  $helper_toolbox = WYSIJA::get('toolbox' , 'helper');
19
  $currency = 'USD';
20
  if($helper_toolbox->is_european()){
21
  $currency = 'EUR';
22
  }
23
- return 'http://www.mailpoet.com/checkout/?wysijadomain='.$this->getDomainInfo(true).'&nc=1&utm_source=wpadmin&utm_campaign='.$source.'&currency='.$currency;
24
  }
25
 
26
  /**
@@ -94,7 +94,8 @@ class WYSIJA_help_licence extends WYSIJA_help{
94
  // set premium key
95
  $config_data = array(
96
  'premium_key' => base64_encode(get_option('home').time()),
97
- 'premium_val' => time()
 
98
  );
99
 
100
  // success message
@@ -117,7 +118,11 @@ class WYSIJA_help_licence extends WYSIJA_help{
117
  $error_msg=__('There\'s no license for "%1$s". If you\'re Premium, add this domain in your [link]account manager[/link].',WYSIJA);
118
  break;
119
  case 3: //Licence has expired
120
- $error_msg=__('Your Premium licence has expired.',WYSIJA);
 
 
 
 
121
  break;
122
  case 4: //You need to manually add this domain to your [link]account manager[/link]
123
  $error_msg=__('You can add this domain to your [link]account manager[/link].',WYSIJA);
@@ -137,8 +142,6 @@ class WYSIJA_help_licence extends WYSIJA_help{
137
  // reset premium key data
138
  $config_data = array('premium_key' => '', 'premium_val' => '');
139
 
140
- // error message
141
- //$this->error(str_replace(array('[link]','[/link]'),array('<a href="http://www.mailpoet.com/?wysijap=checkout&wysijashop-page=1&controller=orders&action=checkout&wysijadomain='.$domainData.'" target="_blank">','</a>'), __('Premium licence does not exist for your site. Purchase from our website [link]here[/link].',WYSIJA)), 1);
142
  WYSIJA::update_option('wysicheck', false);
143
  }
144
 
14
  * @param string $source
15
  * @return string
16
  */
17
+ function get_url_checkout($source = 'not_specified', $campaign = 'wpadmin'){
18
  $helper_toolbox = WYSIJA::get('toolbox' , 'helper');
19
  $currency = 'USD';
20
  if($helper_toolbox->is_european()){
21
  $currency = 'EUR';
22
  }
23
+ return 'http://www.mailpoet.com/checkout/?wysijadomain='.$this->getDomainInfo(true).'&nc=1&utm_medium=plugin&utm_campaign='.$campaign.'&utm_source='.$source.'&currency='.$currency;
24
  }
25
 
26
  /**
94
  // set premium key
95
  $config_data = array(
96
  'premium_key' => base64_encode(get_option('home').time()),
97
+ 'premium_val' => time(),
98
+ 'premium_expire_at' => (int) $decoded['expire_at']
99
  );
100
 
101
  // success message
118
  $error_msg=__('There\'s no license for "%1$s". If you\'re Premium, add this domain in your [link]account manager[/link].',WYSIJA);
119
  break;
120
  case 3: //Licence has expired
121
+
122
+ $renew_url = 'http://www.mailpoet.com/checkout/?utm_medium=plugin&utm_campaign=renewal_deal&utm_source=renewal_deal_';
123
+ $link_renew = '<a href="'.$renew_url.'has_expired'.'" target="_blank" >'.__('Renew now.', WYSIJA).'</a>';
124
+ $error_msg=__('Your Premium licence has expired.',WYSIJA). ' ' . $link_renew;
125
+
126
  break;
127
  case 4: //You need to manually add this domain to your [link]account manager[/link]
128
  $error_msg=__('You can add this domain to your [link]account manager[/link].',WYSIJA);
142
  // reset premium key data
143
  $config_data = array('premium_key' => '', 'premium_val' => '');
144
 
 
 
145
  WYSIJA::update_option('wysicheck', false);
146
  }
147
 
helpers/wj_engine.php CHANGED
@@ -21,6 +21,9 @@ class WYSIJA_help_wj_engine extends WYSIJA_object {
21
  var $_data = null;
22
  var $_styles = null;
23
 
 
 
 
24
  // styles: defaults
25
  var $VIEWBROWSER_SIZES = array(7, 8, 9, 10, 11, 12, 13, 14);
26
  var $TEXT_SIZES = array(8, 9, 10, 11, 12, 13, 14, 16, 18, 24, 36, 48, 72);
@@ -162,6 +165,17 @@ class WYSIJA_help_wj_engine extends WYSIJA_object {
162
  }
163
  }
164
 
 
 
 
 
 
 
 
 
 
 
 
165
  function getDefaultData() {
166
  $dividersHelper = WYSIJA::get('dividers', 'helper');
167
  return array(
@@ -460,6 +474,9 @@ class WYSIJA_help_wj_engine extends WYSIJA_object {
460
  $background_color = $block['background_color'];
461
  }
462
 
 
 
 
463
  $blockHTML = $helper_render_engine->render($block, 'templates/newsletter/email/block_template.html');
464
 
465
  // convert lists
@@ -851,13 +868,7 @@ class WYSIJA_help_wj_engine extends WYSIJA_object {
851
 
852
  $data = $this->getStyles();
853
  $data['context'] = $this->getContext();
854
-
855
- // right to left language property
856
- if(function_exists('is_rtl')) {
857
- $data['is_rtl'] = is_rtl();
858
- } else {
859
- $data['is_rtl'] = false;
860
- }
861
 
862
  switch($data['context']) {
863
  case 'editor':
@@ -886,12 +897,6 @@ class WYSIJA_help_wj_engine extends WYSIJA_object {
886
  $data['footer'] = '.wysija_footer';
887
  $data['footer_container'] = '.wysija_footer_container';
888
  $data['unsubscribe_container'] = '.wysija_unsubscribe_container';
889
- //right to left language property
890
- if(function_exists('is_rtl')) {
891
- $data['is_rtl'] = is_rtl();
892
- } else {
893
- $data['is_rtl'] = false;
894
- }
895
  return $helper_render_engine->render($data, 'templates/newsletter/email/css.html');
896
  break;
897
  }
@@ -911,6 +916,9 @@ class WYSIJA_help_wj_engine extends WYSIJA_object {
911
 
912
  $this->setContext('email');
913
 
 
 
 
914
  if($this->isDataValid() === false) {
915
  throw new Exception('data is not valid');
916
  } else {
@@ -930,12 +938,8 @@ class WYSIJA_help_wj_engine extends WYSIJA_object {
930
  'hide_unsubscribe' => $this->_hide_unsubscribe
931
  );
932
 
933
- //right to left language property
934
- if(function_exists('is_rtl')) {
935
- $data['is_rtl'] = is_rtl();
936
- } else {
937
- $data['is_rtl'] = false;
938
- }
939
 
940
  // set email subject if specified
941
  $data['subject'] = $this->getEmailData('subject');
@@ -1243,6 +1247,10 @@ class WYSIJA_help_wj_engine extends WYSIJA_object {
1243
  } else {
1244
  // set styles
1245
  $block['styles'] = $styles;
 
 
 
 
1246
  // generate block template
1247
  $blockHTML = $helper_render_engine->render($block, 'templates/newsletter/email/block_template.html');
1248
 
21
  var $_data = null;
22
  var $_styles = null;
23
 
24
+ // language direction
25
+ var $_is_rtl = false;
26
+
27
  // styles: defaults
28
  var $VIEWBROWSER_SIZES = array(7, 8, 9, 10, 11, 12, 13, 14);
29
  var $TEXT_SIZES = array(8, 9, 10, 11, 12, 13, 14, 16, 18, 24, 36, 48, 72);
165
  }
166
  }
167
 
168
+ function setLanguageDirection() {
169
+ // right to left language property
170
+ if(function_exists('is_rtl')) {
171
+ $this->_is_rtl = is_rtl();
172
+ }
173
+ }
174
+
175
+ function isRtl() {
176
+ return $this->_is_rtl;
177
+ }
178
+
179
  function getDefaultData() {
180
  $dividersHelper = WYSIJA::get('dividers', 'helper');
181
  return array(
474
  $background_color = $block['background_color'];
475
  }
476
 
477
+ // set rtl mode
478
+ $block['is_rtl'] = $this->isRtl();
479
+
480
  $blockHTML = $helper_render_engine->render($block, 'templates/newsletter/email/block_template.html');
481
 
482
  // convert lists
868
 
869
  $data = $this->getStyles();
870
  $data['context'] = $this->getContext();
871
+ $data['is_rtl'] = $this->isRtl();
 
 
 
 
 
 
872
 
873
  switch($data['context']) {
874
  case 'editor':
897
  $data['footer'] = '.wysija_footer';
898
  $data['footer_container'] = '.wysija_footer_container';
899
  $data['unsubscribe_container'] = '.wysija_unsubscribe_container';
 
 
 
 
 
 
900
  return $helper_render_engine->render($data, 'templates/newsletter/email/css.html');
901
  break;
902
  }
916
 
917
  $this->setContext('email');
918
 
919
+ // set language direction
920
+ $this->setLanguageDirection();
921
+
922
  if($this->isDataValid() === false) {
923
  throw new Exception('data is not valid');
924
  } else {
938
  'hide_unsubscribe' => $this->_hide_unsubscribe
939
  );
940
 
941
+ // get language direction
942
+ $data['is_rtl'] = $this->isRtl();
 
 
 
 
943
 
944
  // set email subject if specified
945
  $data['subject'] = $this->getEmailData('subject');
1247
  } else {
1248
  // set styles
1249
  $block['styles'] = $styles;
1250
+
1251
+ // set rtl
1252
+ $block['is_rtl'] = $this->isRtl();
1253
+
1254
  // generate block template
1255
  $blockHTML = $helper_render_engine->render($block, 'templates/newsletter/email/block_template.html');
1256
 
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. Import and manage your lists. Add subscription forms in widgets, articles and pages. MailPoet (formerly Wysija) is a freemium plugin updated regularly with new features.
6
- Version: 2.6.13
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. Import and manage your lists. Add subscription forms in widgets, articles and pages. MailPoet (formerly Wysija) is a freemium plugin updated regularly with new features.
6
+ Version: 2.6.14
7
  Author: MailPoet
8
  Author URI: http://www.mailpoet.com/
9
  License: GPLv2 or later
js/admin-campaigns-welcome_new.js CHANGED
@@ -1 +1 @@
1
- jQuery(function(u){function n(){return u("#poll_result").html(""),"url"==u(this).val()&&""!=u('input[name="how_did_you_find_us_url"]')?(u('input[name="how_did_you_find_us_url"]').focus(),!1):(wysijaAJAX.task="save_poll",wysijaAJAX._wpnonce=wysijanonces.campaigns.save_poll,wysijaAJAX.how=u('input[name="how_did_you_find_us"]').val(),wysijaAJAX.where=u('input[name="how_did_you_find_us_url"]').val(),jQuery.ajax({type:"POST",url:wysijaAJAX.ajaxurl,data:wysijaAJAX,success:_,error:a,dataType:"json"}),!1)}function _(n){u("#poll_result").html(n.result.msg)}function a(u){alert("Request error not JSON:"+u.responseText)}u('input[name="how_did_you_find_us"]').change(n),u('input[name="how_did_you_find_us_url"]').blur(n)});
1
+ jQuery(function(u){function n(){return u("#poll_result").html(""),"url"==u(this).val()&&""!=u('input[name="how_did_you_find_us_url"]')?(u('input[name="how_did_you_find_us_url"]').focus(),!1):(wysijaAJAX.task="save_poll",wysijaAJAX._wpnonce=wysijanonces.campaigns.save_poll,wysijaAJAX.how=u('input[name="how_did_you_find_us"]:checked').val(),wysijaAJAX.where=u('input[name="how_did_you_find_us_url"]').val(),jQuery.ajax({type:"POST",url:wysijaAJAX.ajaxurl,data:wysijaAJAX,success:_,error:e,dataType:"json"}),!1)}function _(n){u("#poll_result").html(n.result.msg)}function e(u){alert("Request error not JSON:"+u.responseText)}u('input[name="how_did_you_find_us"]').change(n),u('input[name="how_did_you_find_us_url"]').blur(n)});
js/admin-wysija.js CHANGED
@@ -1 +1 @@
1
- jQuery(function(a){function i(i){i?(a(".wysija-premium-activate").addClass("wysija-button-loading"),a(".wysija-premium-activate").html(wysijatrans.premium_activating+"<span>.</span><span>.</span><span>.</span>")):(a(".wysija-premium-activate").removeClass("wysija-button-loading"),a(".wysija-premium-activate").html(wysijatrans.premium_activate))}a("#wysija-app .submitdelete").click(function(){return confirm(wysijatrans.suredelete)}),a("#wysija-app .linkignore, .wysija-version .linkignore").click(function(){var i=this;return wysijaAJAX.controller="config",wysijaAJAX.task="linkignore",wysijaAJAX.ignorewhat=a.trim(a(this).attr("class").replace(/linkignore/g,"")),wysijaAJAX._wpnonce=wysijanonces.config.linkignore,a.ajax({type:"POST",url:wysijaAJAX.ajaxurl,data:wysijaAJAX,success:function(){a(i).parents(".removeme").length>0?a(i).parents(".removeme").fadeOut():a(i).parents("li").siblings().size()>0?a(i).parents("li").fadeOut():a(i).parents("div.updated").fadeOut()},error:function(a){alert("Request error not JSON:"+a.responseText),wysijaAJAXcallback.onSuccess=""},dataType:"json"}),!0}),a(document).on("click","#wysija-app .premium-tab, .wysija-msg .premium-tab, #theme-view .premium-tab",function(){a("#wysija-app .wysija-premium img").hide(),a(this).hasClass("ispopup")?(window.parent.tb_remove(),window.parent.location.href=wysijatrans.urlpremium):a("#wysija-tabs").length>0?a('#wysija-tabs a[href="#premium"]').trigger("click"):window.location.href=wysijatrans.urlpremium}),a(".wysija-premium-activate").click(function(){wysijaAJAX.controller="config",wysijaAJAX.task="validate",wysijaAJAX._wpnonce=wysijanonces.config.validate,i(!0);var e=this;return a.ajax({type:"POST",url:wysijaAJAX.ajaxurl,data:wysijaAJAX,success:function(t){t.result.result?window.location.href="admin.php?page=wysija_campaigns&sp=1":(t.result.nocontact?window.location.href="admin.php?page=wysija_campaigns&nocontact=1":(displaychange=0,a.WYSIJA_HANDLE_RESPONSE(t)),i(!1)),a(e).removeClass("wysija-button-loading")},error:function(a){alert(a.responseText),delete wysijaAJAXcallback.onSuccess,i(!1)},dataType:"json"}),!1}),a("#install-wjp,#switch_to_package").click(function(){return confirm(a(this).data("warn"))?(tb_show(a(this).attr("title"),a(this).attr("href")+"&KeepThis=true&TB_iframe=true&height=400&width=600",null),tb_showIframe(),!1):!1}),a("#share_analytics").click(function(){var i=this;return wysijaAJAX.controller="config",wysijaAJAX.task="share_analytics",wysijaAJAX._wpnonce=wysijanonces.config.share_analytics,a.ajax({type:"POST",url:wysijaAJAX.ajaxurl,data:wysijaAJAX,success:function(){a(i).text("Thanks!").contents().unwrap()},error:function(a){alert("Request error not JSON:"+a.responseText),wysijaAJAXcallback.onSuccess=""},dataType:"json"}),!0})});
1
+ jQuery(function(a){function i(i){i?(a(".wysija-premium-activate").addClass("wysija-button-loading"),a(".wysija-premium-activate").html(wysijatrans.premium_activating+"<span>.</span><span>.</span><span>.</span>")):(a(".wysija-premium-activate").removeClass("wysija-button-loading"),a(".wysija-premium-activate").html(wysijatrans.premium_activate))}a("#wysija-app .submitdelete").click(function(){return confirm(wysijatrans.suredelete)}),a("#wysija-app .linkignore, .wysija-version .linkignore").click(function(){var i=this;return wysijaAJAX.controller="config",wysijaAJAX.task="linkignore",wysijaAJAX.ignorewhat=a.trim(a(this).attr("class").replace(/linkignore/g,"")),wysijaAJAX._wpnonce=wysijanonces.config.linkignore,a.ajax({type:"POST",url:wysijaAJAX.ajaxurl,data:wysijaAJAX,success:function(){a(i).parents(".removeme").length>0?a(i).parents(".removeme").fadeOut():a(i).parents("li").siblings().size()>0?a(i).parents("li").fadeOut():a(i).parents("div.updated").fadeOut()},error:function(a){alert("Request error not JSON:"+a.responseText),wysijaAJAXcallback.onSuccess=""},dataType:"json"}),!0}),a(document).on("click","#wysija-app .premium-tab, .wysija-msg .premium-tab, #theme-view .premium-tab",function(){a("#wysija-app .wysija-premium img").hide(),a(this).hasClass("ispopup")?(window.parent.tb_remove(),window.parent.location.href=wysijatrans.urlpremium):a("#wysija-tabs").length>0?a('#wysija-tabs a[href="#premium"]').trigger("click"):window.location.href=wysijatrans.urlpremium}),a(".wysija-premium-activate").click(function(){wysijaAJAX.controller="config",wysijaAJAX.task="validate",wysijaAJAX._wpnonce=wysijanonces.config.validate,i(!0);var e=this;return a.ajax({type:"POST",url:wysijaAJAX.ajaxurl,data:wysijaAJAX,success:function(t){t.result.result?window.location.href="admin.php?page=wysija_campaigns&sp=1":(t.result.nocontact?window.location.href="admin.php?page=wysija_campaigns&nocontact=1":(displaychange=0,a.WYSIJA_HANDLE_RESPONSE(t)),i(!1)),a(e).removeClass("wysija-button-loading")},error:function(a){alert(a.responseText),delete wysijaAJAXcallback.onSuccess,i(!1)},dataType:"json"}),!1}),a("#install-wjp").click(function(){return confirm(a(this).data("warn"))?(tb_show(a(this).attr("title"),a(this).attr("href")+"&KeepThis=true&TB_iframe=true&height=400&width=600",null),tb_showIframe(),!1):!1}),a("#share_analytics").click(function(){var i=this;return wysijaAJAX.controller="config",wysijaAJAX.task="share_analytics",wysijaAJAX._wpnonce=wysijanonces.config.share_analytics,a.ajax({type:"POST",url:wysijaAJAX.ajaxurl,data:wysijaAJAX,success:function(){a(i).text("Thanks!").contents().unwrap()},error:function(a){alert("Request error not JSON:"+a.responseText),wysijaAJAXcallback.onSuccess=""},dataType:"json"}),!0})});
languages/wysija-newsletters-ar.mo CHANGED
Binary file
languages/wysija-newsletters-ca.mo CHANGED
Binary file
languages/wysija-newsletters-cs_CZ.mo CHANGED
Binary file
languages/wysija-newsletters-el.mo CHANGED
Binary file
languages/wysija-newsletters-es_419.mo CHANGED
Binary file
languages/wysija-newsletters-es_ES.mo CHANGED
Binary file
languages/wysija-newsletters-fa_IR.mo CHANGED
Binary file
languages/wysija-newsletters-fr_FR.mo CHANGED
Binary file
languages/wysija-newsletters-hu_HU.mo CHANGED
Binary file
languages/wysija-newsletters-it_IT.mo CHANGED
Binary file
languages/wysija-newsletters-ja.mo CHANGED
Binary file
languages/wysija-newsletters-lt_LT.mo CHANGED
Binary file
languages/wysija-newsletters-lv.mo CHANGED
Binary file
languages/wysija-newsletters-nl_NL.mo CHANGED
Binary file
languages/wysija-newsletters-pt_PT.mo CHANGED
Binary file
languages/wysija-newsletters-ro_RO.mo CHANGED
Binary file
languages/wysija-newsletters-ru_RU.mo CHANGED
Binary file
languages/wysija-newsletters-sk_SK.mo CHANGED
Binary file
languages/wysija-newsletters-sq.mo CHANGED
Binary file
languages/wysija-newsletters-sv_SE.mo CHANGED
Binary file
models/config.php CHANGED
@@ -690,15 +690,19 @@ class WYSIJA_model_config extends WYSIJA_object{
690
  function view_in_browser_link( $editor = false ){
691
  $data = array();
692
 
693
- if ( isset( $this->values['viewinbrowser_linkname'] ) ){
694
- // Grab the value for the view in browser link
695
- $link = $this->values['viewinbrowser_linkname'];
696
- }
697
 
698
- // If we don't have the value from DB load a default
699
- if ( ! isset( $link ) || empty( $link ) || ! $link ){
700
- $link = esc_attr__( 'Display problems? [link]View this newsletter in your browser.[/link]', WYSIJA );
701
- }
 
 
 
 
 
702
 
703
  // if we spot a link tag in the text we decompose the text in different parts pre rendering
704
  if ( strpos( $link, '[link]' ) !== false ){
@@ -708,7 +712,11 @@ class WYSIJA_model_config extends WYSIJA_object{
708
  $data['posttext'] = $linkpost[1];
709
  $data['label'] = $linkpost[0];
710
  $data['link'] = '[view_in_browser_link]';
711
- }
 
 
 
 
712
 
713
  if ( $editor ){
714
  $params_url = array(
690
  function view_in_browser_link( $editor = false ){
691
  $data = array();
692
 
693
+ if(!$this->getValue('viewinbrowser')){
694
+ return $data;
695
+ }
 
696
 
697
+ if ( isset( $this->values['viewinbrowser_linkname'] ) ){
698
+ // Grab the value for the view in browser link
699
+ $link = $this->values['viewinbrowser_linkname'];
700
+ }
701
+
702
+ // If we don't have the value from DB load a default
703
+ if ( ! isset( $link ) || empty( $link ) || ! $link ){
704
+ $link = esc_attr__( 'Display problems? [link]View this newsletter in your browser.[/link]', WYSIJA );
705
+ }
706
 
707
  // if we spot a link tag in the text we decompose the text in different parts pre rendering
708
  if ( strpos( $link, '[link]' ) !== false ){
712
  $data['posttext'] = $linkpost[1];
713
  $data['label'] = $linkpost[0];
714
  $data['link'] = '[view_in_browser_link]';
715
+ }else{
716
+ $data['pretext'] = $data['posttext'] = '';
717
+ $data['label'] = $link;
718
+ $data['link'] = '[view_in_browser_link]';
719
+ }
720
 
721
  if ( $editor ){
722
  $params_url = array(
models/user_history.php CHANGED
@@ -29,7 +29,7 @@ class WYSIJA_model_user_history extends WYSIJA_model{
29
  * @param type $mailid
30
  * @return type
31
  */
32
- function insert($subid,$action,$data = array(),$mailid = 0){
33
  $current_user=WYSIJA::wp_get_userdata();
34
  /*dbg($current_user,0);
35
  $current_user=wp_get_current_user();*/
29
  * @param type $mailid
30
  * @return type
31
  */
32
+ function insert($subid,$action=false,$data = array(),$mailid = 0){
33
  $current_user=WYSIJA::wp_get_userdata();
34
  /*dbg($current_user,0);
35
  $current_user=wp_get_current_user();*/
readme.txt CHANGED
@@ -1,14 +1,14 @@
1
  === MailPoet Newsletters ===
2
  Contributors: wysija, kgjerstad, benheu, JoN1oP, badshark
3
- Tags: newsletter, newsletters, newsletter signup, subscribers, post notification, email subscription, email alerts, auto newsletter, autoresponder, follow up, email, marketing, emailing, subscription
4
  Requires at least: 3.3
5
- Tested up to: 4.0
6
- Stable tag: 2.6.13
7
  Send newsletters, post notifications or autoresponders from WordPress easily, and beautifully.
8
 
9
  == Description ==
10
 
11
- Create newsletters, post notifications and autoresponders. Drop your posts, images, social icons in your newsletter. Change fonts and colors on the fly. Manage all your subscribers. A new and simple newsletter solution for WordPress. Finally!
12
 
13
  We built it with the idea that newsletters in WordPress should be easy. Not hard. Forget MailChimp, Aweber, etc. We're the good guys inside your WordPress.
14
 
@@ -133,15 +133,20 @@ Our [support site](http://support.mailpoet.com/) has plenty of articles and a ti
133
 
134
  == Changelog ==
135
 
136
- = 2.6.13 - 2014-10-28 =
137
- * Improved security a lot since July 2014, please update.
 
 
 
 
 
 
138
  * Fixed a conflict with the plugin [Magic Action Box](https://wordpress.org/plugins/magic-action-box/)
139
  * Fixed blank export file when exporting subscribers with custom fields
140
  * Fixed the default subscribers ordering in the backend, we now display the most recent first
141
  * Fixed the bug on Bold and Italic commands in our newsletter editor
142
  * Fixed an issue on the new bulk resend confirmation email feature
143
  * Fixed bounce management issue (Premium only), counting until 3 when a mailbox is full
144
- * Fixing 1 bug a day, stopped eating our veggies
145
 
146
  = 2.6.12 - 2014-10-16 =
147
  * Improved security thanks to Dominik Schilling, [Ryan Satterfield](http://planetzuda.com) and [Logical Trust](https://logicaltrust.net/en/)
1
  === MailPoet Newsletters ===
2
  Contributors: wysija, kgjerstad, benheu, JoN1oP, badshark
3
+ Tags: newsletter, newsletters, email, subscribe newsletter, newsletter signup, post notification, newsletter subscription, newsletter alert, auto newsletter, autoresponder, follow up email, dunning email, drip campaign, marketing email, mailpoet, wysija, mandrill, sendgrid
4
  Requires at least: 3.3
5
+ Tested up to: 4.1
6
+ Stable tag: 2.6.14
7
  Send newsletters, post notifications or autoresponders from WordPress easily, and beautifully.
8
 
9
  == Description ==
10
 
11
+ Create newsletters, post notifications and autoresponders. Drop your posts, images, social icons in your newsletter. Change fonts and colors on the fly. Manage all your subscribers. A simple newsletter solution for WordPress. Finally!
12
 
13
  We built it with the idea that newsletters in WordPress should be easy. Not hard. Forget MailChimp, Aweber, etc. We're the good guys inside your WordPress.
14
 
133
 
134
  == Changelog ==
135
 
136
+ = 2.6.14 - 2014-11-26 =
137
+ * Fixed all of the RTL issues on delivered newsletters and their web version
138
+ * Fixed issue when importing subscribers with new custom fields
139
+ * Fixed duplicated Monthly post notifications issue
140
+ * Fixed View in Browser version deactivation
141
+ * Removed option to switch to Beta
142
+
143
+ = 2.6.13 - 2014-10-27 =
144
  * Fixed a conflict with the plugin [Magic Action Box](https://wordpress.org/plugins/magic-action-box/)
145
  * Fixed blank export file when exporting subscribers with custom fields
146
  * Fixed the default subscribers ordering in the backend, we now display the most recent first
147
  * Fixed the bug on Bold and Italic commands in our newsletter editor
148
  * Fixed an issue on the new bulk resend confirmation email feature
149
  * Fixed bounce management issue (Premium only), counting until 3 when a mailbox is full
 
150
 
151
  = 2.6.12 - 2014-10-16 =
152
  * Improved security thanks to Dominik Schilling, [Ryan Satterfield](http://planetzuda.com) and [Logical Trust](https://logicaltrust.net/en/)
tools/templates/newsletter/email/block_content.html CHANGED
@@ -13,7 +13,7 @@
13
  </td>
14
  {/if}
15
  {if #text}
16
- <td class="wysija_content_container {#alignment}" align="left">
17
  {include file="templates/newsletter/email/block_image.html"}
18
  {include file="templates/newsletter/email/block_text.html"}
19
  </td>
13
  </td>
14
  {/if}
15
  {if #text}
16
+ <td class="wysija_content_container {#alignment}" {if #is_rtl} align="right" dir="rtl" {/if} {if ! #is_rtl} align="left" {/if} >
17
  {include file="templates/newsletter/email/block_image.html"}
18
  {include file="templates/newsletter/email/block_text.html"}
19
  </td>
tools/templates/newsletter/email/css.html CHANGED
@@ -63,7 +63,8 @@
63
  line-height:125%;
64
  letter-spacing:normal;
65
  margin:0;
66
- text-align:left;
 
67
  }
68
 
69
  /* --- title 2 --- */
@@ -77,7 +78,8 @@
77
  line-height:125%;
78
  letter-spacing:normal;
79
  margin:0;
80
- text-align:left;
 
81
  }
82
 
83
  /* --- title 3 (and others) --- */
@@ -91,7 +93,8 @@
91
  line-height:125%;
92
  letter-spacing:normal;
93
  margin:0;
94
- text-align:left;
 
95
  }
96
 
97
  /* Outlook 07, 10 Padding issue fix
63
  line-height:125%;
64
  letter-spacing:normal;
65
  margin:0;
66
+ {if #is_rtl}text-align:right;{/if}
67
+ {if ! #is_rtl}text-align:left;{/if}
68
  }
69
 
70
  /* --- title 2 --- */
78
  line-height:125%;
79
  letter-spacing:normal;
80
  margin:0;
81
+ {if #is_rtl}text-align:right;{/if}
82
+ {if ! #is_rtl}text-align:left;{/if}
83
  }
84
 
85
  /* --- title 3 (and others) --- */
93
  line-height:125%;
94
  letter-spacing:normal;
95
  margin:0;
96
+ {if #is_rtl}text-align:right;{/if}
97
+ {if ! #is_rtl}text-align:left;{/if}
98
  }
99
 
100
  /* Outlook 07, 10 Padding issue fix
tools/templates/newsletter/email/email_template.html CHANGED
@@ -1,12 +1,12 @@
1
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
2
- <html xmlns="http://www.w3.org/1999/xhtml">
3
  <head>
4
  <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
5
  <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
6
  <title>{#subject|default:Wysija template}</title>
7
  {#css}
8
  </head>
9
- <body bgcolor="{#styles.html.background|color}" yahoo="fix" {if #is_rtl}dir="rtl"{/if}>
10
  <span style="margin-bottom:0;margin-left:0;margin-right:0;margin-top:0;padding-bottom:0;padding-left:0;padding-right:0;padding-top:0;display:block;background:{#styles.html.background|color};">
11
  <table width="100%" cellpadding="0" cellspacing="0" border="0" id="wysija_wrapper">
12
  <tr>
@@ -14,7 +14,7 @@
14
  <table width="600" cellpadding="0" cellspacing="0" border="0" align="center">
15
  {if ! #hide_viewbrowser}
16
  <tr>
17
- <td width="600" style="min-width:600px;" valign="top" align="center">
18
  {#viewbrowser}
19
  </td>
20
  </tr>
@@ -30,13 +30,13 @@
30
  </td>
31
  </tr>
32
  <tr>
33
- <td width="600" style="min-width:600px;" valign="top" align="center">
34
  {#footer}
35
  </td>
36
  </tr>
37
  {if ! #hide_unsubscribe}
38
  <tr>
39
- <td width="600" style="min-width:600px;" valign="top" align="center">
40
  {#unsubscribe}
41
  </td>
42
  </tr>
1
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
2
+ <html xmlns="http://www.w3.org/1999/xhtml" {if #is_rtl} dir="rtl" {/if} >
3
  <head>
4
  <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
5
  <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
6
  <title>{#subject|default:Wysija template}</title>
7
  {#css}
8
  </head>
9
+ <body bgcolor="{#styles.html.background|color}" yahoo="fix">
10
  <span style="margin-bottom:0;margin-left:0;margin-right:0;margin-top:0;padding-bottom:0;padding-left:0;padding-right:0;padding-top:0;display:block;background:{#styles.html.background|color};">
11
  <table width="100%" cellpadding="0" cellspacing="0" border="0" id="wysija_wrapper">
12
  <tr>
14
  <table width="600" cellpadding="0" cellspacing="0" border="0" align="center">
15
  {if ! #hide_viewbrowser}
16
  <tr>
17
+ <td width="600" style="min-width:600px;" valign="top" align="center" {if #is_rtl} dir="rtl" {/if} >
18
  {#viewbrowser}
19
  </td>
20
  </tr>
30
  </td>
31
  </tr>
32
  <tr>
33
+ <td width="600" style="min-width:600px;" valign="top" align="center" {if #is_rtl} dir="rtl" {/if} >
34
  {#footer}
35
  </td>
36
  </tr>
37
  {if ! #hide_unsubscribe}
38
  <tr>
39
+ <td width="600" style="min-width:600px;" valign="top" align="center" {if #is_rtl} dir="rtl" {/if} >
40
  {#unsubscribe}
41
  </td>
42
  </tr>
views/back/campaigns.php CHANGED
@@ -2891,7 +2891,7 @@ class WYSIJA_view_back_campaigns extends WYSIJA_view_back {
2891
  $data = array();
2892
  $data['abouttext'] = __('You updated! It\'s like having the next gadget, but better.', WYSIJA);
2893
  // this is a flag to have a pretty clean update page where teh only call to action is our survey
2894
- $show_survey = false;
2895
 
2896
  $is_multisite = is_multisite();
2897
  $is_network_admin = WYSIJA::current_user_can('manage_network');
@@ -2905,49 +2905,15 @@ class WYSIJA_view_back_campaigns extends WYSIJA_view_back {
2905
  $model_config->save(array('wysija_whats_new' => WYSIJA::get_version()));
2906
  }
2907
 
2908
- // we figure that a major release is a 2.6 or 2.7 etc.. just one dot
2909
- $major_release = true;
2910
- $wysija_version = WYSIJA::get_version();
2911
- if (count(explode('.', $wysija_version)) > 2){
2912
- $major_release = false;
2913
- }
2914
-
2915
-
2916
-
2917
-
2918
- if ($major_release) {
2919
- $data['sections'][] = array(
2920
- 'title' => __('Added', WYSIJA),
2921
- 'cols' => array(
2922
- array(
2923
- 'key' => 'subscribers_profile',
2924
- 'title' => __('More subscriber fields', WYSIJA),
2925
- 'desc' => __('In our form editor, you can now add new fields such as gender, city, date of birth, etc.', WYSIJA).' [link]'.__('Test this feature in the form editor.',WYSIJA).'[/link]',
2926
- 'link' => 'admin.php?page=wysija_config#tab-forms',
2927
- ),
2928
- array(
2929
- 'key' => 'more_visual_editor',
2930
- 'title' => __('More options in editor', WYSIJA),
2931
- 'desc' => __('In our Visual Editor, you can now include the author name for each post.', WYSIJA) .' '.__('You can also set the default dimensions of the images of posts.', WYSIJA).' '.__('Finally, you can drop more than 1 post at once.', WYSIJA).' [link]'.__('Go and edit a newsletter to test it.',WYSIJA).'[/link]',
2932
- 'link' => 'admin.php?page=wysija_campaigns',
2933
- ),
2934
- array(
2935
- 'key' => 'more_stats',
2936
- 'title' => __('More stats', WYSIJA),
2937
- 'desc' => __('Premium users now have a dedicated Statistics page to monitor all of their newsletters and their subscribers\' activity, an essential tool to know your subscribers better.', WYSIJA).' [link]'.__('Discover more Premium features.',WYSIJA).'[/link]',
2938
- 'class' => 'new',
2939
- 'link' => 'admin.php?page=wysija_premium',
2940
- ),
2941
- ),
2942
- 'format' => 'three-col',
2943
- );
2944
- }
2945
 
2946
  // inject a poll in the what's new page
2947
- $data = $this->_inject_poll( $data );
 
 
2948
 
2949
  $msg = $model_config->getValue('ignore_msgs');
2950
- if (!isset($msg['ctaupdate']) && !$show_survey) {
2951
  $data['sections'][] = array(
2952
  'title' => __('Keep this plugin essentially free', WYSIJA),
2953
  'review' => array(
@@ -2964,6 +2930,15 @@ class WYSIJA_view_back_campaigns extends WYSIJA_view_back {
2964
  );
2965
  }
2966
 
 
 
 
 
 
 
 
 
 
2967
  if (isset($helper_readme->changelog[WYSIJA::get_version()])) {
2968
  $data['sections'][] = array(
2969
  'title' => __('Change log', WYSIJA),
@@ -3093,9 +3068,13 @@ class WYSIJA_view_back_campaigns extends WYSIJA_view_back {
3093
  </div>
3094
  <?php
3095
  }
 
 
 
 
3096
  ?>
3097
 
3098
- <a class="button-primary" href="admin.php?page=wysija_campaigns"><?php _e('Thanks! Now take me to MailPoet.', WYSIJA); ?></a>
3099
 
3100
  </div>
3101
 
@@ -3108,7 +3087,7 @@ class WYSIJA_view_back_campaigns extends WYSIJA_view_back {
3108
  * @param array $data
3109
  * @return array
3110
  */
3111
- function _inject_poll( $data ){
3112
  $polls_available = array( '7970424' ); // all polls' ids from polldaddy
3113
  $display_poll = 0; // poll id to display
3114
 
@@ -3150,7 +3129,32 @@ class WYSIJA_view_back_campaigns extends WYSIJA_view_back {
3150
  return $data;
3151
  }
3152
 
3153
- function _get_social_buttons($inline=true){
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
3154
 
3155
  if($inline){
3156
  $class=' class="socials removeme"';
2891
  $data = array();
2892
  $data['abouttext'] = __('You updated! It\'s like having the next gadget, but better.', WYSIJA);
2893
  // this is a flag to have a pretty clean update page where teh only call to action is our survey
2894
+ $show_survey = true;
2895
 
2896
  $is_multisite = is_multisite();
2897
  $is_network_admin = WYSIJA::current_user_can('manage_network');
2905
  $model_config->save(array('wysija_whats_new' => WYSIJA::get_version()));
2906
  }
2907
 
2908
+ $data = $this->_inject_alert( $data );
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
2909
 
2910
  // inject a poll in the what's new page
2911
+ if($show_survey === false){
2912
+ $data = $this->_inject_poll( $data );
2913
+ }
2914
 
2915
  $msg = $model_config->getValue('ignore_msgs');
2916
+ if ( !isset($msg['ctaupdate']) && $show_survey === false ) {
2917
  $data['sections'][] = array(
2918
  'title' => __('Keep this plugin essentially free', WYSIJA),
2919
  'review' => array(
2930
  );
2931
  }
2932
 
2933
+ if( $show_survey ){
2934
+ $data['sections'][] = array(
2935
+ 'title' => 'Answer our survey and make your plugin better',
2936
+
2937
+ 'content' => '<iframe frameborder="0" width="100%" height="600" scrolling="auto" allowtransparency="true" src="//mailpoet.polldaddy.com/s/mailpoet-survey-2014?iframe=1"><a href="//mailpoet.polldaddy.com/s/mailpoet-survey-2014">View Survey</a></iframe><hr/>',
2938
+ 'format' => 'title-content',
2939
+ );
2940
+ }
2941
+
2942
  if (isset($helper_readme->changelog[WYSIJA::get_version()])) {
2943
  $data['sections'][] = array(
2944
  'title' => __('Change log', WYSIJA),
3068
  </div>
3069
  <?php
3070
  }
3071
+ $link_class = 'button-primary';
3072
+ if($show_survey){
3073
+ $link_class = 'button-secondary';
3074
+ }
3075
  ?>
3076
 
3077
+ <a class="<?php echo $link_class ?>" href="admin.php?page=wysija_campaigns"><?php _e('Thanks! Now take me to MailPoet.', WYSIJA); ?></a>
3078
 
3079
  </div>
3080
 
3087
  * @param array $data
3088
  * @return array
3089
  */
3090
+ private function _inject_poll( $data ){
3091
  $polls_available = array( '7970424' ); // all polls' ids from polldaddy
3092
  $display_poll = 0; // poll id to display
3093
 
3129
  return $data;
3130
  }
3131
 
3132
+ private function _inject_alert( $data ){
3133
+ if ( WYSIJA::current_user_can( 'install_plugins' ) && version_compare( PHP_VERSION , '5.3' , '<' )) {
3134
+
3135
+ $data['abouttext'] .= '</div><div class="mp_php_alert">
3136
+ <h3>'.__('Hey! Your site is running an old software!', WYSIJA).'</h3>
3137
+ <ul>
3138
+ <li> '.__('MailPoet is modernizing itself in the coming months.',WYSIJA).'</li>
3139
+ <li>'.__("In order to enjoy our latest enhancements, you'll need to ask your hosting company to update your site.",WYSIJA).'</li>
3140
+
3141
+ <li>'.' <h4>'.__("What are the benefits of updating my site now?",WYSIJA).'</h4>'.'</li>
3142
+ <li>
3143
+ <ol>
3144
+ <li>'.__("Your website will be more secure, running an updated software.",WYSIJA).'</li>
3145
+ <li>'.__("Your MailPoet will be more performant, scalable and reliable.",WYSIJA).'</li>
3146
+ <li>'.__("You will be one-step closer to the next generation of WordPress coming in 2015 which will require more recent software.",WYSIJA).'</li>
3147
+ </ol>
3148
+ </li>
3149
+ <li><h4>'.__("Ready to Update your site?",WYSIJA).'</h4></li>
3150
+ <li><a href="http://support.mailpoet.com/knowledgebase/how-to-prepare-my-site-for-mailpoet-3-0" target="_blank">'.__("Yes, please guide me!",WYSIJA).'</a> - <a href="http://support.mailpoet.com/?utm_source=wpadmin&utm_medium=plugin&utm_campaign=contact_php_update" class="mp_negative" target="_blank">'.__("No, I have a few concerns...",WYSIJA).'</a></li>
3151
+ </ul>';
3152
+
3153
+ }
3154
+ return $data;
3155
+ }
3156
+
3157
+ private function _get_social_buttons($inline=true){
3158
 
3159
  if($inline){
3160
  $class=' class="socials removeme"';
views/back/config.php CHANGED
@@ -199,20 +199,6 @@ class WYSIJA_view_back_config extends WYSIJA_view_back {
199
  return $field;
200
  }
201
 
202
- function fieldFormHTML_betamode($key, $value, $model) {
203
- // second part concerning the checkbox
204
- $formsHelp = WYSIJA::get('forms', 'helper');
205
- $checked = false;
206
- if ($this->model->getValue($key))
207
- $checked = true;
208
- $field = '<p>';
209
- $field.=$formsHelp->radios(array( 'id' => $key, 'name' => 'wysija['.$model.']['.$key.']', 'class' => 'activateInput' ), array( true => __('Yes', WYSIJA), false => __('No', WYSIJA) ), $checked);
210
- $value = $this->model->getValue($key.'_linkname');
211
-
212
-
213
- return $field;
214
- }
215
-
216
  function fieldFormHTML_cron($key, $value, $model) {
217
  //second part concerning the checkbox
218
  $helper_forms = WYSIJA::get('forms', 'helper');
@@ -723,16 +709,7 @@ class WYSIJA_view_back_config extends WYSIJA_view_back {
723
  <table class="form-table">
724
  <tbody>
725
  <?php
726
- // display that premium is activated
727
- if (WYSIJA::is_plugin_active('wysija-newsletters-premium/index.php') && $this->model->getValue('premium_key')) {
728
- ?>
729
- <tr>
730
- <td class="premium_activated" colspan="2">
731
- <i class="dashicons dashicons-awards"></i><?php echo __('Your Premium is activated.', WYSIJA); ?>
732
- </td>
733
- </tr>
734
- <?php
735
- }
736
  echo $this->buildMyForm($step, $model_config->values, 'config');
737
  ?>
738
  </tbody>
@@ -1220,23 +1197,6 @@ class WYSIJA_view_back_config extends WYSIJA_view_back {
1220
  'label' => __('Industry', WYSIJA),
1221
  'desc' => __('Select your industry.', WYSIJA) );
1222
 
1223
- $beta_mode_field = array(
1224
- 'rowclass' => 'beta_mode',
1225
- 'row_id' => 'beta_mode_setting',
1226
- 'type' => 'betamode',
1227
- 'values' => array( true => __('Yes', WYSIJA), false => __('No', WYSIJA) ),
1228
- 'label' => __('Become a beta tester', WYSIJA),
1229
- 'desc' => __('Update your MailPoet plugin to the latest beta version. Enjoy the upcoming features. [link]Get in touch[/link] with us for bugs and feedback. Only for experienced users!', WYSIJA),
1230
- 'link' => '<a target="_blank" href="http://support.mailpoet.com/feedback/?utm_source=wpadmin&utm_campaign=become_a_beta_tester">'
1231
- );
1232
- // only allow the beta mode to network administrators in multisite
1233
- if (is_multisite()) {
1234
- if (WYSIJA::current_user_can('manage_network'))
1235
- $advanced_fields ['ms_beta_mode'] = $beta_mode_field;
1236
- }else {
1237
- $advanced_fields ['beta_mode'] = $beta_mode_field;
1238
- }
1239
-
1240
  $super_advanced_fields ['subscribers_count'] = array(
1241
  'type' => 'subscribers_count',
1242
  'label' => __('Shortcode to display total number of subscribers', WYSIJA),
199
  return $field;
200
  }
201
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
202
  function fieldFormHTML_cron($key, $value, $model) {
203
  //second part concerning the checkbox
204
  $helper_forms = WYSIJA::get('forms', 'helper');
709
  <table class="form-table">
710
  <tbody>
711
  <?php
712
+ do_action('mailpoet_pre_config_screen');
 
 
 
 
 
 
 
 
 
713
  echo $this->buildMyForm($step, $model_config->values, 'config');
714
  ?>
715
  </tbody>
1197
  'label' => __('Industry', WYSIJA),
1198
  'desc' => __('Select your industry.', WYSIJA) );
1199
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1200
  $super_advanced_fields ['subscribers_count'] = array(
1201
  'type' => 'subscribers_count',
1202
  'label' => __('Shortcode to display total number of subscribers', WYSIJA),
views/back/subscribers.php CHANGED
@@ -999,7 +999,7 @@ class WYSIJA_view_back_subscribers extends WYSIJA_view_back
999
 
1000
  // we try to automatically match columns with previous matches recorded in the past
1001
  $import_fields = get_option('wysija_import_fields');
1002
- if (isset($import_fields[$column_name_key]))
1003
  {
1004
  $selected = $import_fields[$column_name_key];
1005
  }
999
 
1000
  // we try to automatically match columns with previous matches recorded in the past
1001
  $import_fields = get_option('wysija_import_fields');
1002
+ if (isset($import_fields[$column_name_key]) && substr($import_fields[$column_name_key], 0, 10) != 'new_field|')
1003
  {
1004
  $selected = $import_fields[$column_name_key];
1005
  }