SendinBlue Subscribe Form And WP SMTP - Version 3.1.45

Version Description

  • Resolved conflict of the sender when both WooCommerce SMTP and Sendinblue SMTP are enabled.
Download this release

Release Info

Developer gouravgupta24
Plugin Icon 128x128 SendinBlue Subscribe Form And WP SMTP
Version 3.1.45
Comparing to
See all releases

Code changes from version 3.1.44 to 3.1.45

Files changed (4) hide show
  1. inc/SendinblueApiClient.php +1 -1
  2. inc/sib-api-manager.php +11 -0
  3. readme.txt +4 -1
  4. sendinblue.php +1 -1
inc/SendinblueApiClient.php CHANGED
@@ -14,7 +14,7 @@ class SendinblueApiClient
14
  const RESPONSE_CODE_CREATED = 201;
15
  const RESPONSE_CODE_ACCEPTED = 202;
16
  const RESPONSE_CODE_UNAUTHORIZED = 401;
17
- const PLUGIN_VERSION = '3.1.44';
18
  const USER_AGENT = 'sendinblue_plugins/wordpress';
19
 
20
  private $apiKey;
14
  const RESPONSE_CODE_CREATED = 201;
15
  const RESPONSE_CODE_ACCEPTED = 202;
16
  const RESPONSE_CODE_UNAUTHORIZED = 401;
17
+ const PLUGIN_VERSION = '3.1.45';
18
  const USER_AGENT = 'sendinblue_plugins/wordpress';
19
 
20
  private $apiKey;
inc/sib-api-manager.php CHANGED
@@ -276,6 +276,17 @@ if ( ! class_exists( 'SIB_API_Manager' ) ) {
276
  $data['sender']['name'] = $home_options['from_name'];
277
  }
278
  }
 
 
 
 
 
 
 
 
 
 
 
279
 
280
  $result = $mailin->sendEmail( $data );
281
  if (SendinblueApiClient::RESPONSE_CODE_CREATED == $mailin->getLastResponseCode()) {
276
  $data['sender']['name'] = $home_options['from_name'];
277
  }
278
  }
279
+ $mail_setting = get_option('wc_sendinblue_settings', array());
280
+ $sib_wc_plugin = is_plugin_active(
281
+ 'woocommerce-sendinblue-newsletter-subscription/woocommerce-sendinblue.php'
282
+ );
283
+
284
+ if ( ! empty($mail_setting) && isset($mail_setting['ws_smtp_enable']) && 'yes' == $mail_setting['ws_smtp_enable'] && $sib_wc_plugin === true) {
285
+ $from_email = trim(get_bloginfo('admin_email'));
286
+ $from_name = trim(get_bloginfo('name'));
287
+ $data['sender']['email'] = apply_filters('wp_mail_from', $from_email);
288
+ $data['sender']['name'] = apply_filters('wp_mail_from_name', $from_name);
289
+ }
290
 
291
  $result = $mailin->sendEmail( $data );
292
  if (SendinblueApiClient::RESPONSE_CODE_CREATED == $mailin->getLastResponseCode()) {
readme.txt CHANGED
@@ -4,7 +4,7 @@ Tags: Email Marketing, Newsletter, Sendinblue, Forms, smtp, marketing automation
4
  Requires at least: 4.4
5
  Tested up to: 6.0
6
  Requires PHP: 5.6
7
- Stable tag: 3.1.44
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -116,6 +116,9 @@ In order to create a signup form, you need to:
116
 
117
  == Changelog ==
118
 
 
 
 
119
  = 3.1.44 =
120
  * Updated text message for marketing automation activation for new users.
121
 
4
  Requires at least: 4.4
5
  Tested up to: 6.0
6
  Requires PHP: 5.6
7
+ Stable tag: 3.1.45
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
116
 
117
  == Changelog ==
118
 
119
+ = 3.1.45 =
120
+ * Resolved conflict of the sender when both WooCommerce SMTP and Sendinblue SMTP are enabled.
121
+
122
  = 3.1.44 =
123
  * Updated text message for marketing automation activation for new users.
124
 
sendinblue.php CHANGED
@@ -3,7 +3,7 @@
3
  * Plugin Name: Newsletter, SMTP, Email marketing and Subscribe forms by Sendinblue
4
  * Plugin URI: https://www.sendinblue.com/?r=wporg
5
  * Description: Manage your contact lists, subscription forms and all email and marketing-related topics from your wp panel, within one single plugin
6
- * Version: 3.1.44
7
  * Author: Sendinblue
8
  * Author URI: https://www.sendinblue.com/?r=wporg
9
  * License: GPLv2 or later
3
  * Plugin Name: Newsletter, SMTP, Email marketing and Subscribe forms by Sendinblue
4
  * Plugin URI: https://www.sendinblue.com/?r=wporg
5
  * Description: Manage your contact lists, subscription forms and all email and marketing-related topics from your wp panel, within one single plugin
6
+ * Version: 3.1.45
7
  * Author: Sendinblue
8
  * Author URI: https://www.sendinblue.com/?r=wporg
9
  * License: GPLv2 or later