Changeset 3279601
- Timestamp:
- 04/23/2025 04:35:53 AM (11 months ago)
- Location:
- smooth-smtp
- Files:
-
- 6 edited
- 1 copied
-
tags/1.1.3 (copied) (copied from smooth-smtp/trunk)
-
tags/1.1.3/includes/class-smooth-smtp-mailer.php (modified) (6 diffs)
-
tags/1.1.3/readme.txt (modified) (2 diffs)
-
tags/1.1.3/smooth-smtp.php (modified) (2 diffs)
-
trunk/includes/class-smooth-smtp-mailer.php (modified) (6 diffs)
-
trunk/readme.txt (modified) (2 diffs)
-
trunk/smooth-smtp.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
smooth-smtp/tags/1.1.3/includes/class-smooth-smtp-mailer.php
r3275846 r3279601 77 77 add_filter('wp_mail_content_type', array($this, 'set_mail_content_type')); 78 78 79 // Get fallback values 80 $from_email = !empty($this->settings['from_email']) ? $this->settings['from_email'] : get_option('admin_email'); 81 $from_name = !empty($this->settings['from_name']) ? $this->settings['from_name'] : get_bloginfo('name'); 82 79 83 // Prepare email content 80 84 if ($is_html) { … … 84 88 $message .= '<p>If you\'re reading this, it means your SMTP settings are configured correctly!</p>'; 85 89 $message .= '<hr>'; 86 $message .= '<p><small>Sent from: ' . $ this->settings['from_name'] . ' (' . $this->settings['from_email']. ')</small></p>';90 $message .= '<p><small>Sent from: ' . $from_name . ' (' . $from_email . ')</small></p>'; 87 91 } else { 88 92 $subject = 'Smooth SMTP: Plain Text Test Email'; … … 91 95 $message .= "If you're reading this, it means your SMTP settings are configured correctly!\n\n"; 92 96 $message .= "---\n"; 93 $message .= "Sent from: " . $ this->settings['from_name'] . " (" . $this->settings['from_email']. ")";97 $message .= "Sent from: " . $from_name . " (" . $from_email . ")"; 94 98 } 95 99 … … 100 104 'message' => $message, 101 105 'headers' => array( 102 'From: ' . $ this->settings['from_name'] . ' <' . $this->settings['from_email']. '>'106 'From: ' . $from_name . ' <' . $from_email . '>' 103 107 ) 104 108 ); … … 150 154 $recipients = !empty($custom_recipients) ? explode(',', $custom_recipients) : explode(',', $email->recipients); 151 155 156 // Get fallback values 157 $from_email = !empty($this->settings['from_email']) ? $this->settings['from_email'] : get_option('admin_email'); 158 $from_name = !empty($this->settings['from_name']) ? $this->settings['from_name'] : get_bloginfo('name'); 159 152 160 // Prepare email arguments 153 161 $email_args = array( … … 156 164 'message' => $email->message, 157 165 'headers' => array( 158 'From: ' . $ this->settings['from_name'] . ' <' . $this->settings['from_email']. '>'166 'From: ' . $from_name . ' <' . $from_email . '>' 159 167 ) 160 168 ); -
smooth-smtp/tags/1.1.3/readme.txt
r3275870 r3279601 4 4 Requires at least: 5.0 5 5 Tested up to: 6.8 6 Stable tag: 1.1. 26 Stable tag: 1.1.3 7 7 Requires PHP: 7.4 8 8 License: GPLv2 or later … … 71 71 Commit test email screen. 72 72 73 = 1.1.3 = 74 If sender name and/or sender from email is not set, fallback to use WordPress Site Title as sender name and WordPress Admin Email Address as sender email. 75 73 76 == Upgrade Notice == 74 77 -
smooth-smtp/tags/1.1.3/smooth-smtp.php
r3275870 r3279601 3 3 * Plugin Name: Smooth SMTP 4 4 * Description: SMTP configuration and email logging for WordPress 5 * Version: 1.1. 25 * Version: 1.1.3 6 6 * Author: SMMOOTH Plugins 7 7 * Text Domain: smooth-smtp … … 22 22 23 23 // Define plugin constants 24 define('SMOOTH_SMTP_VERSION', '1.1. 2');24 define('SMOOTH_SMTP_VERSION', '1.1.3'); 25 25 define('SMOOTH_SMTP_FILE', __FILE__); 26 26 define('SMOOTH_SMTP_PATH', dirname(SMOOTH_SMTP_FILE) . '/'); -
smooth-smtp/trunk/includes/class-smooth-smtp-mailer.php
r3275846 r3279601 77 77 add_filter('wp_mail_content_type', array($this, 'set_mail_content_type')); 78 78 79 // Get fallback values 80 $from_email = !empty($this->settings['from_email']) ? $this->settings['from_email'] : get_option('admin_email'); 81 $from_name = !empty($this->settings['from_name']) ? $this->settings['from_name'] : get_bloginfo('name'); 82 79 83 // Prepare email content 80 84 if ($is_html) { … … 84 88 $message .= '<p>If you\'re reading this, it means your SMTP settings are configured correctly!</p>'; 85 89 $message .= '<hr>'; 86 $message .= '<p><small>Sent from: ' . $ this->settings['from_name'] . ' (' . $this->settings['from_email']. ')</small></p>';90 $message .= '<p><small>Sent from: ' . $from_name . ' (' . $from_email . ')</small></p>'; 87 91 } else { 88 92 $subject = 'Smooth SMTP: Plain Text Test Email'; … … 91 95 $message .= "If you're reading this, it means your SMTP settings are configured correctly!\n\n"; 92 96 $message .= "---\n"; 93 $message .= "Sent from: " . $ this->settings['from_name'] . " (" . $this->settings['from_email']. ")";97 $message .= "Sent from: " . $from_name . " (" . $from_email . ")"; 94 98 } 95 99 … … 100 104 'message' => $message, 101 105 'headers' => array( 102 'From: ' . $ this->settings['from_name'] . ' <' . $this->settings['from_email']. '>'106 'From: ' . $from_name . ' <' . $from_email . '>' 103 107 ) 104 108 ); … … 150 154 $recipients = !empty($custom_recipients) ? explode(',', $custom_recipients) : explode(',', $email->recipients); 151 155 156 // Get fallback values 157 $from_email = !empty($this->settings['from_email']) ? $this->settings['from_email'] : get_option('admin_email'); 158 $from_name = !empty($this->settings['from_name']) ? $this->settings['from_name'] : get_bloginfo('name'); 159 152 160 // Prepare email arguments 153 161 $email_args = array( … … 156 164 'message' => $email->message, 157 165 'headers' => array( 158 'From: ' . $ this->settings['from_name'] . ' <' . $this->settings['from_email']. '>'166 'From: ' . $from_name . ' <' . $from_email . '>' 159 167 ) 160 168 ); -
smooth-smtp/trunk/readme.txt
r3275870 r3279601 4 4 Requires at least: 5.0 5 5 Tested up to: 6.8 6 Stable tag: 1.1. 26 Stable tag: 1.1.3 7 7 Requires PHP: 7.4 8 8 License: GPLv2 or later … … 71 71 Commit test email screen. 72 72 73 = 1.1.3 = 74 If sender name and/or sender from email is not set, fallback to use WordPress Site Title as sender name and WordPress Admin Email Address as sender email. 75 73 76 == Upgrade Notice == 74 77 -
smooth-smtp/trunk/smooth-smtp.php
r3275870 r3279601 3 3 * Plugin Name: Smooth SMTP 4 4 * Description: SMTP configuration and email logging for WordPress 5 * Version: 1.1. 25 * Version: 1.1.3 6 6 * Author: SMMOOTH Plugins 7 7 * Text Domain: smooth-smtp … … 22 22 23 23 // Define plugin constants 24 define('SMOOTH_SMTP_VERSION', '1.1. 2');24 define('SMOOTH_SMTP_VERSION', '1.1.3'); 25 25 define('SMOOTH_SMTP_FILE', __FILE__); 26 26 define('SMOOTH_SMTP_PATH', dirname(SMOOTH_SMTP_FILE) . '/');
Note: See TracChangeset
for help on using the changeset viewer.