Changeset 1866512

Timestamp:

04/30/2018 02:50:25 PM (8 years ago)

Author:

sparkpost

Message:

Release of v3.2.0

Location:

sparkpost/trunk

Files:

• admin.widget.class.php (modified) (3 diffs)
• mailer.http.class.php (modified) (2 diffs)
• mailer.smtp.class.php (modified) (2 diffs)
• readme.txt (modified) (4 diffs)
• sparkpost.class.php (modified) (3 diffs)
• templates.class.php (modified) (1 diff)
• tests/specs/test-sparkpost.class.php (modified) (1 diff)
• tests/specs/test-wordpress-sparkpost.php (modified) (1 diff)
• wordpress-sparkpost.php (modified) (2 diffs)

sparkpost/trunk/admin.widget.class.php

@@ -262 +262 @@
         add_settings_field('sending_method', 'Method*', array($this, 'render_sending_method_field'), 'sp-options-basic', 'general');
         add_settings_field('password', 'API Key*', array($this, 'render_password_field'), 'sp-options-basic', 'general');
+        add_settings_field('location', 'API Location', array($this, 'render_location_field'), 'sp-options-basic', 'general' );
         add_settings_field('template', 'Template', array($this, 'render_template_field'), 'sp-options-basic', 'general');
 
@@ -288 +289 @@
         } else {
             $new_input['template'] = '';
+        }
+
+        if (isset($input['location'])) {
+            $new_input['location'] = sanitize_text_field($input['location']);
+        } else {
+            $new_input['location'] = '';
         }
 
@@ -448 +455 @@
     }
 
