Changeset 2015343

Timestamp:

01/19/2019 03:40:18 PM (7 years ago)

Author:

billvolz

Message:

Fixed: From field from showing "From" in header value.

Location:

socketlabs

Files:

• tags/1.0.10/README.txt (modified) (1 diff)
• trunk/README.txt (modified) (2 diffs)
• trunk/includes/class-socketlabs-mailer.php (modified) (2 diffs)
• trunk/socketlabs.php (modified) (1 diff)

socketlabs/tags/1.0.10/README.txt

@@ -3 +3 @@
 Tags: email, injection, smtp, mailer, wp_mail, mailing, deliverability
 Requires at least: 3.0.1
-Tested up to: 4.9.4
+Tested up to: 5.0.1
 Requires PHP: 3.0.1
 Stable tag: 1.0.10

socketlabs/trunk/README.txt

@@ -3 +3 @@
 Tags: email, injection, smtp, mailer, wp_mail, mailing, deliverability
 Requires at least: 3.0.1
-Tested up to: 5.0.1
+Tested up to: 5.0
 Requires PHP: 3.0.1
-Stable tag: 1.0.10
+Stable tag: 1.0.11
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -50 +50 @@
 
 == Change log 
+= 1.0.11 =`
+* Fixed: From field from showing "From" in header value.
 = 1.0.10 =
 * Fixed: Removed api status check from plugin startup.

socketlabs/trunk/includes/class-socketlabs-mailer.php

@@ -135 +135 @@
                             // Mainly for legacy -- process a From: header if it's there
                             case 'from':
-            
-                                $bracket_pos = strpos( $content, '<' );
-                                if ( $bracket_pos !== false ) {
-                                    // Text before the bracketed email is the "From" name.
-                                    if ( $bracket_pos > 0 ) {
-                                        $from_name = substr( $content, 0, $bracket_pos - 1 );
-                                        $from_name = str_replace( '"', '', $from_name );
-                                        $from_name = trim( $from_name );
-                                    }
-    
-                                    $from_email = substr( $content, $bracket_pos + 1 );
-                                    $from_email = str_replace( '>', '', $from_email );
-
-                        
-                                    $contact_match;
-                                    preg_match(self::contact_regex, $header, $contact_match);
-
-                                    if(isset($contact_match[2])){
-                                        $this->apply_from(isset($contact_match[1]) ? $contact_match[1] : "", $contact_match[2]);
-                                    }
-                                    // Avoid setting an empty $from_email.
-                                } elseif ( '' !== trim( $content ) ) {
+                                $contact_match;
+                                preg_match(self::contact_regex, $content, $contact_match);
+
+                                if(isset($contact_match[2])){
+                                    $this->apply_from(isset($contact_match[1]) ? $contact_match[1] : "", $contact_match[2]);
+                                }
+                                elseif ( '' !== trim( $content ) ) {
                                     $this->apply_from("", trim( $content ));
                                 }
@@ -172 +157 @@
                                     }
     
-                                    // Avoid setting an empty $content_type.
+                                // Avoid setting an empty $content_type.
                                 } elseif ( '' !== trim( $content ) ) {
                                     $this->api_message["Charset"] = apply_filters( 'wp_mail_charset', trim( $content ) );

socketlabs/trunk/socketlabs.php

@@ -17 +17 @@
  * Plugin URI:        https://github.com/socketlabs/wordpress
  * Description:       Send emails using your SocketLabs account.
- * Version:           1.0.10
+ * Version:           1.0.11
  * Author:            SocketLabs
  * Author URI:        https://socketlabs.com/