Version Description
- Typo in the From email description.
- Removed changelog from plugin file, no need to duplicate it.
- Optionally set $phpmailer->Sender from from email, helps with sendmail / mail().
Download this release
Release Info
| Developer | chmac |
| Plugin | |
| Version | 0.9.0 |
| Comparing to | |
| See all releases | |
Code changes from version 0.8.7 to 0.9.0
- readme.txt +7 -4
- wp_mail_smtp.php +72 -61
readme.txt
CHANGED
|
@@ -3,8 +3,8 @@ Contributors: chmac
|
|
| 3 |
Donate link: http://www.callum-macdonald.com/code/donate/
|
| 4 |
Tags: mail, smtp, wp_mail, mailer, phpmailer
|
| 5 |
Requires at least: 2.7
|
| 6 |
-
Tested up to: 3.
|
| 7 |
-
Stable tag: 0.
|
| 8 |
|
| 9 |
Reconfigures the wp_mail() function to use SMTP instead of mail() and creates an options page to manage the settings.
|
| 10 |
|
|
@@ -62,10 +62,10 @@ By all means please contact me to discuss features or options you'd like to see
|
|
| 62 |
|
| 63 |
== Changelog ==
|
| 64 |
|
| 65 |
-
=
|
| 66 |
* Typo in the From email description.
|
| 67 |
* Removed changelog from plugin file, no need to duplicate it.
|
| 68 |
-
*
|
| 69 |
|
| 70 |
= 0.8.7 =
|
| 71 |
* Fix for a long standing bug that caused an error during plugin activation.
|
|
@@ -134,6 +134,9 @@ By all means please contact me to discuss features or options you'd like to see
|
|
| 134 |
|
| 135 |
== Upgrade Notice ==
|
| 136 |
|
|
|
|
|
|
|
|
|
|
| 137 |
= 0.8.7 =
|
| 138 |
Very low priority update. Fixes a bug that causes a spurious error during activation.
|
| 139 |
|
| 3 |
Donate link: http://www.callum-macdonald.com/code/donate/
|
| 4 |
Tags: mail, smtp, wp_mail, mailer, phpmailer
|
| 5 |
Requires at least: 2.7
|
| 6 |
+
Tested up to: 3.1.1
|
| 7 |
+
Stable tag: 0.9.0
|
| 8 |
|
| 9 |
Reconfigures the wp_mail() function to use SMTP instead of mail() and creates an options page to manage the settings.
|
| 10 |
|
| 62 |
|
| 63 |
== Changelog ==
|
| 64 |
|
| 65 |
+
= 0.9.0 =
|
| 66 |
* Typo in the From email description.
|
| 67 |
* Removed changelog from plugin file, no need to duplicate it.
|
| 68 |
+
* Optionally set $phpmailer->Sender from from email, helps with sendmail / mail().
|
| 69 |
|
| 70 |
= 0.8.7 =
|
| 71 |
* Fix for a long standing bug that caused an error during plugin activation.
|
| 134 |
|
| 135 |
== Upgrade Notice ==
|
| 136 |
|
| 137 |
+
= 0.9.0 =
|
| 138 |
+
Low priority upgrade. Improves the appearance of the options page.
|
| 139 |
+
|
| 140 |
= 0.8.7 =
|
| 141 |
Very low priority update. Fixes a bug that causes a spurious error during activation.
|
| 142 |
|
wp_mail_smtp.php
CHANGED
|
@@ -1,7 +1,7 @@
|
|
| 1 |
<?php
|
| 2 |
/*
|
| 3 |
Plugin Name: WP-Mail-SMTP
|
| 4 |
-
Version: 0.
|
| 5 |
Plugin URI: http://www.callum-macdonald.com/code/wp-mail-smtp/
|
| 6 |
Description: Reconfigures the wp_mail() function to use SMTP instead of mail() and creates an options page to manage the settings.
|
| 7 |
Author: Callum Macdonald
|
|
@@ -10,7 +10,7 @@ Author URI: http://www.callum-macdonald.com/
|
|
| 10 |
|
| 11 |
/**
|
| 12 |
* @author Callum Macdonald
|
| 13 |
-
* @copyright Callum Macdonald, 2007-
|
| 14 |
* This code is released under the GPL licence version 3 or later, available here
|
| 15 |
* http://www.gnu.org/licenses/gpl.txt
|
| 16 |
*/
|
|
@@ -27,6 +27,7 @@ define('WPMS_ON', true);
|
|
| 27 |
define('WPMS_MAIL_FROM', 'From Email');
|
| 28 |
define('WPMS_MAIL_FROM_NAME', 'From Name');
|
| 29 |
define('WPMS_MAILER', 'smtp'); // Possible values 'smtp', 'mail', or 'sendmail'
|
|
|
|
| 30 |
define('WPMS_SMTP_HOST', 'localhost'); // The SMTP mail host
|
| 31 |
define('WPMS_SMTP_PORT', 25); // The SMTP server port number
|
| 32 |
define('WPMS_SSL', ''); // Possible values '', 'ssl', 'tls' - note TLS is not STARTTLS
|
|
@@ -41,6 +42,7 @@ $wpms_options = array (
|
|
| 41 |
'mail_from' => '',
|
| 42 |
'mail_from_name' => '',
|
| 43 |
'mailer' => 'smtp',
|
|
|
|
| 44 |
'smtp_host' => 'localhost',
|
| 45 |
'smtp_port' => '25',
|
| 46 |
'smtp_ssl' => 'none',
|
|
@@ -89,6 +91,9 @@ function phpmailer_init_smtp($phpmailer) {
|
|
| 89 |
|
| 90 |
$phpmailer->Mailer = WPMS_MAILER;
|
| 91 |
|
|
|
|
|
|
|
|
|
|
| 92 |
if (WPMS_MAILER == 'smtp') {
|
| 93 |
$phpmailer->SMTPSecure = WPMS_SSL;
|
| 94 |
$phpmailer->Host = WPMS_SMTP_HOST;
|
|
@@ -113,6 +118,10 @@ function phpmailer_init_smtp($phpmailer) {
|
|
| 113 |
// Set the mailer type as per config above, this overrides the already called isMail method
|
| 114 |
$phpmailer->Mailer = get_option('mailer');
|
| 115 |
|
|
|
|
|
|
|
|
|
|
|
|
|
| 116 |
// Set the SMTPSecure value, if set to none, leave this blank
|
| 117 |
$phpmailer->SMTPSecure = get_option('smtp_ssl') == 'none' ? '' : get_option('smtp_ssl');
|
| 118 |
|
|
@@ -184,6 +193,9 @@ function wp_mail_smtp_options_page() {
|
|
| 184 |
// Send the test mail
|
| 185 |
$result = wp_mail($to,$subject,$message);
|
| 186 |
|
|
|
|
|
|
|
|
|
|
| 187 |
// Grab the smtp debugging output
|
| 188 |
$smtp_debug = ob_get_clean();
|
| 189 |
|
|
@@ -198,6 +210,9 @@ function wp_mail_smtp_options_page() {
|
|
| 198 |
<pre><?php echo $smtp_debug ?></pre>
|
| 199 |
</div>
|
| 200 |
<?php
|
|
|
|
|
|
|
|
|
|
| 201 |
|
| 202 |
}
|
| 203 |
|
|
@@ -206,96 +221,104 @@ function wp_mail_smtp_options_page() {
|
|
| 206 |
<h2><?php _e('Advanced Email Options', 'wp_mail_smtp'); ?></h2>
|
| 207 |
<form method="post" action="options.php">
|
| 208 |
<?php wp_nonce_field('email-options'); ?>
|
| 209 |
-
|
| 210 |
-
<
|
| 211 |
-
<legend><?php _e('From', 'wp_mail_smtp'); ?></legend>
|
| 212 |
-
<table class="optiontable">
|
| 213 |
<tr valign="top">
|
| 214 |
-
<th scope="row"><?php _e('From Email
|
| 215 |
-
<td><
|
| 216 |
-
|
| 217 |
</tr>
|
| 218 |
<tr valign="top">
|
| 219 |
-
<th scope="row"><?php _e('From Name
|
| 220 |
-
<td><
|
| 221 |
-
|
| 222 |
</tr>
|
| 223 |
</table>
|
| 224 |
|
| 225 |
-
|
| 226 |
-
<table class="optiontable">
|
| 227 |
<tr valign="top">
|
| 228 |
-
<th scope="row"><?php _e('Mailer
|
| 229 |
-
<td>
|
| 230 |
<p><input id="mailer_smtp" type="radio" name="mailer" value="smtp" <?php checked('smtp', get_option('mailer')); ?> />
|
| 231 |
<label for="mailer_smtp"><?php _e('Send all WordPress emails via SMTP.', 'wp_mail_smtp'); ?></label></p>
|
| 232 |
<p><input id="mailer_mail" type="radio" name="mailer" value="mail" <?php checked('mail', get_option('mailer')); ?> />
|
| 233 |
<label for="mailer_mail"><?php _e('Use the PHP mail() function to send emails.', 'wp_mail_smtp'); ?></label></p>
|
| 234 |
-
</td>
|
| 235 |
</tr>
|
| 236 |
</table>
|
| 237 |
|
| 238 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 239 |
<p><?php _e('These options only apply if you have chosen to send mail by SMTP above.', 'wp_mail_smtp'); ?></p>
|
| 240 |
-
|
|
|
|
| 241 |
<tr valign="top">
|
| 242 |
-
<th scope="row"><?php _e('SMTP Host
|
| 243 |
-
<td><input name="smtp_host" type="text" id="smtp_host" value="<?php print(get_option('smtp_host')); ?>" size="40" class="
|
| 244 |
</tr>
|
| 245 |
<tr valign="top">
|
| 246 |
-
<th scope="row"><?php _e('SMTP Port
|
| 247 |
-
<td><input name="smtp_port" type="text" id="smtp_port" value="<?php print(get_option('smtp_port')); ?>" size="6" class="
|
| 248 |
</tr>
|
| 249 |
<tr valign="top">
|
| 250 |
-
<th scope="row"><?php _e('Encryption
|
| 251 |
-
<td>
|
| 252 |
-
<
|
| 253 |
-
<label for="smtp_ssl_none"><?php _e('No encryption.', 'wp_mail_smtp'); ?></label
|
| 254 |
-
<
|
| 255 |
-
<label for="smtp_ssl_ssl"><?php _e('Use SSL encryption.', 'wp_mail_smtp'); ?></label
|
| 256 |
-
<
|
| 257 |
-
<label for="smtp_ssl_tls"><?php _e('Use TLS encryption. This is not the same as STARTTLS. For most servers SSL is the recommended option.', 'wp_mail_smtp'); ?></label
|
| 258 |
</td>
|
| 259 |
</tr>
|
| 260 |
<tr valign="top">
|
| 261 |
-
<th scope="row"><?php _e('Authentication
|
| 262 |
<td>
|
| 263 |
-
<
|
| 264 |
-
<label for="smtp_auth_false"><?php _e('No: Do not use SMTP authentication.', 'wp_mail_smtp'); ?></label
|
| 265 |
-
<
|
| 266 |
-
<label for="smtp_auth_true"><?php _e('Yes: Use SMTP authentication.', 'wp_mail_smtp'); ?></label
|
| 267 |
-
<
|
| 268 |
</td>
|
| 269 |
</tr>
|
| 270 |
<tr valign="top">
|
| 271 |
-
<th scope="row"><?php _e('Username
|
| 272 |
<td><input name="smtp_user" type="text" id="smtp_user" value="<?php print(get_option('smtp_user')); ?>" size="40" class="code" /></td>
|
| 273 |
</tr>
|
| 274 |
<tr valign="top">
|
| 275 |
-
<th scope="row"><?php _e('Password
|
| 276 |
<td><input name="smtp_pass" type="text" id="smtp_pass" value="<?php print(get_option('smtp_pass')); ?>" size="40" class="code" /></td>
|
| 277 |
</tr>
|
| 278 |
</table>
|
| 279 |
|
| 280 |
-
<p class="submit"><input type="submit" name="
|
| 281 |
<input type="hidden" name="action" value="update" />
|
| 282 |
</p>
|
| 283 |
<input type="hidden" name="option_page" value="email">
|
| 284 |
-
</fieldset>
|
| 285 |
</form>
|
| 286 |
|
|
|
|
|
|
|
| 287 |
<form method="POST">
|
| 288 |
-
<
|
| 289 |
-
<legend><?php _e('Send a Test Email', 'wp_mail_smtp'); ?></legend>
|
| 290 |
-
<table class="optiontable">
|
| 291 |
<tr valign="top">
|
| 292 |
-
<th scope="row"><?php _e('To:', 'wp_mail_smtp');
|
| 293 |
-
<td><
|
| 294 |
-
|
| 295 |
</tr>
|
| 296 |
</table>
|
| 297 |
-
<p class="submit"><input type="submit" name="wpms_action" value="<?php _e('Send Test', 'wp_mail_smtp'); ?>" /></p>
|
| 298 |
-
</fieldset>
|
| 299 |
</form>
|
| 300 |
|
| 301 |
</div>
|
|
@@ -377,17 +400,6 @@ function wp_mail_smtp_mail_from ($orig) {
|
|
| 377 |
} // End of wp_mail_smtp_mail_from() function definition
|
| 378 |
endif;
|
| 379 |
|
| 380 |
-
/**
|
| 381 |
-
* This function grabs the from email value and sets it as Sender
|
| 382 |
-
*/
|
| 383 |
-
if (!function_exists('wp_mail_smtp_set_sender')) :
|
| 384 |
-
function wp_mail_smtp_set_sender($from_email) {
|
| 385 |
-
global $phpmailer;
|
| 386 |
-
$phpmailer->Sender = $from_email;
|
| 387 |
-
return $from_email;
|
| 388 |
-
}
|
| 389 |
-
endif;
|
| 390 |
-
|
| 391 |
|
| 392 |
/**
|
| 393 |
* This function sets the from name value
|
|
@@ -436,7 +448,6 @@ if (!defined('WPMS_ON') || !WPMS_ON) {
|
|
| 436 |
|
| 437 |
// Add filters to replace the mail from name and emailaddress
|
| 438 |
add_filter('wp_mail_from','wp_mail_smtp_mail_from');
|
| 439 |
-
add_filter('wp_mail_from','wp_mail_smtp_set_sender', 99);
|
| 440 |
add_filter('wp_mail_from_name','wp_mail_smtp_mail_from_name');
|
| 441 |
|
| 442 |
load_plugin_textdomain('wp_mail_smtp', false, dirname(plugin_basename(__FILE__)) . '/langs');
|
| 1 |
<?php
|
| 2 |
/*
|
| 3 |
Plugin Name: WP-Mail-SMTP
|
| 4 |
+
Version: 0.9.0
|
| 5 |
Plugin URI: http://www.callum-macdonald.com/code/wp-mail-smtp/
|
| 6 |
Description: Reconfigures the wp_mail() function to use SMTP instead of mail() and creates an options page to manage the settings.
|
| 7 |
Author: Callum Macdonald
|
| 10 |
|
| 11 |
/**
|
| 12 |
* @author Callum Macdonald
|
| 13 |
+
* @copyright Callum Macdonald, 2007-11, All Rights Reserved
|
| 14 |
* This code is released under the GPL licence version 3 or later, available here
|
| 15 |
* http://www.gnu.org/licenses/gpl.txt
|
| 16 |
*/
|
| 27 |
define('WPMS_MAIL_FROM', 'From Email');
|
| 28 |
define('WPMS_MAIL_FROM_NAME', 'From Name');
|
| 29 |
define('WPMS_MAILER', 'smtp'); // Possible values 'smtp', 'mail', or 'sendmail'
|
| 30 |
+
define('WPMS_SET_RETURN_PATH', 'false'); // Sets $phpmailer->Sender if true
|
| 31 |
define('WPMS_SMTP_HOST', 'localhost'); // The SMTP mail host
|
| 32 |
define('WPMS_SMTP_PORT', 25); // The SMTP server port number
|
| 33 |
define('WPMS_SSL', ''); // Possible values '', 'ssl', 'tls' - note TLS is not STARTTLS
|
| 42 |
'mail_from' => '',
|
| 43 |
'mail_from_name' => '',
|
| 44 |
'mailer' => 'smtp',
|
| 45 |
+
'mail_set_return_path' => 'false',
|
| 46 |
'smtp_host' => 'localhost',
|
| 47 |
'smtp_port' => '25',
|
| 48 |
'smtp_ssl' => 'none',
|
| 91 |
|
| 92 |
$phpmailer->Mailer = WPMS_MAILER;
|
| 93 |
|
| 94 |
+
if (WPMS_SET_RETURN_PATH)
|
| 95 |
+
$phpmailer->Sender = $phpmailer->From;
|
| 96 |
+
|
| 97 |
if (WPMS_MAILER == 'smtp') {
|
| 98 |
$phpmailer->SMTPSecure = WPMS_SSL;
|
| 99 |
$phpmailer->Host = WPMS_SMTP_HOST;
|
| 118 |
// Set the mailer type as per config above, this overrides the already called isMail method
|
| 119 |
$phpmailer->Mailer = get_option('mailer');
|
| 120 |
|
| 121 |
+
// Set the Sender (return-path) if required
|
| 122 |
+
if (get_option('mail_set_return_path'))
|
| 123 |
+
$phpmailer->Sender = $phpmailer->From;
|
| 124 |
+
|
| 125 |
// Set the SMTPSecure value, if set to none, leave this blank
|
| 126 |
$phpmailer->SMTPSecure = get_option('smtp_ssl') == 'none' ? '' : get_option('smtp_ssl');
|
| 127 |
|
| 193 |
// Send the test mail
|
| 194 |
$result = wp_mail($to,$subject,$message);
|
| 195 |
|
| 196 |
+
// Strip out the language strings which confuse users
|
| 197 |
+
unset($phpmailer->language);
|
| 198 |
+
|
| 199 |
// Grab the smtp debugging output
|
| 200 |
$smtp_debug = ob_get_clean();
|
| 201 |
|
| 210 |
<pre><?php echo $smtp_debug ?></pre>
|
| 211 |
</div>
|
| 212 |
<?php
|
| 213 |
+
|
| 214 |
+
// Destroy $phpmailer so it doesn't cause issues later
|
| 215 |
+
unset($phpmailer);
|
| 216 |
|
| 217 |
}
|
| 218 |
|
| 221 |
<h2><?php _e('Advanced Email Options', 'wp_mail_smtp'); ?></h2>
|
| 222 |
<form method="post" action="options.php">
|
| 223 |
<?php wp_nonce_field('email-options'); ?>
|
| 224 |
+
|
| 225 |
+
<table class="optiontable form-table">
|
|
|
|
|
|
|
| 226 |
<tr valign="top">
|
| 227 |
+
<th scope="row"><label for="mail_from"><?php _e('From Email', 'wp_mail_smtp'); ?></label></th>
|
| 228 |
+
<td><input name="mail_from" type="text" id="mail_from" value="<?php print(get_option('mail_from')); ?>" size="40" class="regular-text" />
|
| 229 |
+
<span class="description"><?php _e('You can specify the email address that emails should be sent from. If you leave this blank, the default email will be used.', 'wp_mail_smtp'); if(get_option('db_version') < 6124) { print('<br /><span style="color: red;">'); _e('<strong>Please Note:</strong> You appear to be using a version of WordPress prior to 2.3. Please ignore the From Name field and instead enter Name<email@domain.com> in this field.', 'wp_mail_smtp'); print('</span>'); } ?></span></td>
|
| 230 |
</tr>
|
| 231 |
<tr valign="top">
|
| 232 |
+
<th scope="row"><label for="mail_from_name"><?php _e('From Name', 'wp_mail_smtp'); ?></label></th>
|
| 233 |
+
<td><input name="mail_from_name" type="text" id="mail_from_name" value="<?php print(get_option('mail_from_name')); ?>" size="40" class="regular-text" />
|
| 234 |
+
<span class="description"><?php _e('You can specify the name that emails should be sent from. If you leave this blank, the emails will be sent from WordPress.', 'wp_mail_smtp'); ?></span></td>
|
| 235 |
</tr>
|
| 236 |
</table>
|
| 237 |
|
| 238 |
+
|
| 239 |
+
<table class="optiontable form-table">
|
| 240 |
<tr valign="top">
|
| 241 |
+
<th scope="row"><?php _e('Mailer', 'wp_mail_smtp'); ?> </th>
|
| 242 |
+
<td><fieldset><legend class="screen-reader-text"><span><?php _e('Mailer', 'wp_mail_smtp'); ?></legend>
|
| 243 |
<p><input id="mailer_smtp" type="radio" name="mailer" value="smtp" <?php checked('smtp', get_option('mailer')); ?> />
|
| 244 |
<label for="mailer_smtp"><?php _e('Send all WordPress emails via SMTP.', 'wp_mail_smtp'); ?></label></p>
|
| 245 |
<p><input id="mailer_mail" type="radio" name="mailer" value="mail" <?php checked('mail', get_option('mailer')); ?> />
|
| 246 |
<label for="mailer_mail"><?php _e('Use the PHP mail() function to send emails.', 'wp_mail_smtp'); ?></label></p>
|
| 247 |
+
</fieldset></td>
|
| 248 |
</tr>
|
| 249 |
</table>
|
| 250 |
|
| 251 |
+
|
| 252 |
+
<table class="optiontable form-table">
|
| 253 |
+
<tr valign="top">
|
| 254 |
+
<th scope="row"><?php _e('Return Path', 'wp_mail_smtp'); ?> </th>
|
| 255 |
+
<td><fieldset><legend class="screen-reader-text"><span><?php _e('Return Path', 'wp_mail_smtp'); ?></span></legend><label for="mail_set_return_path">
|
| 256 |
+
<input name="mail_set_return_path" type="checkbox" id="mail_set_return_path" value="true" <?php checked('true', get_option('mail_set_return_path')); ?> />
|
| 257 |
+
<?php _e('Set the return-path to match the From Email'); ?></label>
|
| 258 |
+
</fieldset></td>
|
| 259 |
+
</tr>
|
| 260 |
+
</table>
|
| 261 |
+
|
| 262 |
+
<h3><?php _e('SMTP Options', 'wp_mail_smtp'); ?></h3>
|
| 263 |
<p><?php _e('These options only apply if you have chosen to send mail by SMTP above.', 'wp_mail_smtp'); ?></p>
|
| 264 |
+
|
| 265 |
+
<table class="optiontable form-table">
|
| 266 |
<tr valign="top">
|
| 267 |
+
<th scope="row"><label for="smtp_host"><?php _e('SMTP Host', 'wp_mail_smtp'); ?></label></th>
|
| 268 |
+
<td><input name="smtp_host" type="text" id="smtp_host" value="<?php print(get_option('smtp_host')); ?>" size="40" class="regular-text" /></td>
|
| 269 |
</tr>
|
| 270 |
<tr valign="top">
|
| 271 |
+
<th scope="row"><label for="smtp_port"><?php _e('SMTP Port', 'wp_mail_smtp'); ?></label></th>
|
| 272 |
+
<td><input name="smtp_port" type="text" id="smtp_port" value="<?php print(get_option('smtp_port')); ?>" size="6" class="regular-text" /></td>
|
| 273 |
</tr>
|
| 274 |
<tr valign="top">
|
| 275 |
+
<th scope="row"><?php _e('Encryption', 'wp_mail_smtp'); ?> </th>
|
| 276 |
+
<td><fieldset><legend class="screen-reader-text"><span><?php _e('Encryption', 'wp_mail_smtp'); ?></span></legend>
|
| 277 |
+
<input id="smtp_ssl_none" type="radio" name="smtp_ssl" value="none" <?php checked('none', get_option('smtp_ssl')); ?> />
|
| 278 |
+
<label for="smtp_ssl_none"><span><?php _e('No encryption.', 'wp_mail_smtp'); ?></span></label><br />
|
| 279 |
+
<input id="smtp_ssl_ssl" type="radio" name="smtp_ssl" value="ssl" <?php checked('ssl', get_option('smtp_ssl')); ?> />
|
| 280 |
+
<label for="smtp_ssl_ssl"><span><?php _e('Use SSL encryption.', 'wp_mail_smtp'); ?></span></label><br />
|
| 281 |
+
<input id="smtp_ssl_tls" type="radio" name="smtp_ssl" value="tls" <?php checked('tls', get_option('smtp_ssl')); ?> />
|
| 282 |
+
<label for="smtp_ssl_tls"><span><?php _e('Use TLS encryption. This is not the same as STARTTLS. For most servers SSL is the recommended option.', 'wp_mail_smtp'); ?></span></label>
|
| 283 |
</td>
|
| 284 |
</tr>
|
| 285 |
<tr valign="top">
|
| 286 |
+
<th scope="row"><?php _e('Authentication', 'wp_mail_smtp'); ?> </th>
|
| 287 |
<td>
|
| 288 |
+
<input id="smtp_auth_false" type="radio" name="smtp_auth" value="false" <?php checked('false', get_option('smtp_auth')); ?> />
|
| 289 |
+
<label for="smtp_auth_false"><span><?php _e('No: Do not use SMTP authentication.', 'wp_mail_smtp'); ?></span></label><br />
|
| 290 |
+
<input id="smtp_auth_true" type="radio" name="smtp_auth" value="true" <?php checked('true', get_option('smtp_auth')); ?> />
|
| 291 |
+
<label for="smtp_auth_true"><span><?php _e('Yes: Use SMTP authentication.', 'wp_mail_smtp'); ?></span></label><br />
|
| 292 |
+
<span class="description"><?php _e('If this is set to no, the values below are ignored.', 'wp_mail_smtp'); ?></span>
|
| 293 |
</td>
|
| 294 |
</tr>
|
| 295 |
<tr valign="top">
|
| 296 |
+
<th scope="row"><label for="smtp_user"><?php _e('Username', 'wp_mail_smtp'); ?></label></th>
|
| 297 |
<td><input name="smtp_user" type="text" id="smtp_user" value="<?php print(get_option('smtp_user')); ?>" size="40" class="code" /></td>
|
| 298 |
</tr>
|
| 299 |
<tr valign="top">
|
| 300 |
+
<th scope="row"><label for="smtp_pass"><?php _e('Password', 'wp_mail_smtp'); ?></label></th>
|
| 301 |
<td><input name="smtp_pass" type="text" id="smtp_pass" value="<?php print(get_option('smtp_pass')); ?>" size="40" class="code" /></td>
|
| 302 |
</tr>
|
| 303 |
</table>
|
| 304 |
|
| 305 |
+
<p class="submit"><input type="submit" name="submit" id="submit" class="button-primary" value="<?php _e('Save Changes'); ?>" /></p>
|
| 306 |
<input type="hidden" name="action" value="update" />
|
| 307 |
</p>
|
| 308 |
<input type="hidden" name="option_page" value="email">
|
|
|
|
| 309 |
</form>
|
| 310 |
|
| 311 |
+
<h3><?php _e('Send a Test Email', 'wp_mail_smtp'); ?></h3>
|
| 312 |
+
|
| 313 |
<form method="POST">
|
| 314 |
+
<table class="optiontable form-table">
|
|
|
|
|
|
|
| 315 |
<tr valign="top">
|
| 316 |
+
<th scope="row"><label for="to"><?php _e('To:', 'wp_mail_smtp'); ?></label></th>
|
| 317 |
+
<td><input name="to" type="text" id="to" value="" size="40" class="code" />
|
| 318 |
+
<span class="description"><?php _e('Type an email address here and then click Send Test to generate a test email.', 'wp_mail_smtp'); ?></span></td>
|
| 319 |
</tr>
|
| 320 |
</table>
|
| 321 |
+
<p class="submit"><input type="submit" name="wpms_action" id="wpms_action" class="button-primary" value="<?php _e('Send Test', 'wp_mail_smtp'); ?>" /></p>
|
|
|
|
| 322 |
</form>
|
| 323 |
|
| 324 |
</div>
|
| 400 |
} // End of wp_mail_smtp_mail_from() function definition
|
| 401 |
endif;
|
| 402 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 403 |
|
| 404 |
/**
|
| 405 |
* This function sets the from name value
|
| 448 |
|
| 449 |
// Add filters to replace the mail from name and emailaddress
|
| 450 |
add_filter('wp_mail_from','wp_mail_smtp_mail_from');
|
|
|
|
| 451 |
add_filter('wp_mail_from_name','wp_mail_smtp_mail_from_name');
|
| 452 |
|
| 453 |
load_plugin_textdomain('wp_mail_smtp', false, dirname(plugin_basename(__FILE__)) . '/langs');
|
