Newsletter - Version 6.0.8

Version Description

  • Specific link tracking patch for ElasticEmail
  • Compatibility code for WP 4.7
  • Fixed minimal widget subscribe button
Download this release

Release Info

Developer satollo
Plugin Icon 128x128 Newsletter
Version 6.0.8
Comparing to
See all releases

Code changes from version 6.0.7 to 6.0.8

Files changed (6) hide show
  1. emails/tnp-composer/index.php +3 -2
  2. includes/fields.php +11 -3
  3. plugin.php +2 -2
  4. readme.txt +20 -10
  5. statistics/statistics.php +6 -1
  6. widget/minimal.php +3 -4
emails/tnp-composer/index.php CHANGED
@@ -140,5 +140,6 @@ $block_options = get_option('newsletter_main');
140
 
141
  <?php include NEWSLETTER_DIR . '/emails/subjects.php'; ?>
142
 
143
- <script xsrc="<?php echo plugins_url('newsletter') ?>/vendor/tinymce/tinymce.min.js"></script>
144
- <?php wp_enqueue_editor(); ?>
 
140
 
141
  <?php include NEWSLETTER_DIR . '/emails/subjects.php'; ?>
142
 
143
+ <!--<script src="<?php echo plugins_url('newsletter') ?>/vendor/tinymce/tinymce.min.js"></script>-->
144
+
145
+ <?php if (function_exists('wp_enqueue_editor')) wp_enqueue_editor(); ?>
includes/fields.php CHANGED
@@ -106,6 +106,8 @@ class NewsletterFields {
106
  }
107
 
108
  public function wp_editor($name, $label = '', $attrs = array()) {
 
 
109
  $attrs = $this->_merge_attrs($attrs);
110
  $this->_open();
111
  $this->_label($label);
@@ -113,11 +115,17 @@ class NewsletterFields {
113
  if (is_array($value)) {
114
  $value = implode("\n", $value);
115
  }
 
 
 
116
  echo '<textarea id="options-' . esc_attr($name) . '" name="options[' . esc_attr($name) . ']" style="width: 100%;height:250px">';
117
  echo esc_html($value);
118
  echo '</textarea>';
119
- echo '<script>wp.editor.remove("options-', $name, '");';
120
- echo 'wp.editor.initialize("options-', $name, '", { tinymce: {toolbar1: "undo redo | formatselect fontselect fontsizeselect | bold italic forecolor backcolor | link unlink | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | removeformat | help", fontsize_formats: "11px 12px 14px 16px 18px 24px 36px 48px", plugins: "link textcolor colorpicker", default_link_target: "_blank", relative_urls : false, convert_urls: false}});</script>';
 
 
 
121
  $this->_description($attrs);
122
  $this->_close();
123
  }
@@ -268,7 +276,7 @@ class NewsletterFields {
268
 
269
  $this->select($name, $label, $options);
270
  }
271
-
272
  function lists($name, $label, $attrs = array()) {
273
  $attrs = $this->_merge_attrs($attrs);
274
  $this->_open();
106
  }
107
 
108
  public function wp_editor($name, $label = '', $attrs = array()) {
109
+ global $wp_version;
110
+
111
  $attrs = $this->_merge_attrs($attrs);
112
  $this->_open();
113
  $this->_label($label);
115
  if (is_array($value)) {
116
  $value = implode("\n", $value);
117
  }
118
+ if (version_compare($wp_version, '4.8', '<')) {
119
+ echo '<p><strong>Rich editor available only with WP 4.8+</strong></p>';
120
+ }
121
  echo '<textarea id="options-' . esc_attr($name) . '" name="options[' . esc_attr($name) . ']" style="width: 100%;height:250px">';
122
  echo esc_html($value);
123
  echo '</textarea>';
124
+
125
+ if (version_compare($wp_version, '4.8', '>=')) {
126
+ echo '<script>wp.editor.remove("options-', $name, '");';
127
+ echo 'wp.editor.initialize("options-', $name, '", { tinymce: {toolbar1: "undo redo | formatselect fontselect fontsizeselect | bold italic forecolor backcolor | link unlink | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | removeformat | help", fontsize_formats: "11px 12px 14px 16px 18px 24px 36px 48px", plugins: "link textcolor colorpicker", default_link_target: "_blank", relative_urls : false, convert_urls: false}});</script>';
128
+ }
129
  $this->_description($attrs);
130
  $this->_close();
131
  }
276
 
277
  $this->select($name, $label, $options);
278
  }
