Changeset 1360411

Timestamp:

02/29/2016 01:28:53 AM (10 years ago)

Author:

sparkpost

Message:

Update to version 1.1.5

Location:

sparkpost

Files:

• assets/banner-772x250.png (deleted)
• assets/icon-128x128.png (deleted)
• tags/1.1.2 (deleted)
• tags/1.1.3 (deleted)
• tags/1.1.4 (deleted)
• trunk/mailer.class.php (modified) (3 diffs)
• trunk/readme.txt (modified) (2 diffs)
• trunk/sparkpost.class.php (modified) (1 diff)
• trunk/widget.class.php (modified) (6 diffs)
• trunk/wordpress-sparkpost.php (modified) (1 diff)

sparkpost/trunk/mailer.class.php

@@ -14 +14 @@
     {
         add_action('phpmailer_init', array($this, 'configure_phpmailer'), 2);
+        add_filter('wp_mail_from', array($this, 'set_from_email'));
+        add_filter('wp_mail_from_name', array($this, 'set_from_name'));
     }
 
@@ -25 +27 @@
         $phpmailer->isSMTP();
         $phpmailer->SMTPSecure = 'tls';
-        $phpmailer->Port = 587;
+        $phpmailer->Port = !empty($options['port']) ? intval($options['port']) : 587;
         $phpmailer->Host = 'smtp.sparkpostmail.com';
-        $phpmailer->setFrom($options['from_email'], $options['from_name']);
         $phpmailer->AddReplyTo($options['from_email'], $options['from_name']); 
         
@@ -34 +35 @@
         $phpmailer->Password = $options['password'];
     }
+
+    public function set_from_name() {
+        $options = get_option('sp_settings');
+        return $options['from_name'];
+    }
+
+    public function set_from_email() {
+        $options = get_option('sp_settings');
+        return $options['from_email'];
+    }
 }

sparkpost/trunk/readme.txt

@@ -3 +3 @@
 Tags: sparkpost, smtp, wp_mail, mail, email
 Requires at least: 4.0
-Tested up to: 4.4
-Stable tag: 1.1.4
+Tested up to: 4.4.2
+Stable tag: 1.1.5
 License: GPLv2 or later
 
@@ -62 +62 @@
 
 == Changelog ==
+= 1.1.5 =
+- Support alternate port
+- Use filter to set sender info
+- Clearer settings panel
+
 = 1.1.4 =
-Minor settings update
+Update copy
 
 = 1.1.3 =

sparkpost/trunk/sparkpost.class.php

@@ -25 +25 @@
             'from_name' => '',
             'from_email' => '',
+            'port' => 587,
             'enable_sparkpost' => 0
             );

sparkpost/trunk/widget.class.php

@@ -89 +89 @@
                     settings_fields("sp_settings_group");
                     do_settings_sections("sp-options");
+                    do_settings_sections("sp-advanced");
                     submit_button();
                 ?>
@@ -119 +120 @@
         add_settings_field("from_name", "From name*", array($this, 'render_from_name_field'), "sp-options", "general");
         add_settings_field("from_email", "From email*", array($this, 'render_from_email_field'), "sp-options", "general");
+        
+        add_settings_field("username", "Username*", array($this, 'render_username_field'), "sp-options", "general");
         add_settings_field("password", "Password*", array($this, 'render_password_field'), "sp-options", "general");
+
+        add_settings_section('advanced', 'Advanced', null, "sp-advanced");
+        add_settings_field("port", "Port", array($this, 'render_port_field'), "sp-advanced", "advanced");
 
         add_settings_section('test_email', '', null, 'sp-test-email');
@@ -149 +155 @@
         }
 
-        if(isset($input['enable_sparkpost'])) {
+        if (isset($input['enable_sparkpost'])) {
             $new_input['enable_sparkpost'] = 1;
         } else {
@@ -160 +166 @@
         }
 
+        $new_input['port'] = in_array(intval(esc_attr($input['port'])), array(587, 2525)) ? intval(esc_attr($input['port'])) : 587;
+
         return $new_input;
     }
@@ -168 +176 @@
             '<label><input type="checkbox" id="enable_sparkpost" name="sp_settings[enable_sparkpost]" value="1" %s />Send email using SparkPost</label>', $this->options['enable_sparkpost'] ? 'checked' : ''
         );
+    }
+
+    public function render_username_field()
+    {
+        echo '<input type="text" id="username" name="sp_settings[username]" class="regular-text" value="SMTP_Injection" readonly />';
     }
 
@@ -194 +207 @@
     }
 
+    public function render_port_field()
+    {
+        $selected_port = esc_attr($this->options['port']);
+
+        echo '<select name="sp_settings[port]">
+        <option value="587" ' . (($selected_port == 587) ? 'selected' : '') . '>587 (Default)</option>
+        <option value="2525" ' .(($selected_port == 2525) ? 'selected' : '') .'>2525</option>
+        </select><br/><small>Change only if default port is not working!</small>';
+    }
+
     public function render_to_email_field()
     {

sparkpost/trunk/wordpress-sparkpost.php

@@ -7 +7 @@
 Plugin URI: http://sparkpost.com/
 Description: Send all your email from Wordpress through SparkPost, the world's most advanced email delivery service.
-Version: 1.1.4
-Author: The HungryCoder
-Author URI: http://thehungrycoder.com
+Version: 1.1.5
+Author: SparkPost
+Author URI: http://sparkpost.com
 License: GPLv2 or later
 Text Domain: wpsp