+    public function render_location_field()
+    {
+        $selected = !empty($this->settings['location']) ? esc_attr($this->settings['location']) : '';
+
+        echo '<select name="sp_settings_basic[location]">
+        <option value="" ' . (($selected === '') ? 'selected' : '') . '>Worldwide</option>
+        <option value="eu" ' . (($selected === 'eu') ? 'selected' : '') . '>EU</option>
+        </select>';
+    }
+
     public function render_enable_tracking_field()
     {

sparkpost/trunk/mailer.http.class.php

@@ -11 +11 @@
 class SparkPostHTTPMailer extends \PHPMailer
 {
-    public $endpoint = 'https://api.sparkpost.com/api/v1/transmissions';
+    public $endpoint;
     public $wp_mail_args;
     private $settings;
@@ -23 +23 @@
         $this->settings = SparkPost::get_settings();
         $this->template = new SparkPostTemplates($this);
+        $this->endpoint = apply_filters('sp_hostname', 'api') . '/api/v1/transmissions';
 
         parent::__construct($exceptions);

sparkpost/trunk/mailer.smtp.class.php

@@ -11 +11 @@
 class SparkPostSMTPMailer
 {
-
     public function __construct()
     {
@@ -40 +39 @@
         $phpmailer->SMTPSecure = 'tls';
         $phpmailer->Port = !empty($settings['port']) ? intval($settings['port']) : 587;
-        $phpmailer->Host = 'smtp.sparkpostmail.com';
+        $phpmailer->Host = apply_filters('sp_hostname', 'smtp');
         $phpmailer->SMTPAuth = true;
         $phpmailer->Username = 'SMTP_Injection';

sparkpost/trunk/readme.txt

@@ -3 +3 @@
 Tags: sparkpost, smtp, wp_mail, mail, email
 Requires at least: 4.3
-Tested up to: 4.9.4
-Stable tag: 3.1.1
+Tested up to: 4.9.5
+Stable tag: 3.2.0
 License: GPLv2 or later
 
@@ -12 +12 @@
 The [SparkPost](https://www.sparkpost.com/) email delivery service offers best in class deliverability to ensure your mail hits the inbox, live analytics to review, track and optimize your email activities, as well as highest performance when you need it most: always.
 
-When the SparkPost plugin is enabled, all outgoing email from your WordPress installation is sent through your SparkPost service.  From within [the SparkPost UI](https://app.sparkpost.com/), you can then watch your campaigns unfold live by tracking your engagement metrics, learn what your audience responds to and even integrate more deeply with your app using the SparkPost API.
+When the SparkPost plugin is enabled, all outgoing email from your WordPress installation is sent through your SparkPost service.  From within [the SparkPost UI](https://app.sparkpost.com/) or [SparkPost EU UI](https://app.eu.sparkpost.com/), you can then watch your campaigns unfold live by tracking your engagement metrics, learn what your audience responds to and even integrate more deeply with your app using the SparkPost API.
 
 **Requirements**
@@ -42 +42 @@
 
 = What do I need to start using this plugin? =
-You'll need to create an account on SparkPost.com and then generate an API Key with *Send via SMTP* and *Transmission Read/Write* permissions. Creating an account is completely free. Visit [SparkPost](https://app.sparkpost.com/sign-up) to signup.
+You'll need to create an account on SparkPost.com and then generate an API Key with *Send via SMTP* and *Transmission Read/Write* permissions. Creating an account is completely free. Visit [SparkPost](https://app.sparkpost.com/join) to signup (https://app.eu.sparkpost.com/ for EU).
 
 = How do I create an API key? =
@@ -52 +52 @@
 
 == Changelog ==
+= 3.2.0 =
+- Add support for EU hostnames ([141](https://github.com/SparkPost/wordpress-sparkpost/pull/141))
+
 = 3.1.1 =
 - Avoid db checking if email logging is not enabled

sparkpost/trunk/sparkpost.class.php

@@ -22 +22 @@
         'template' => '',
         'transactional' => false,
-        'log_emails' => false
+        'log_emails' => false,
+        'location' => 'us'
+    );
+
+    protected $hostnames = array(
+        'us' => array(
+            'api' => 'https://api.sparkpost.com',
+            'smtp' => 'smtp.sparkpostmail.com'
+        ),
+        'eu' => array(
+            'api' => 'https://api.eu.sparkpost.com',
+            'smtp' => 'smtp.eu.sparkpostmail.com'
+        )
     );
 
@@ -41 +53 @@
             add_filter('wp_mail_from', array($this, 'set_from_email'));
             add_filter('wp_mail_from_name', array($this, 'set_from_name'));
+            add_filter('sp_hostname', array($this, 'get_hostname'));
         }
 
@@ -154 +167 @@
     }
 
+    public function get_hostname($type = 'api')
+    {
+        $location = !empty($this->settings['location']) ? esc_attr($this->settings['location']) : 'us';
+        return $this->hostnames[$location][$type];
+    }
+
     static function obfuscate_api_key($api_key)
     {

sparkpost/trunk/templates.class.php

@@ -8 +8 @@
 class SparkPostTemplates
 {
-    public $endpoint = 'https://api.sparkpost.com/api/v1/templates';
+    public $endpoint;
 
     public function __construct($mailer)
     {
         $this->mailer = $mailer;
+        
+        $this->endpoint = apply_filters('sp_hostname', 'api') . '/api/v1/templates';
     }
 
     public function preview($id, $substitution_data)
     {
-        $url = "{$this->endpoint}/{$id}/preview?draft=false";
+        $endpoint = apply_filters('sp_api_location', $this->endpoint);
+        $url = "{$endpoint}/{$id}/preview?draft=false";
 
         $body = array(

sparkpost/trunk/tests/specs/test-sparkpost.class.php

@@ -29 +29 @@
         $this->assertFalse(SparkPost::is_sandbox('[email protected]'));
     }
+
+    function test_us_hostnames() {
+        $us_api = 'https://api.sparkpost.com';
+        $us_smtp = 'smtp.sparkpostmail.com';
+
+        $this->assertTrue($this->SparkPost->get_hostname('api') === $us_api);
+        $this->assertTrue($this->SparkPost->get_hostname() === $us_api);
+        $this->assertTrue($this->SparkPost->get_hostname('smtp') === 'smtp.sparkpostmail.com');
+    }
+
+    function test_eu_hostnames() {
+        $eu_api = 'https://api.eu.sparkpost.com';
+        $eu_smtp = 'smtp.eu.sparkpostmail.com';
+
+        $this->SparkPost->settings['location'] = 'eu';
+
+        $this->assertTrue($this->SparkPost->get_hostname('api') === 'https://api.eu.sparkpost.com');
+        $this->assertTrue($this->SparkPost->get_hostname('smtp') === 'smtp.eu.sparkpostmail.com');
+    }
 }

sparkpost/trunk/tests/specs/test-wordpress-sparkpost.php

@@ -3 +3 @@
  * @package wp-sparkpost
  */
-
 namespace WPSparkPost;
 
 class TestWordPressSparkPost extends \WP_UnitTestCase {
 
-    function test_plugin_dir_constants() {
-        $this->assertTrue( defined('WPSP_PLUGIN_DIR') );
-    }
+    function test_plugin_dir_constants() {
+        $this->assertTrue( defined('WPSP_PLUGIN_DIR') );
+    }
 
-  function test_plugin_path_constants() {
-        $this->assertTrue( defined('WPSP_PLUGIN_PATH') );
-    $this->assertTrue( strpos(WPSP_PLUGIN_PATH, '/wordpress-sparkpost/wordpress-sparkpost.php') !== false); // full path not available in test mode
-    }
+    function test_plugin_path_constants() {
+        $this->assertTrue( defined('WPSP_PLUGIN_PATH') );
+        $this->assertTrue( strpos(WPSP_PLUGIN_PATH, '/wordpress-sparkpost/wordpress-sparkpost.php') !== false); // full path not available in test mode
+    }
 
-  function test_SparkPost_class_loaded() {
-    $this->assertTrue( class_exists('WPSparkPost\SparkPost'));
-  }
+    function test_SparkPost_class_loaded() {
+        $this->assertTrue( class_exists('WPSparkPost\SparkPost'));
+    }
 }

sparkpost/trunk/wordpress-sparkpost.php

@@ -6 +6 @@
 Plugin URI: http://sparkpost.com/
 Description: Send all your email from Wordpress through SparkPost, the world's most advanced email delivery service.
-Version: 3.1.1
+Version: 3.2.0
 Author: SparkPost
 Author URI: http://sparkpost.com
@@ -19 +19 @@
 define('WPSP_PLUGIN_DIR', plugin_dir_path(__FILE__));
 define('WPSP_PLUGIN_PATH', WPSP_PLUGIN_DIR . basename(__FILE__));
-define('WPSP_PLUGIN_VERSION', '3.1.1');
+define('WPSP_PLUGIN_VERSION', '3.2.0');
 
 require_once(WPSP_PLUGIN_DIR . 'sparkpost.class.php');