279
+
280
  function lists($name, $label, $attrs = array()) {
281
  $attrs = $this->_merge_attrs($attrs);
282
  $this->_open();
plugin.php CHANGED
@@ -4,7 +4,7 @@
4
  Plugin Name: Newsletter
5
  Plugin URI: https://www.thenewsletterplugin.com/plugins/newsletter
6
  Description: Newsletter is a cool plugin to create your own subscriber list, to send newsletters, to build your business. <strong>Before update give a look to <a href="https://www.thenewsletterplugin.com/category/release">this page</a> to know what's changed.</strong>
7
- Version: 6.0.7
8
  Author: Stefano Lissa & The Newsletter Team
9
  Author URI: https://www.thenewsletterplugin.com
10
  Disclaimer: Use at your own risk. No warranty expressed or implied is provided.
@@ -29,7 +29,7 @@
29
  */
30
 
31
  // Used as dummy parameter on css and js links
32
- define('NEWSLETTER_VERSION', '6.0.7');
33
 
34
  global $newsletter, $wpdb;
35
 
4
  Plugin Name: Newsletter
5
  Plugin URI: https://www.thenewsletterplugin.com/plugins/newsletter
6
  Description: Newsletter is a cool plugin to create your own subscriber list, to send newsletters, to build your business. <strong>Before update give a look to <a href="https://www.thenewsletterplugin.com/category/release">this page</a> to know what's changed.</strong>
7
+ Version: 6.0.8
8
  Author: Stefano Lissa & The Newsletter Team
9
  Author URI: https://www.thenewsletterplugin.com
10
  Disclaimer: Use at your own risk. No warranty expressed or implied is provided.
29
  */
30
 
31
  // Used as dummy parameter on css and js links
32
+ define('NEWSLETTER_VERSION', '6.0.8');
33
 
34
  global $newsletter, $wpdb;
35
 
readme.txt CHANGED
@@ -1,8 +1,8 @@
1
  === Newsletter ===
2
  Tags: email, email marketing, newsletter, newsletter subscribers, welcome email, signup forms, contact, lead generation, popup, marketing automation
3
  Requires at least: 3.4.0
4
- Tested up to: 5.2.1
5
- Stable tag: 6.0.7
6
  Contributors: satollo,webagile,michael-travan
7
 
8
  Add a real newsletter system to your blog. For free. With unlimited newsletters and subscribers.
@@ -50,27 +50,25 @@ Improve The Newsletter Plugin with these free addons:
50
  * [Archive](https://www.thenewsletterplugin.com/documentation/archive-extension) - creates a simple blog page which lists all your sent newsletters
51
  * [Locked Content](https://www.thenewsletterplugin.com/documentation/locked-content-extension) - open up your premium content only after subscription
52
  * [Newsletter REST API](https://www.thenewsletterplugin.com/developers/dev-newsletter-api) - adds a tier of REST api to integrate with the Newsletter core services
53
- * BuddyPress integration - subscription opt-in inside BuddyPress signup form
54
 
55
- (*easily add them from our [Addons panel](https://www.thenewsletterplugin.com/documentation/install-extensions)*)
56
 
57
  = Professional Addons =
58
 
59
  Need *more power*? Feel *something's missing*? The Newsletter Plugin features can be easily extended through our **premium, professional Addons**! Let us introduce just two of them : )
60
 
61
- * Extended Composer Blocks - adds new blocks to the drag & drop composer
62
- * [WooCommerce Integration](https://www.thenewsletterplugin.com/woocommerce) - subscribe customers to a mailing list and generate product newletters.
63
- * [Reports](https://www.thenewsletterplugin.com/reports) - improves the internal statistics collection system and provides better reports of data collected for each sent email. And retargeting. Neat.
64
  * [Automated](https://www.thenewsletterplugin.com/automated) - generates and sends your newsletters using your blog last posts, even custom ones like events or products. Just sit and watch!
65
- * [Autoresponder](https://www.thenewsletterplugin.com/autoresponder) - creates email series to follow up your subscribers
66
- * [Leads](https://www.thenewsletterplugin.com/leads) adds a fancy subscription popup box or a fixed bar to your website that will boost your conversion rate
67
  * [Amazon SES and other mail providers integration](https://www.thenewsletterplugin.com/integrations) - seamlessly integrate Amazon SES and other email service providers with The Newsletter Plugin. Hassle-free.
68
  * [Contact Form 7 Integration](https://www.thenewsletterplugin.com/documentation/contact-form-7-extension) - integrate the subscription on Contact Form 7 forms
69
  * [Ninja Forms Integration](https://www.thenewsletterplugin.com/documentation/ninjaforms-extension) - integrate the subscription on Ninja Forms
 
70
  * [WP Forms Integration](https://www.thenewsletterplugin.com/documentation/wpforms-extension) - integrate the subscription on WP Forms
71
- * Events Manager and The Events Calendar (By Modern Tribe) integrations - easily add events to your newsletters
72
  * [Google Analytics](https://www.thenewsletterplugin.com/google-analytics) - track newsletter links with Google UTM tracking paramaters
73
  * [Subscribe on Comment](https://www.thenewsletterplugin.com/documentation/comments-extension) - adds the subscription option to your blog comment form
 
74
  * [Geolocation](https://www.thenewsletterplugin.com/documentation/geolocation-extension) - adds geolocation capability to target subscribers by location
75
 
76
  = GDPR =
@@ -91,6 +89,12 @@ Premium Users with an active license have access to one-to-one support via our [
91
  * **Our Facebook Page** - [https://www.facebook.com/thenewsletterplugin](https://www.facebook.com/thenewsletterplugin)
92
  * **Our Twitter Account** - [https://twitter.com/newsletterwp](https://twitter.com/newsletterwp)
93
 
 
 
 
 
 
 
94
  == Frequently Asked Questions ==
95
 
96
  See the [Newsletter FAQ](https://www.thenewsletterplugin.com/plugins/newsletter/newsletter-faq) or the
@@ -108,6 +112,12 @@ Thank you, The Newsletter Team
108
 
109
  == Changelog ==
110
 
 
 
 
 
 
 
111
  = 6.0.7 =
112
 
113
  * Fixed the wrong edit mode of duplicated newsletters
1
  === Newsletter ===
2
  Tags: email, email marketing, newsletter, newsletter subscribers, welcome email, signup forms, contact, lead generation, popup, marketing automation
3
  Requires at least: 3.4.0
4
+ Tested up to: 5.2.2
5
+ Stable tag: 6.0.8
6
  Contributors: satollo,webagile,michael-travan
7
 
8
  Add a real newsletter system to your blog. For free. With unlimited newsletters and subscribers.
50
  * [Archive](https://www.thenewsletterplugin.com/documentation/archive-extension) - creates a simple blog page which lists all your sent newsletters
51
  * [Locked Content](https://www.thenewsletterplugin.com/documentation/locked-content-extension) - open up your premium content only after subscription
52
  * [Newsletter REST API](https://www.thenewsletterplugin.com/developers/dev-newsletter-api) - adds a tier of REST api to integrate with the Newsletter core services
 
53
 
54
+ (*easily add them from our Addons panel*)
55
 
56
  = Professional Addons =
57
 
58
  Need *more power*? Feel *something's missing*? The Newsletter Plugin features can be easily extended through our **premium, professional Addons**! Let us introduce just two of them : )
59
 
60
+ * [Reports](https://www.thenewsletterplugin.com/reports) - improves the internal statistics collection system and provides better reports of data collected for each sent email. And retargeting. Neat.
 
 
61
  * [Automated](https://www.thenewsletterplugin.com/automated) - generates and sends your newsletters using your blog last posts, even custom ones like events or products. Just sit and watch!
62
+ * [Autoresponder](https://www.thenewsletterplugin.com/autorespoder) - creates email series to follow up your subscribers
63
+ * [WooCommerce Integration](https://www.thenewsletterplugin.com/woocommerce) - subscribe customers to a mailing list and generate product newletters.
64
  * [Amazon SES and other mail providers integration](https://www.thenewsletterplugin.com/integrations) - seamlessly integrate Amazon SES and other email service providers with The Newsletter Plugin. Hassle-free.
65
  * [Contact Form 7 Integration](https://www.thenewsletterplugin.com/documentation/contact-form-7-extension) - integrate the subscription on Contact Form 7 forms
66
  * [Ninja Forms Integration](https://www.thenewsletterplugin.com/documentation/ninjaforms-extension) - integrate the subscription on Ninja Forms
67
+ * Events Manager and The Events Calendar integrations - add events to your newsletters
68
  * [WP Forms Integration](https://www.thenewsletterplugin.com/documentation/wpforms-extension) - integrate the subscription on WP Forms
 
69
  * [Google Analytics](https://www.thenewsletterplugin.com/google-analytics) - track newsletter links with Google UTM tracking paramaters
70
  * [Subscribe on Comment](https://www.thenewsletterplugin.com/documentation/comments-extension) - adds the subscription option to your blog comment form
71
+ * Extended Composer Blocks - adds new blocks to the composer
72
  * [Geolocation](https://www.thenewsletterplugin.com/documentation/geolocation-extension) - adds geolocation capability to target subscribers by location
73
 
74
  = GDPR =
89
  * **Our Facebook Page** - [https://www.facebook.com/thenewsletterplugin](https://www.facebook.com/thenewsletterplugin)
90
  * **Our Twitter Account** - [https://twitter.com/newsletterwp](https://twitter.com/newsletterwp)
91
 
92
+ == Installation ==
93
+
94
+ 1. Put the plug-in folder into [wordpress_dir]/wp-content/plugins/
95
+ 2. Go into the WordPress admin interface and activate the plugin
96
+ 3. Optional: go to the options page and configure the plugin
97
+
98
  == Frequently Asked Questions ==
99
 
100
  See the [Newsletter FAQ](https://www.thenewsletterplugin.com/plugins/newsletter/newsletter-faq) or the
112
 
113
  == Changelog ==
114
 
115
+ = 6.0.8 =
116
+
117
+ * Specific link tracking patch for ElasticEmail
118
+ * Compatibility code for WP 4.7
119
+ * Fixed minimal widget subscribe button
120
+
121
  = 6.0.7 =
122
 
123
  * Fixed the wrong edit mode of duplicated newsletters
statistics/statistics.php CHANGED
@@ -206,7 +206,12 @@ class NewsletterStatistics extends NewsletterModule {
206
  $href = trim(str_replace('&amp;', '&', $matches[2]));
207
 
208
  // Do not replace the tracking or subscription/unsubscription links.
209
- if (strpos($href, '/newsletter/') !== false) {
 
 
 
 
 
210
  return $matches[0];
211
  }
212
 
206
  $href = trim(str_replace('&amp;', '&', $matches[2]));
207
 
208
  // Do not replace the tracking or subscription/unsubscription links.
209
+ //if (strpos($href, '/newsletter/') !== false) {
210
+ // return $matches[0];
211
+ //}
212
+
213
+ // Do not replace URL which are tags (special case for ElasticEmail)
214
+ if (strpos($href, '{') === 0) {
215
  return $matches[0];
216
  }
217
 
widget/minimal.php CHANGED
@@ -29,12 +29,11 @@ class NewsletterWidgetMinimal extends WP_Widget {
29
  echo $before_title . $title . $after_title;
30
  }
31
 
32
- if (empty($instance['button'])) {
33
- $instance['button'] = 'Subscribe';
34
- }
35
-
36
  $options_profile = NewsletterSubscription::instance()->get_options('profile', $current_language);
37
 
 
 
 
38
 
39
  $form = '<div class="tnp tnp-widget-minimal">';
40
  $form .= '<form class="tnp-form" action="' . $newsletter->build_action_url('s') . '" method="post" onsubmit="return newsletter_check(this)">';
29
  echo $before_title . $title . $after_title;
30
  }
31
 
 
 
 
 
32
  $options_profile = NewsletterSubscription::instance()->get_options('profile', $current_language);
33
 
34
+ if (empty($instance['button'])) {
35
+ $instance['button'] = $options_profile['subscribe'];
36
+ }
37
 
38
  $form = '<div class="tnp tnp-widget-minimal">';
39
  $form .= '<form class="tnp-form" action="' . $newsletter->build_action_url('s') . '" method="post" onsubmit="return newsletter_check(this)">';