Ticket #14366: email.diff
| File email.diff, 79.9 KB (added by , 15 years ago) |
|---|
-
wp-signup.php
136 136 _e( '(Must be at least 4 characters, letters and numbers only.)' ); 137 137 ?> 138 138 139 <label for="user_email"><?php _e( 'E mail Address:' ) ?></label>139 <label for="user_email"><?php _e( 'E-mail Address:' ) ?></label> 140 140 <?php if ( $errmsg = $errors->get_error_message('user_email') ) { ?> 141 141 <p class="error"><?php echo $errmsg ?></p> 142 142 <?php } ?> 143 <input name="user_email" type="text" id="user_email" value="<?php echo esc_attr($user_email) ?>" maxlength="200" /><br /><?php _e('We send your registration e mail to this address. (Double-check your email address before continuing.)') ?>143 <input name="user_email" type="text" id="user_email" value="<?php echo esc_attr($user_email) ?>" maxlength="200" /><br /><?php _e('We send your registration e-mail to this address. (Double-check your e-mail address before continuing.)') ?> 144 144 <?php 145 145 if ( $errmsg = $errors->get_error_message('generic') ) { 146 146 echo '<p class="error">' . $errmsg . '</p>'; … … 366 366 <p><?php _e( 'But, before you can start using your site, <strong>you must activate it</strong>.' ) ?></p> 367 367 <p><?php printf( __( 'Check your inbox at <strong>%s</strong> and click the link given.' ), $user_email) ?></p> 368 368 <p><?php _e( 'If you do not activate your site within two days, you will have to sign up again.' ); ?></p> 369 <h2><?php _e( 'Still waiting for your e mail?' ); ?></h2>369 <h2><?php _e( 'Still waiting for your e-mail message?' ); ?></h2> 370 370 <p> 371 <?php _e( 'If you haven’t received your e mailyet, there are a number of things you can do:' ) ?>371 <?php _e( 'If you haven’t received your e-mail message yet, there are a number of things you can do:' ) ?> 372 372 <ul id="noemail-tips"> 373 <li><p><strong><?php _e( 'Wait a little longer. Sometimes delivery of emailcan be delayed by processes outside of our control.' ) ?></strong></p></li>374 <li><p><?php _e( 'Check the junk or spam folder of your email client. Sometime e mails wind up there by mistake.' ) ?></p></li>375 <li><?php printf( __( 'Have you entered your e mail correctly? You have entered %s, if it’s incorrect, you will not receive your email.' ), $user_email ) ?></li>373 <li><p><strong><?php _e( 'Wait a little longer. Sometimes delivery of an e-mail message can be delayed by processes outside of our control.' ) ?></strong></p></li> 374 <li><p><?php _e( 'Check the junk or spam folder of your email client. Sometime e-mail messages wind up there by mistake.' ) ?></p></li> 375 <li><?php printf( __( 'Have you entered your e-mail address correctly? You have entered %s, if it’s incorrect, you will not receive your e-mail message.' ), $user_email ) ?></li> 376 376 </ul> 377 377 </p> 378 378 <?php -
wp-comments-post.php
77 77 if ( 6 > strlen($comment_author_email) || '' == $comment_author ) 78 78 wp_die( __('Error: please fill the required fields (name, email).') ); 79 79 elseif ( !is_email($comment_author_email)) 80 wp_die( __('Error: please enter a valid e mail address.') );80 wp_die( __('Error: please enter a valid e-mail address.') ); 81 81 } 82 82 83 83 if ( '' == $comment_content ) -
wp-login.php
131 131 } 132 132 133 133 /** 134 * Handles sending password retrieval e mailto user.134 * Handles sending password retrieval e-mail message to user. 135 135 * 136 136 * @uses $wpdb WordPress Database object 137 137 * … … 148 148 if ( strpos($_POST['user_login'], '@') ) { 149 149 $user_data = get_user_by_email(trim($_POST['user_login'])); 150 150 if ( empty($user_data) ) 151 $errors->add('invalid_email', __('<strong>ERROR</strong>: There is no user registered with that e mail address.'));151 $errors->add('invalid_email', __('<strong>ERROR</strong>: There is no user registered with that e-mail address.')); 152 152 } else { 153 153 $login = trim($_POST['user_login']); 154 154 $user_data = get_userdatabylogin($login); … … 164 164 return $errors; 165 165 } 166 166 167 // redefining user_login ensures we return the right case in the e mail167 // redefining user_login ensures we return the right case in the e-mail 168 168 $user_login = $user_data->user_login; 169 169 $user_email = $user_data->user_email; 170 170 … … 189 189 $message = __('Someone has asked to reset the password for the following site and username.') . "\r\n\r\n"; 190 190 $message .= network_site_url() . "\r\n\r\n"; 191 191 $message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n"; 192 $message .= __('To reset your password visit the following address, otherwise just ignore this e mailand nothing will happen.') . "\r\n\r\n";192 $message .= __('To reset your password visit the following address, otherwise just ignore this e-mail message and nothing will happen.') . "\r\n\r\n"; 193 193 $message .= network_site_url("wp-login.php?action=rp&key=$key&login=" . rawurlencode($user_login), 'login') . "\r\n"; 194 194 195 195 if ( is_multisite() ) 196 196 $blogname = $GLOBALS['current_site']->site_name; 197 197 else 198 198 // The blogname option is escaped with esc_html on the way into the database in sanitize_option 199 // we want to reverse this for the plain text arena of e mails.199 // we want to reverse this for the plain text arena of e-mails. 200 200 $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES); 201 201 202 202 $title = sprintf( __('[%s] Password Reset'), $blogname ); … … 248 248 $blogname = $GLOBALS['current_site']->site_name; 249 249 else 250 250 // The blogname option is escaped with esc_html on the way into the database in sanitize_option 251 // we want to reverse this for the plain text arena of e mails.251 // we want to reverse this for the plain text arena of e-mails. 252 252 $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES); 253 253 254 254 $title = sprintf( __('[%s] Your new password'), $blogname ); … … 268 268 * Handles registering a new user. 269 269 * 270 270 * @param string $user_login User's username for logging in 271 * @param string $user_email User's e mail address to send password and add271 * @param string $user_email User's e-mail address to send password and add 272 272 * @return int|WP_Error Either user's ID or error on failure. 273 273 */ 274 274 function register_new_user( $user_login, $user_email ) { … … 291 291 if ( $user_email == '' ) { 292 292 $errors->add( 'empty_email', __( '<strong>ERROR</strong>: Please type your e-mail address.' ) ); 293 293 } elseif ( ! is_email( $user_email ) ) { 294 $errors->add( 'invalid_email', __( '<strong>ERROR</strong>: The e mail address isn’t correct.' ) );294 $errors->add( 'invalid_email', __( '<strong>ERROR</strong>: The e-mail address isn’t correct.' ) ); 295 295 $user_email = ''; 296 296 } elseif ( email_exists( $user_email ) ) { 297 $errors->add( 'email_exists', __( '<strong>ERROR</strong>: This e mail is already registered, please choose another one.' ) );297 $errors->add( 'email_exists', __( '<strong>ERROR</strong>: This e-mail is already registered, please choose another one.' ) ); 298 298 } 299 299 300 300 do_action( 'register_post', $sanitized_user_login, $user_email, $errors ); -
wp-includes/comment.php
29 29 * @uses $wpdb 30 30 * 31 31 * @param string $author Comment Author's name 32 * @param string $email Comment Author's e mail32 * @param string $email Comment Author's e-mail address 33 33 * @param string $url Comment Author's URL 34 34 * @param string $comment Comment contents 35 35 * @param string $user_ip Comment Author's IP address … … 599 599 * last comment timestamp and new comment timestamp. 600 600 * 601 601 * @param string $ip Comment IP. 602 * @param string $email Comment author e mail address.602 * @param string $email Comment author e-mail address. 603 603 * @param string $date MySQL time string. 604 604 */ 605 605 function check_comment_flood_db( $ip, $email, $date ) { … … 757 757 * @uses do_action() Calls 'wp_blacklist_check' hook for all parameters. 758 758 * 759 759 * @param string $author The author of the comment 760 * @param string $email The e mailof the comment760 * @param string $email The e-mail address of the author of the comment 761 761 * @param string $url The url used in the comment 762 762 * @param string $comment The comment content 763 763 * @param string $user_ip The comment author IP address … … 1102 1102 } 1103 1103 1104 1104 /** 1105 * Get current commenter's name, e mail, and URL.1105 * Get current commenter's name, e-mail address, and URL. 1106 1106 * 1107 1107 * Expects cookies content to already be sanitized. User of this function might 1108 1108 * wish to recheck the returned array for validity. … … 1111 1111 * 1112 1112 * @since 2.0.4 1113 1113 * 1114 * @return array Comment author, e mail, url respectively.1114 * @return array Comment author, e-mail address, url respectively. 1115 1115 */ 1116 1116 function wp_get_current_commenter() { 1117 1117 // Cookies should already be sanitized. … … 1192 1192 * @uses apply_filters() Calls 'pre_comment_content' hook on the comment's content 1193 1193 * @uses apply_filters() Calls 'pre_comment_user_ip' hook on comment author's IP 1194 1194 * @uses apply_filters() Calls 'pre_comment_author_url' hook on comment author's URL 1195 * @uses apply_filters() Calls 'pre_comment_author_email' hook on comment author's e mail address1195 * @uses apply_filters() Calls 'pre_comment_author_email' hook on comment author's e-mail address 1196 1196 * 1197 1197 * @param array $commentdata Contains information on the comment. 1198 1198 * @return array Parsed comment information. -
wp-includes/registration.php
22 22 } 23 23 24 24 /** 25 * Checks whether the given e mailexists.25 * Checks whether the given e-mail address exists. 26 26 * 27 27 * @since 2.1.0 28 28 * @uses $wpdb 29 29 * 30 * @param string $email E mail.30 * @param string $email E-mail address. 31 31 * @return bool|int The user's ID on success, and false on failure. 32 32 */ 33 33 function email_exists( $email ) { … … 74 74 * 'user_nicename' - A string that contains a nicer looking name for the user. 75 75 * The default is the user's username. 76 76 * 'user_url' - A string containing the user's URL for the user's web site. 77 * 'user_email' - A string containing the user's e mail address.77 * 'user_email' - A string containing the user's e-mail address. 78 78 * 'display_name' - A string that will be shown on the site. Defaults to user's 79 79 * username. It is likely that you will want to change this, for both 80 80 * appearance and security through obscurity (that is if you don't use and … … 141 141 $user_email = apply_filters('pre_user_email', $user_email); 142 142 143 143 if ( !$update && ! defined( 'WP_IMPORTING' ) && email_exists($user_email) ) 144 return new WP_Error('existing_user_email', __('This e mail address is already registered.') );144 return new WP_Error('existing_user_email', __('This e-mail address is already registered.') ); 145 145 146 146 if ( empty($display_name) ) 147 147 $display_name = $user_login; … … 292 292 /** 293 293 * A simpler way of inserting an user into the database. 294 294 * 295 * Creates a new user with just the username, password, and e mail. For a more295 * Creates a new user with just the username, password, and e-mail address. For a more 296 296 * detail creation of a user, use wp_insert_user() to specify more infomation. 297 297 * 298 298 * @since 2.0.0 … … 300 300 * 301 301 * @param string $username The user's username. 302 302 * @param string $password The user's password. 303 * @param string $email The user's e mail(optional).303 * @param string $email The user's e-mail address (optional). 304 304 * @return int The new user's ID. 305 305 */ 306 306 function wp_create_user($username, $password, $email = '') { -
wp-includes/comment-template.php
49 49 } 50 50 51 51 /** 52 * Retrieve the e mailof the author of the current comment.52 * Retrieve the e-mail address of the author of the current comment. 53 53 * 54 54 * @since 1.5.0 55 * @uses apply_filters() Calls the 'get_comment_author_email' hook on the comment author e mail55 * @uses apply_filters() Calls the 'get_comment_author_email' hook on the comment author e-mail address 56 56 * @uses $comment 57 57 * 58 * @param int $comment_ID The ID of the comment for which to get the author's e mail. Optional.59 * @return string The current comment author's e mail58 * @param int $comment_ID The ID of the comment for which to get the author's e-mail address. Optional. 59 * @return string The current comment author's e-mail address 60 60 */ 61 61 function get_comment_author_email( $comment_ID = 0 ) { 62 62 $comment = get_comment( $comment_ID ); … … 64 64 } 65 65 66 66 /** 67 * Display the e mailof the author of the current global $comment.67 * Display the e-mail address of the author of the current global $comment. 68 68 * 69 * Care should be taken to protect the e mail address and assure that email70 * harvesters do not capture your commentors' e mail address. Most assume that71 * their e mail address will not appear in raw form on the blog. Doing so will72 * enable anyone, including those that people don't want to get the e mail69 * Care should be taken to protect the e-mail address and assure that e-mail 70 * harvesters do not capture your commentors' e-mail address. Most assume that 71 * their e-mail address will not appear in raw form on the blog. Doing so will 72 * enable anyone, including those that people don't want to get the e-mail 73 73 * address and use it for their own means good and bad. 74 74 * 75 75 * @since 0.71 76 * @uses apply_filters() Calls 'author_email' hook on the author e mail76 * @uses apply_filters() Calls 'author_email' hook on the author e-mail address 77 77 * 78 * @param int $comment_ID The ID of the comment for which to print the author's email . Optional.78 * @param int $comment_ID The ID of the comment for which to print the author's email address. Optional. 79 79 */ 80 80 function comment_author_email( $comment_ID = 0 ) { 81 81 echo apply_filters('author_email', get_comment_author_email( $comment_ID ) ); 82 82 } 83 83 84 84 /** 85 * Display the html e mail link to the author of the current comment.85 * Display the html e-mail link to the author of the current comment. 86 86 * 87 * Care should be taken to protect the e mail address and assure that email88 * harvesters do not capture your commentors' e mail address. Most assume that89 * their e mail address will not appear in raw form on the blog. Doing so will90 * enable anyone, including those that people don't want to get the e mail87 * Care should be taken to protect the e-mail address and assure that e-mail 88 * harvesters do not capture your commentors' e-mail address. Most assume that 89 * their e-mail address will not appear in raw form on the blog. Doing so will 90 * enable anyone, including those that people don't want to get the e-mail 91 91 * address and use it for their own means good and bad. 92 92 * 93 93 * @since 0.71 94 * @uses apply_filters() Calls 'comment_email' hook for the display of the comment author's e mail94 * @uses apply_filters() Calls 'comment_email' hook for the display of the comment author's e-mail address 95 95 * @uses get_comment_author_email_link() For generating the link 96 96 * @global object $comment The current Comment row object 97 97 * 98 * @param string $linktext The text to display instead of the comment author's e mail address99 * @param string $before The text or HTML to display before the e mail link.100 * @param string $after The text or HTML to display after the e mail link.98 * @param string $linktext The text to display instead of the comment author's e-mail address 99 * @param string $before The text or HTML to display before the e-mail link. 100 * @param string $after The text or HTML to display after the e-mail link. 101 101 */ 102 102 function comment_author_email_link($linktext='', $before='', $after='') { 103 103 if ( $link = get_comment_author_email_link( $linktext, $before, $after ) ) … … 105 105 } 106 106 107 107 /** 108 * Return the html e mail link to the author of the current comment.108 * Return the html e-mail link to the author of the current comment. 109 109 * 110 * Care should be taken to protect the e mail address and assure that email111 * harvesters do not capture your commentors' e mail address. Most assume that112 * their e mail address will not appear in raw form on the blog. Doing so will113 * enable anyone, including those that people don't want to get the e mail110 * Care should be taken to protect the e-mail address and assure that e-mail 111 * harvesters do not capture your commentors' e-mail address. Most assume that 112 * their e-mail address will not appear in raw form on the blog. Doing so will 113 * enable anyone, including those that people don't want to get the e-mail 114 114 * address and use it for their own means good and bad. 115 115 * 116 116 * @since 2.7 117 * @uses apply_filters() Calls 'comment_email' hook for the display of the comment author's e mail117 * @uses apply_filters() Calls 'comment_email' hook for the display of the comment author's e-mail address 118 118 * @global object $comment The current Comment row object 119 119 * 120 * @param string $linktext The text to display instead of the comment author's e mail address121 * @param string $before The text or HTML to display before the e mail link.122 * @param string $after The text or HTML to display after the e mail link.120 * @param string $linktext The text to display instead of the comment author's e-mail address 121 * @param string $before The text or HTML to display before the e-mail link. 122 * @param string $after The text or HTML to display after the e-mail link. 123 123 */ 124 124 function get_comment_author_email_link($linktext='', $before='', $after='') { 125 125 global $comment; … … 237 237 * @since 1.5.0 238 238 * @uses apply_filters() Calls the 'get_comment_author_url_link' on the complete HTML before returning. 239 239 * 240 * @param string $linktext The text to display instead of the comment author's e mail address241 * @param string $before The text or HTML to display before the e mail link.242 * @param string $after The text or HTML to display after the e mail link.240 * @param string $linktext The text to display instead of the comment author's e-mail address 241 * @param string $before The text or HTML to display before the e-mail link. 242 * @param string $after The text or HTML to display after the e-mail link. 243 243 * @return string The HTML link between the $before and $after parameters 244 244 */ 245 245 function get_comment_author_url_link( $linktext = '', $before = '', $after = '' ) { … … 259 259 * @since 0.71 260 260 * @see get_comment_author_url_link() Echoes result 261 261 * 262 * @param string $linktext The text to display instead of the comment author's e mail address263 * @param string $before The text or HTML to display before the e mail link.264 * @param string $after The text or HTML to display after the e mail link.262 * @param string $linktext The text to display instead of the comment author's e-mail address 263 * @param string $before The text or HTML to display before the e-mail link. 264 * @param string $after The text or HTML to display after the e-mail link. 265 265 */ 266 266 function comment_author_url_link( $linktext = '', $before = '', $after = '' ) { 267 267 echo get_comment_author_url_link( $linktext, $before, $after ); … … 876 876 $comment_author = $commenter['comment_author']; // Escaped by sanitize_comment_cookies() 877 877 878 878 /** 879 * The e mail address of the current comment author escaped for use in attributes.879 * The e-mail address of the current comment author escaped for use in attributes. 880 880 */ 881 881 $comment_author_email = $commenter['comment_author_email']; // Escaped by sanitize_comment_cookies() 882 882 … … 1526 1526 $fields = array( 1527 1527 'author' => '<p class="comment-form-author">' . '<label for="author">' . __( 'Name' ) . '</label> ' . ( $req ? '<span class="required">*</span>' : '' ) . 1528 1528 '<input id="author" name="author" type="text" value="' . esc_attr( $commenter['comment_author'] ) . '" size="30"' . $aria_req . ' /></p>', 1529 'email' => '<p class="comment-form-email"><label for="email">' . __( 'E mail' ) . '</label> ' . ( $req ? '<span class="required">*</span>' : '' ) .1529 'email' => '<p class="comment-form-email"><label for="email">' . __( 'E-mail' ) . '</label> ' . ( $req ? '<span class="required">*</span>' : '' ) . 1530 1530 '<input id="email" name="email" type="text" value="' . esc_attr( $commenter['comment_author_email'] ) . '" size="30"' . $aria_req . ' /></p>', 1531 1531 'url' => '<p class="comment-form-url"><label for="url">' . __( 'Website' ) . '</label>' . 1532 1532 '<input id="url" name="url" type="text" value="' . esc_attr( $commenter['comment_author_url'] ) . '" size="30" /></p>', … … 1538 1538 'comment_field' => '<p class="comment-form-comment"><label for="comment">' . _x( 'Comment', 'noun' ) . '</label><textarea id="comment" name="comment" cols="45" rows="8" aria-required="true"></textarea></p>', 1539 1539 'must_log_in' => '<p class="must-log-in">' . sprintf( __( 'You must be <a href="%s">logged in</a> to post a comment.' ), wp_login_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ) . '</p>', 1540 1540 'logged_in_as' => '<p class="logged-in-as">' . sprintf( __( 'Logged in as <a href="%1$s">%2$s</a>. <a href="%3$s" title="Log out of this account">Log out?</a>' ), admin_url( 'profile.php' ), $user_identity, wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ) . '</p>', 1541 'comment_notes_before' => '<p class="comment-notes">' . __( 'Your e mail address will not be published.' ) . ( $req ? $required_text : '' ) . '</p>',1541 'comment_notes_before' => '<p class="comment-notes">' . __( 'Your e-mail address will not be published.' ) . ( $req ? $required_text : '' ) . '</p>', 1542 1542 'comment_notes_after' => '<p class="form-allowed-tags">' . sprintf( __( 'You may use these <abbr title="HyperText Markup Language">HTML</abbr> tags and attributes: %s' ), ' <code>' . allowed_tags() . '</code>' ) . '</p>', 1543 1543 'id_form' => 'commentform', 1544 1544 'id_submit' => 'submit', -
wp-includes/user.php
517 517 * @global string $user_login The user username for logging in 518 518 * @global int $user_level The level of the user 519 519 * @global int $user_ID The ID of the user 520 * @global string $user_email The e mail address of the user520 * @global string $user_email The e-mail address of the user 521 521 * @global string $user_url The url in the user's profile 522 522 * @global string $user_pass_md5 MD5 of the user's password 523 523 * @global string $user_identity The display name of the user -
wp-includes/formatting.php
1257 1257 } 1258 1258 1259 1259 /** 1260 * Converts email addresses characters to HTML entities to block spam bots.1260 * Converts an e-mail address characters to HTML entities to block spam bots. 1261 1261 * 1262 1262 * @since 0.71 1263 1263 * 1264 * @param string $emailaddy E mail address.1264 * @param string $emailaddy E-mail address. 1265 1265 * @param int $mailto Optional. Range from 0 to 1. Used for encoding. 1266 * @return string Converted e mail address.1266 * @return string Converted e-mail address. 1267 1267 */ 1268 1268 function antispambot($emailaddy, $mailto=0) { 1269 1269 $emailNOSPAMaddy = ''; … … 1333 1333 } 1334 1334 1335 1335 /** 1336 * Callback to convert e mail address match to HTML A element.1336 * Callback to convert e-mail address match to HTML A element. 1337 1337 * 1338 1338 * This function was backported from 2.5.0 to 2.3.2. Regex callback for {@link 1339 1339 * make_clickable()}. … … 1342 1342 * @access private 1343 1343 * 1344 1344 * @param array $matches Single Regex Match. 1345 * @return string HTML A element with e mail address.1345 * @return string HTML A element with e-mail address. 1346 1346 */ 1347 1347 function _make_email_clickable_cb($matches) { 1348 1348 $email = $matches[2] . '@' . $matches[3]; … … 1352 1352 /** 1353 1353 * Convert plaintext URI to HTML links. 1354 1354 * 1355 * Converts URI, www and ftp, and e mail addresses. Finishes by fixing links1355 * Converts URI, www and ftp, and e-mail addresses. Finishes by fixing links 1356 1356 * within links. 1357 1357 * 1358 1358 * @since 0.71 … … 1469 1469 } 1470 1470 1471 1471 /** 1472 * Verifies that an e mailis valid.1472 * Verifies that an e-mail address is valid. 1473 1473 * 1474 1474 * Does not grok i18n domains. Not RFC compliant. 1475 1475 * 1476 1476 * @since 0.71 1477 1477 * 1478 * @param string $email E mail address to verify.1478 * @param string $email E-mail address to verify. 1479 1479 * @param boolean $deprecated. Deprecated. 1480 * @return string|bool Either false or the valid e mail address.1480 * @return string|bool Either false or the valid e-mail address. 1481 1481 */ 1482 1482 function is_email( $email, $deprecated = false ) { 1483 1483 if ( ! empty( $deprecated ) ) 1484 1484 _deprecated_argument( __FUNCTION__, '3.0' ); 1485 1485 1486 // Test for the minimum length the e mail can be1486 // Test for the minimum length the e-mail can be 1487 1487 if ( strlen( $email ) < 3 ) { 1488 1488 return apply_filters( 'is_email', false, $email, 'email_too_short' ); 1489 1489 } … … 1534 1534 } 1535 1535 } 1536 1536 1537 // Congratulations your e mailmade it!1537 // Congratulations your e-mail address made it! 1538 1538 return apply_filters( 'is_email', $email, $email, null ); 1539 1539 } 1540 1540 1541 1541 /** 1542 * Convert to ASCII from e mailsubjects.1542 * Convert to ASCII from e-mail message subjects. 1543 1543 * 1544 1544 * @since 1.2.0 1545 * @usedby wp_mail() handles charsets in e mailsubjects1545 * @usedby wp_mail() handles charsets in e-mail message subjects 1546 1546 * 1547 1547 * @param string $string Subject line 1548 1548 * @return string Converted string to ASCII … … 1685 1685 } 1686 1686 1687 1687 /** 1688 * Strips out all characters that are not allowable in an e mail.1688 * Strips out all characters that are not allowable in an e-mail address. 1689 1689 * 1690 1690 * @since 1.5.0 1691 1691 * 1692 * @param string $email E mail address to filter.1693 * @return string Filtered e mail address.1692 * @param string $email E-mail address to filter. 1693 * @return string Filtered e-mail address. 1694 1694 */ 1695 1695 function sanitize_email( $email ) { 1696 // Test for the minimum length the e mail can be1696 // Test for the minimum length the e-mail can be 1697 1697 if ( strlen( $email ) < 3 ) { 1698 1698 return apply_filters( 'sanitize_email', '', $email, 'email_too_short' ); 1699 1699 } … … 1759 1759 // Join valid subs into the new domain 1760 1760 $domain = join( '.', $new_subs ); 1761 1761 1762 // Put the e mailback together1762 // Put the e-mail address back together 1763 1763 $email = $local . '@' . $domain; 1764 1764 1765 1765 // Congratulations your email made it! … … 2387 2387 if ( !is_email($value) ) { 2388 2388 $value = get_option( $option ); // Resets option to stored value in the case of failed sanitization 2389 2389 if ( function_exists('add_settings_error') ) 2390 add_settings_error('admin_email', 'invalid_admin_email', __('The e mail address entered did not appear to be a valid email address. Please enter a valid email address.'));2390 add_settings_error('admin_email', 'invalid_admin_email', __('The e-mail address entered did not appear to be a valid e-mail address. Please enter a valid e-mail address.')); 2391 2391 } 2392 2392 break; 2393 2393 -
wp-includes/deprecated.php
1228 1228 * 1229 1229 * @param string $username The user's username. 1230 1230 * @param string $password The user's password. 1231 * @param string $email The user's e mail(optional).1231 * @param string $email The user's e-mail address (optional). 1232 1232 * @return int The new user's ID. 1233 1233 */ 1234 1234 function create_user($username, $password, $email) { … … 1459 1459 } 1460 1460 1461 1461 /** 1462 * Retrieve the e mailof the author of the current post.1462 * Retrieve the e-mail address of the author of the current post. 1463 1463 * 1464 1464 * @since 1.5 1465 1465 * @deprecated 2.8 … … 1474 1474 } 1475 1475 1476 1476 /** 1477 * Display the e mailof the author of the current post.1477 * Display the e-mail address of the author of the current post. 1478 1478 * 1479 1479 * @since 0.71 1480 1480 * @deprecated 2.8 -
wp-includes/pluggable.php
163 163 * @since 2.8.0 164 164 * 165 165 * @param string $field The field to retrieve the user with. id | slug | email | login 166 * @param int|string $value A value for $field. A user ID, slug, e mail address, or login name.166 * @param int|string $value A value for $field. A user ID, slug, e-mail address, or login name. 167 167 * @return bool|object False on failure, User DB row object 168 168 */ 169 169 function get_user_by($field, $value) { … … 218 218 219 219 if ( !function_exists('get_user_by_email') ) : 220 220 /** 221 * Retrieve user info by e mail.221 * Retrieve user info by e-mail address. 222 222 * 223 223 * @since 2.5 224 224 * 225 * @param string $email User's e mail address225 * @param string $email User's e-mail address 226 226 * @return bool|object False on failure, User DB row object 227 227 */ 228 228 function get_user_by_email($email) { … … 235 235 * Send mail, similar to PHP's mail 236 236 * 237 237 * A true return value does not automatically mean that the user received the 238 * e mail successfully. It just only means that the method used was able to238 * e-mail successfully. It just only means that the method used was able to 239 239 * process the request without any errors. 240 240 * 241 241 * Using the two 'wp_mail_from' and 'wp_mail_from_name' hooks allow from 242 242 * creating a from address like 'Name <email@address.com>' when both are set. If 243 * just 'wp_mail_from' is set, then just the e mail address will be used with no243 * just 'wp_mail_from' is set, then just the e-mail address will be used with no 244 244 * name. 245 245 * 246 246 * The default content type is 'text/plain' which does not allow using HTML. 247 * However, you can set the content type of the e mail by using the247 * However, you can set the content type of the e-mail by using the 248 248 * 'wp_mail_content_type' filter. 249 249 * 250 250 * The default charset is based on the charset used on the blog. The charset can … … 252 252 * 253 253 * @since 1.2.1 254 254 * @uses apply_filters() Calls 'wp_mail' hook on an array of all of the parameters. 255 * @uses apply_filters() Calls 'wp_mail_from' hook to get the from e mail address.255 * @uses apply_filters() Calls 'wp_mail_from' hook to get the from e-mail address. 256 256 * @uses apply_filters() Calls 'wp_mail_from_name' hook to get the from address name. 257 * @uses apply_filters() Calls 'wp_mail_content_type' hook to get the e mail content type.258 * @uses apply_filters() Calls 'wp_mail_charset' hook to get the e mail charset257 * @uses apply_filters() Calls 'wp_mail_content_type' hook to get the e-mail content type. 258 * @uses apply_filters() Calls 'wp_mail_charset' hook to get the e-mail charset 259 259 * @uses do_action_ref_array() Calls 'phpmailer_init' hook on the reference to 260 260 * phpmailer object. 261 261 * @uses PHPMailer 262 262 * @ 263 263 * 264 * @param string|array $to Array or comma-separated list of e mail addresses to send message.265 * @param string $subject E mail subject264 * @param string|array $to Array or comma-separated list of e-mail addresses to send message. 265 * @param string $subject E-mail subject 266 266 * @param string $message Message contents 267 267 * @param string|array $headers Optional. Additional headers. 268 268 * @param string|array $attachments Optional. Files to attach. 269 * @return bool Whether the e mail contents were sent successfully.269 * @return bool Whether the e-mail contents were sent successfully. 270 270 */ 271 271 function wp_mail( $to, $subject, $message, $headers = '', $attachments = array() ) { 272 272 // Compact the input, apply the filters, and extract them back out … … 369 369 $phpmailer->ClearCustomHeaders(); 370 370 $phpmailer->ClearReplyTos(); 371 371 372 // From e mail and name372 // From e-mail and name 373 373 // If we don't have a name from the input headers 374 374 if ( !isset( $from_name ) ) 375 375 $from_name = 'WordPress'; 376 376 377 /* If we don't have an e mail from the input headers default to wordpress@$sitename377 /* If we don't have an e-mail from the input headers default to wordpress@$sitename 378 378 * Some hosts will block outgoing mail from this address if it doesn't exist but 379 379 * there's no easy alternative. Defaulting to admin_email might appear to be another 380 380 * option but some hosts may refuse to relay mail from an unknown domain. See … … 998 998 * 999 999 * @param int $comment_id Comment ID 1000 1000 * @param string $comment_type Optional. The comment type either 'comment' (default), 'trackback', or 'pingback' 1001 * @return bool False if user e maildoes not exist. True on completion.1001 * @return bool False if user e-mail address does not exist. True on completion. 1002 1002 */ 1003 1003 function wp_notify_postauthor($comment_id, $comment_type='') { 1004 1004 $comment = get_comment($comment_id); … … 1007 1007 1008 1008 if ( $comment->user_id == $post->post_author ) return false; // The author moderated a comment on his own post 1009 1009 1010 if ('' == $user->user_email) return false; // If there's no e mailto send the comment to1010 if ('' == $user->user_email) return false; // If there's no e-mail address to send the comment to 1011 1011 1012 1012 $comment_author_domain = @gethostbyaddr($comment->comment_author_IP); 1013 1013 1014 1014 // The blogname option is escaped with esc_html on the way into the database in sanitize_option 1015 // we want to reverse this for the plain text arena of e mails.1015 // we want to reverse this for the plain text arena of e-mail messages. 1016 1016 $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES); 1017 1017 1018 1018 if ( empty( $comment_type ) ) $comment_type = 'comment'; … … 1105 1105 $comments_waiting = $wpdb->get_var("SELECT count(comment_ID) FROM $wpdb->comments WHERE comment_approved = '0'"); 1106 1106 1107 1107 // The blogname option is escaped with esc_html on the way into the database in sanitize_option 1108 // we want to reverse this for the plain text arena of e mails.1108 // we want to reverse this for the plain text arena of e-mail messages. 1109 1109 $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES); 1110 1110 1111 1111 switch ($comment->comment_type) … … 1162 1162 1163 1163 if ( !function_exists('wp_password_change_notification') ) : 1164 1164 /** 1165 * Notify the blog admin of a user changing password, normally via e mail.1165 * Notify the blog admin of a user changing password, normally via e-mail. 1166 1166 * 1167 1167 * @since 2.7 1168 1168 * … … 1174 1174 if ( $user->user_email != get_option('admin_email') ) { 1175 1175 $message = sprintf(__('Password Lost and Changed for user: %s'), $user->user_login) . "\r\n"; 1176 1176 // The blogname option is escaped with esc_html on the way into the database in sanitize_option 1177 // we want to reverse this for the plain text arena of e mails.1177 // we want to reverse this for the plain text arena of e-mail messages. 1178 1178 $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES); 1179 1179 wp_mail(get_option('admin_email'), sprintf(__('[%s] Password Lost/Changed'), $blogname), $message); 1180 1180 } … … 1183 1183 1184 1184 if ( !function_exists('wp_new_user_notification') ) : 1185 1185 /** 1186 * Notify the blog admin of a new user, normally via e mail.1186 * Notify the blog admin of a new user, normally via e-mail. 1187 1187 * 1188 1188 * @since 2.0 1189 1189 * … … 1197 1197 $user_email = stripslashes($user->user_email); 1198 1198 1199 1199 // The blogname option is escaped with esc_html on the way into the database in sanitize_option 1200 // we want to reverse this for the plain text arena of e mails.1200 // we want to reverse this for the plain text arena of e-mail messages. 1201 1201 $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES); 1202 1202 1203 1203 $message = sprintf(__('New user registration on your site %s:'), $blogname) . "\r\n\r\n"; … … 1586 1586 1587 1587 if ( !function_exists( 'get_avatar' ) ) : 1588 1588 /** 1589 * Retrieve the avatar for a user who provided a user ID or e mail address.1589 * Retrieve the avatar for a user who provided a user ID or e-mail address. 1590 1590 * 1591 1591 * @since 2.5 1592 * @param int|string|object $id_or_email A user ID, email address, or comment object1592 * @param int|string|object $id_or_email A user ID, e-mail address, or comment object 1593 1593 * @param int $size Size of the avatar image 1594 1594 * @param string $default URL to a default image to use if no avatar is available 1595 1595 * @param string $alt Alternate text to use in image tag. Defaults to blank -
wp-includes/ms-functions.php
441 441 $errors->add('user_name', __('That username is not allowed')); 442 442 443 443 if ( is_email_address_unsafe( $user_email ) ) 444 $errors->add('user_email', __('You cannot use that e mail address to signup. We are having problems with them blocking some of our email. Please use another email provider.'));444 $errors->add('user_email', __('You cannot use that e-mail address to signup. We are having problems with them blocking some of our e-mail. Please use another e-mail provider.')); 445 445 446 446 if ( strlen( $user_name ) < 4 ) 447 447 $errors->add('user_name', __('Username must be at least 4 characters')); … … 456 456 $errors->add('user_name', __('Sorry, usernames must have letters too!')); 457 457 458 458 if ( !is_email( $user_email ) ) 459 $errors->add('user_email', __('Please enter a correct e mail address'));459 $errors->add('user_email', __('Please enter a correct e-mail address')); 460 460 461 461 $limited_email_domains = get_site_option( 'limited_email_domains' ); 462 462 if ( is_array( $limited_email_domains ) && empty( $limited_email_domains ) == false ) { 463 463 $emaildomain = substr( $user_email, 1 + strpos( $user_email, '@' ) ); 464 464 if ( in_array( $emaildomain, $limited_email_domains ) == false ) 465 $errors->add('user_email', __('Sorry, that e mail address is not allowed!'));465 $errors->add('user_email', __('Sorry, that e-mail address is not allowed!')); 466 466 } 467 467 468 468 // Check if the username has been used already. … … 471 471 472 472 // Check if the email address has been used already. 473 473 if ( email_exists($user_email) ) 474 $errors->add('user_email', __('Sorry, that e mail address is already used!'));474 $errors->add('user_email', __('Sorry, that e-mail address is already used!')); 475 475 476 476 // Has someone already signed up for this username? 477 477 $signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE user_login = %s", $user_name) ); … … 496 496 if ( $diff > 172800 ) 497 497 $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->signups WHERE user_email = %s", $user_email) ); 498 498 else 499 $errors->add('user_email', __('That e mail address has already been used. Please check your inbox for an activation email. It will become available in a couple of days if you do nothing.'));499 $errors->add('user_email', __('That e-mail address has already been used. Please check your inbox for an activation e-mail. It will become available in a couple of days if you do nothing.')); 500 500 } 501 501 502 502 $result = array('user_name' => $user_name, 'orig_username' => $orig_username, 'user_email' => $user_email, 'errors' => $errors); … … 573 573 } 574 574 575 575 // Has someone already signed up for this domain? 576 $signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE domain = %s AND path = %s", $mydomain, $path) ); // TODO: Check e mail too?576 $signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE domain = %s AND path = %s", $mydomain, $path) ); // TODO: Check e-mail too? 577 577 if ( ! empty($signup) ) { 578 578 $diff = current_time( 'timestamp', true ) - mysql2date('U', $signup->registered); 579 579 // If registered more than two days ago, cancel registration and let this signup go through. … … 642 642 if ( !apply_filters('wpmu_signup_blog_notification', $domain, $path, $title, $user, $user_email, $key, $meta) ) 643 643 return false; 644 644 645 // Send e mailwith activation link.645 // Send e-mail message with activation link. 646 646 if ( !is_subdomain_install() || $current_site->id != 1 ) 647 647 $activate_url = network_site_url("wp-activate.php?key=$key"); 648 648 else … … 654 654 $admin_email = 'support@' . $_SERVER['SERVER_NAME']; 655 655 $from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) ); 656 656 $message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n"; 657 $message = sprintf( apply_filters( 'wpmu_signup_blog_notification_email', __( "To activate your blog, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another e mail* with your login.\n\nAfter you activate, you can visit your site here:\n\n%s" ) ), $activate_url, esc_url( "http://{$domain}{$path}" ), $key );657 $message = sprintf( apply_filters( 'wpmu_signup_blog_notification_email', __( "To activate your blog, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another e-mail message* with your login.\n\nAfter you activate, you can visit your site here:\n\n%s" ) ), $activate_url, esc_url( "http://{$domain}{$path}" ), $key ); 658 658 // TODO: Don't hard code activation link. 659 659 $subject = sprintf( apply_filters( 'wpmu_signup_blog_notification_subject', __( '[%1$s] Activate %2$s' ) ), $from_name, esc_url( 'http://' . $domain . $path ) ); 660 660 wp_mail($user_email, $subject, $message, $message_headers); … … 665 665 if ( !apply_filters('wpmu_signup_user_notification', $user, $user_email, $key, $meta) ) 666 666 return false; 667 667 668 // Send e mailwith activation link.668 // Send e-mail message with activation link. 669 669 $admin_email = get_site_option( 'admin_email' ); 670 670 if ( $admin_email == '' ) 671 671 $admin_email = 'support@' . $_SERVER['SERVER_NAME']; 672 672 $from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) ); 673 673 $message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n"; 674 $message = sprintf( apply_filters( 'wpmu_signup_user_notification_email', __( "To activate your user, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another e mail* with your login.\n\n" ) ), site_url( "wp-activate.php?key=$key" ), $key );674 $message = sprintf( apply_filters( 'wpmu_signup_user_notification_email', __( "To activate your user, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another e-mail message* with your login.\n\n" ) ), site_url( "wp-activate.php?key=$key" ), $key ); 675 675 // TODO: Don't hard code activation link. 676 676 $subject = sprintf( __( apply_filters( 'wpmu_signup_user_notification_subject', '[%1$s] Activate %2$s' ) ), $from_name, $user); 677 677 wp_mail($user_email, $subject, $message, $message_headers); -
xmlrpc.php
1299 1299 1300 1300 if ( get_option('require_name_email') ) { 1301 1301 if ( 6 > strlen($comment['comment_author_email']) || '' == $comment['comment_author'] ) 1302 return new IXR_Error( 403, __( 'Comment author name and e mail are required' ) );1302 return new IXR_Error( 403, __( 'Comment author name and e-mail are required' ) ); 1303 1303 elseif ( !is_email($comment['comment_author_email']) ) 1304 1304 return new IXR_Error( 403, __( 'A valid email address is required' ) ); 1305 1305 } -
wp-mail.php
1 1 <?php 2 2 /** 3 * Gets the e mail message from the user's mailbox to add as3 * Gets the e-mail message from the user's mailbox to add as 4 4 * a WordPress post. Mailbox connection information must be 5 5 * configured under Settings > Writing 6 6 * … … 13 13 if ( ! apply_filters( 'enable_post_by_email_configuration', true ) ) 14 14 wp_die( __( 'This action has been disabled by the administrator.' ) ); 15 15 16 /** Allow a plugin to do a complete takeover of Post by E mail **/16 /** Allow a plugin to do a complete takeover of Post by E-mail **/ 17 17 do_action('wp-mail.php'); 18 18 19 19 /** Get the POP3 class with which to access the mailbox. */ … … 103 103 $subject = $subject[0]; 104 104 } 105 105 106 // Set the author using the e mail address (From or Reply-To, the last used)106 // Set the author using the e-mail address (From or Reply-To, the last used) 107 107 // otherwise use the site admin 108 108 if ( preg_match('/(From|Reply-To): /', $line) ) { 109 109 if ( preg_match('|[a-z0-9_.-]+@[a-z0-9_.-]+(?!.*<)|i', $line, $matches) ) … … 179 179 } 180 180 $content = trim($content); 181 181 182 //Give Post-By-E mail extending plugins full access to the content182 //Give Post-By-E-mail extending plugins full access to the content 183 183 //Either the raw content or the content of the last quoted-printable section 184 184 $content = apply_filters('wp_mail_original_content', $content); 185 185 … … 212 212 if ( is_wp_error( $post_ID ) ) 213 213 echo "\n" . $post_ID->get_error_message(); 214 214 215 // We couldn't post, for whatever reason. Better move forward to the next e mail.215 // We couldn't post, for whatever reason. Better move forward to the next e-mail message. 216 216 if ( empty( $post_ID ) ) 217 217 continue; 218 218 -
readme.html
81 81 </dl> 82 82 83 83 <h1><abbr title="eXtensible Markup Language">XML</abbr>-<abbr title="Remote Procedure Call">RPC</abbr> and Atom Interface</h1> 84 <p>You can post to your WordPress blog with tools like <a href="http://download.live.com/writer">Windows Live Writer</a>, <a href="http://illuminex.com/ecto/">Ecto</a>, <a href="http://bloggar.com/">w.bloggar</a>, <a href="http://radio.userland.com/">Radio Userland</a> (which means you can use Radio's e mail-to-blog feature), <a href="http://www.newzcrawler.com/">NewzCrawler</a>, and other tools that support the blogging <abbr title="application programming interface">API</abbr>s! :) You can read more about <a href="http://codex.wordpress.org/XML-RPC_Support"><abbr>XML</abbr>-<abbr>RPC</abbr> support on the Codex</a>.</p>84 <p>You can post to your WordPress blog with tools like <a href="http://download.live.com/writer">Windows Live Writer</a>, <a href="http://illuminex.com/ecto/">Ecto</a>, <a href="http://bloggar.com/">w.bloggar</a>, <a href="http://radio.userland.com/">Radio Userland</a> (which means you can use Radio's e-mail-to-blog feature), <a href="http://www.newzcrawler.com/">NewzCrawler</a>, and other tools that support the blogging <abbr title="application programming interface">API</abbr>s! :) You can read more about <a href="http://codex.wordpress.org/XML-RPC_Support"><abbr>XML</abbr>-<abbr>RPC</abbr> support on the Codex</a>.</p> 85 85 86 <h1>Post via E mail</h1>87 <p>You can post from an e mail client! To set this up go to your "Writing" options screen and fill in the connection details for your secret <abbr title="Post Office Protocol version 3">POP3</abbr> account. Then you need to set up <code>wp-mail.php</code> to execute periodically to check the mailbox for new posts. You can do it with <a href="http://en.wikipedia.org/wiki/Cron">cron</a>-jobs, or if your host doesn't support it you can look into the various website-monitoring services, and make them check your <code>wp-mail.php</code> <abbr title="Uniform Resource Locator">URL</abbr>.</p>88 <p>Posting is easy: Any e mail sent to the address you specify will be posted, with the subject as the title. It is best to keep the address discrete. The script will <em>delete</em> emails that are successfully posted.</p>86 <h1>Post via E-mail</h1> 87 <p>You can post from an e-mail client! To set this up go to your "Writing" options screen and fill in the connection details for your secret <abbr title="Post Office Protocol version 3">POP3</abbr> account. Then you need to set up <code>wp-mail.php</code> to execute periodically to check the mailbox for new posts. You can do it with <a href="http://en.wikipedia.org/wiki/Cron">cron</a>-jobs, or if your host doesn't support it you can look into the various website-monitoring services, and make them check your <code>wp-mail.php</code> <abbr title="Uniform Resource Locator">URL</abbr>.</p> 88 <p>Posting is easy: Any e-mail message sent to the address you specify will be posted, with the subject as the title. It is best to keep the address discrete. The script will <em>delete</em> e-mail messages that are successfully posted.</p> 89 89 90 90 <h1>User Roles</h1> 91 91 <p>We introduced a very flexible roles system in version 2.0. You can <a href="http://codex.wordpress.org/Roles_and_Capabilities" title="WordPress roles and capabilities">read more about Roles and Capabilities on the Codex</a>.</p> -
wp-activate.php
65 65 <?php 66 66 echo '<p class="lead-in">'; 67 67 if ( $signup->domain . $signup->path == '' ) { 68 printf( __('Your account has been activated. You may now <a href="%1$s">login</a> to the site using your chosen username of “%2$s”. Please check your e mail inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an emailwithin an hour, you can <a href="%4$s">reset your password</a>.'), network_site_url( 'wp-login.php', 'login' ), $signup->user_login, $signup->user_email, network_site_url( 'wp-login.php?action=lostpassword', 'login' ) );68 printf( __('Your account has been activated. You may now <a href="%1$s">login</a> to the site using your chosen username of “%2$s”. Please check your e-mail inbox at %3$s for your password and login instructions. If you do not receive an e-mail message, please check your junk or spam folder. If you still do not receive an e-mail message within an hour, you can <a href="%4$s">reset your password</a>.'), network_site_url( 'wp-login.php', 'login' ), $signup->user_login, $signup->user_email, network_site_url( 'wp-login.php?action=lostpassword', 'login' ) ); 69 69 } else { 70 printf( __('Your site at <a href="%1$s">%2$s</a> is active. You may now log in to your site using your chosen username of “%3$s”. Please check your e mail inbox at %4$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an emailwithin an hour, you can <a href="%5$s">reset your password</a>.'), 'http://' . $signup->domain, $signup->domain, $signup->user_login, $signup->user_email, network_site_url( 'wp-login.php?action=lostpassword' ) );70 printf( __('Your site at <a href="%1$s">%2$s</a> is active. You may now log in to your site using your chosen username of “%3$s”. Please check your e-mail inbox at %4$s for your password and login instructions. If you do not receive an e-mail message, please check your junk or spam folder. If you still do not receive an e-mail message within an hour, you can <a href="%5$s">reset your password</a>.'), 'http://' . $signup->domain, $signup->domain, $signup->user_login, $signup->user_email, network_site_url( 'wp-login.php?action=lostpassword' ) ); 71 71 } 72 72 echo '</p>'; 73 73 } else { -
wp-admin/network.php
271 271 <th scope='row'><?php esc_html_e( 'Admin E-mail Address' ); ?></th> 272 272 <td> 273 273 <input name='email' type='text' size='45' value='<?php echo esc_attr( $admin_email ); ?>' /> 274 <br /><?php _e( 'Your e mail address.' ); ?>274 <br /><?php _e( 'Your e-mail address.' ); ?> 275 275 </td> 276 276 </tr> 277 277 </table> -
wp-admin/ms-edit.php
162 162 if ( empty( $domain ) ) 163 163 wp_die( __( 'Missing or invalid site address.' ) ); 164 164 if ( empty( $email ) ) 165 wp_die( __( 'Missing e mail address.' ) );165 wp_die( __( 'Missing e-mail address.' ) ); 166 166 if ( !is_email( $email ) ) 167 wp_die( __( 'Invalid e mail address.' ) );167 wp_die( __( 'Invalid e-mail address.' ) ); 168 168 169 169 if ( is_subdomain_install() ) { 170 170 $newdomain = $domain . '.' . preg_replace( '|^www\.|', '', $current_site->domain ); … … 607 607 wp_die( __( 'Cannot create an empty user.' ) ); 608 608 $user = $_POST['user']; 609 609 if ( empty($user['username']) && empty($user['email']) ) 610 wp_die( __( 'Missing username and e mail.' ) );610 wp_die( __( 'Missing username and e-mail address.' ) ); 611 611 elseif ( empty($user['username']) ) 612 612 wp_die( __( 'Missing username.' ) ); 613 613 elseif ( empty($user['email']) ) 614 wp_die( __( 'Missing e mail.' ) );614 wp_die( __( 'Missing e-mail address.' ) ); 615 615 616 616 $password = wp_generate_password(); 617 617 $user_id = wpmu_create_user( esc_html( strtolower( $user['username'] ) ), $password, esc_html( $user['email'] ) ); 618 618 619 619 if ( false == $user_id ) 620 wp_die( __( 'Duplicated username or e mail address.' ) );620 wp_die( __( 'Duplicated username or e-mail address.' ) ); 621 621 else 622 622 wp_new_user_notification( $user_id, $password ); 623 623 -
wp-admin/edit-comments.php
107 107 108 108 add_contextual_help( $current_screen, '<p>' . __('You can manage comments made on your site similar to the way you manage Posts and other content. This screen is customizable in the same ways as other management screens, and you can act on comments using the on-hover action links or the Bulk Actions.') . '</p>' . 109 109 '<p>' . __('A yellow row means the comment is waiting for you to moderate it.') . '</p>' . 110 '<p>' . __('In the Author column, in addition to the author’s name, e mail address, and blog URL, the commenter’s IP address is shown. Clicking on this link will show you all the comments made from this IP address.') . '</p>' .110 '<p>' . __('In the Author column, in addition to the author’s name, e-mail address, and blog URL, the commenter’s IP address is shown. Clicking on this link will show you all the comments made from this IP address.') . '</p>' . 111 111 '<p>' . __('In the Comment column, above each comment it says “Submitted on,” followed by the date and time the comment was left on your site. Clicking on the date/time link will take you to that comment on your live site.') . '</p>' . 112 112 '<p>' . __('In the In Response To column, there are three elements. The text is the name of the post that inspired the comment, and links to the post editor for that entry. The “#” permalink symbol below leads to that post on your live site. The small bubble with the number in it shows how many comments that post has received. If the bubble is gray, you have moderated all comments for that post. If it is blue, there are pending comments. Clicking the bubble will filter the comments screen to show only comments on that post.') . '</p>' . 113 113 '<p>' . __('Many people take advantage of keyboard shortcuts to moderate their comments more quickly. Use the link below to learn more.') . '</p>' . -
wp-admin/includes/upgrade.php
28 28 * 29 29 * @param string $blog_title Blog title. 30 30 * @param string $user_name User's username. 31 * @param string $user_email User's e mail.31 * @param string $user_email User's e-mail address. 32 32 * @param bool $public Whether blog is public. 33 33 * @param null $deprecated Optional. Not used. 34 34 * @param string $user_password Optional. User's chosen password. Will default to a random password. -
wp-admin/includes/user.php
170 170 } elseif ( !is_email( $user->user_email ) ) { 171 171 $errors->add( 'invalid_email', __( '<strong>ERROR</strong>: The e-mail address isn’t correct.' ), array( 'form-field' => 'email' ) ); 172 172 } elseif ( ( $owner_id = email_exists($user->user_email) ) && $owner_id != $user->ID ) { 173 $errors->add( 'email_exists', __('<strong>ERROR</strong>: This e mail is already registered, please choose another one.'), array( 'form-field' => 'email' ) );173 $errors->add( 'email_exists', __('<strong>ERROR</strong>: This e-mail is already registered, please choose another one.'), array( 'form-field' => 'email' ) ); 174 174 } 175 175 176 176 // Allow plugins to return their own errors. -
wp-admin/includes/ms.php
286 286 287 287 $content = apply_filters( 'new_admin_email_content', __( "Dear user, 288 288 289 You recently requested to have the administration e mail address on289 You recently requested to have the administration e-mail address on 290 290 your site changed. 291 291 If this is correct, please click on the following link to change it: 292 292 ###ADMIN_URL### 293 293 294 You can safely ignore and delete this e mailif you do not want to294 You can safely ignore and delete this e-mail message if you do not want to 295 295 take this action. 296 296 297 This e mailhas been sent to ###EMAIL###297 This e-mail message has been sent to ###EMAIL### 298 298 299 299 Regards, 300 300 All at ###SITENAME### … … 305 305 $content = str_replace( '###SITENAME###', get_site_option( 'site_name' ), $content ); 306 306 $content = str_replace( '###SITEURL###', network_home_url(), $content ); 307 307 308 wp_mail( $value, sprintf( __( '[%s] New Admin E mail Address' ), get_option( 'blogname' ) ), $content );308 wp_mail( $value, sprintf( __( '[%s] New Admin E-mail Address' ), get_option( 'blogname' ) ), $content ); 309 309 } 310 310 add_action( 'update_option_new_admin_email', 'update_option_new_admin_email', 10, 2 ); 311 311 add_action( 'add_option_new_admin_email', 'update_option_new_admin_email', 10, 2 ); … … 340 340 341 341 $content = apply_filters( 'new_user_email_content', __( "Dear user, 342 342 343 You recently requested to have the e mail address on your account changed.343 You recently requested to have the e-mail address on your account changed. 344 344 If this is correct, please click on the following link to change it: 345 345 ###ADMIN_URL### 346 346 347 You can safely ignore and delete this e mailif you do not want to347 You can safely ignore and delete this e-mail message if you do not want to 348 348 take this action. 349 349 350 This e mailhas been sent to ###EMAIL###350 This e-mail message has been sent to ###EMAIL### 351 351 352 352 Regards, 353 353 All at ###SITENAME### … … 358 358 $content = str_replace( '###SITENAME###', get_site_option( 'site_name' ), $content ); 359 359 $content = str_replace( '###SITEURL###', network_home_url(), $content ); 360 360 361 wp_mail( $_POST['email'], sprintf( __( '[%s] New E mail Address' ), get_option( 'blogname' ) ), $content );361 wp_mail( $_POST['email'], sprintf( __( '[%s] New E-mail Address' ), get_option( 'blogname' ) ), $content ); 362 362 $_POST['email'] = $current_user->user_email; 363 363 } 364 364 } … … 366 366 367 367 function new_user_email_admin_notice() { 368 368 if ( strpos( $_SERVER['PHP_SELF'], 'profile.php' ) && isset( $_GET['updated'] ) && $email = get_option( get_current_user_id() . '_new_email' ) ) 369 echo "<div class='update-nag'>" . sprintf( __( "Your e mail address has not been updated yet. Please check your inbox at %s for a confirmation email." ), $email['newemail'] ) . "</div>";369 echo "<div class='update-nag'>" . sprintf( __( "Your e-mail address has not been updated yet. Please check your inbox at %s for a confirmation e-mail message." ), $email['newemail'] ) . "</div>"; 370 370 } 371 371 add_action( 'admin_notices', 'new_user_email_admin_notice' ); 372 372 -
wp-admin/ms-delete-site.php
60 60 wp_mail( get_option( 'admin_email' ), "[ " . get_option( 'blogname' ) . " ] ".__( 'Delete My Site' ), $content ); 61 61 ?> 62 62 63 <p><?php _e( 'Thank you. Please check your e mail for a link to confirm your action. Your site will not be deleted until this link is clicked. ') ?></p>63 <p><?php _e( 'Thank you. Please check your e-mail for a link to confirm your action. Your site will not be deleted until this link is clicked. ') ?></p> 64 64 65 65 <?php } else { 66 66 ?> 67 <p><?php printf( __( 'If you do not want to use your %s site any more, you can delete it using the form below. When you click <strong>Delete My Site Permanently</strong> you will be sent an e mailwith a link in it. Click on this link to delete your site.'), $current_site->site_name); ?></p>67 <p><?php printf( __( 'If you do not want to use your %s site any more, you can delete it using the form below. When you click <strong>Delete My Site Permanently</strong> you will be sent an e-mail message with a link in it. Click on this link to delete your site.'), $current_site->site_name); ?></p> 68 68 <p><?php _e( 'Remember, once deleted your site cannot be restored.' ) ?></p> 69 69 70 70 <form method="post" name="deletedirect"> -
wp-admin/ms-sites.php
38 38 '<li>' . __('Visit to go to the frontend site live.') . '</li></ul>' . 39 39 '<p>' . __('The site ID is used internally, and is not shown on the front end of the site or to users/viewers.') . '</p>' . 40 40 '<p>' . __('Clicking on bold settings can re-sort this table. The upper right icons switch between list and excerpt views.') . '</p>' . 41 '<p>' . __("Clicking on Add Site, after filling out the address, title, and admin's e mail address, adds the site instantly to the network and this table. You may want to then click on the action link to edit options for that site.") . '</p>' .42 '<p>' . __('If the admin e mailfor the new site does not exist in the database, a new user will also be created.') . '</p>' .41 '<p>' . __("Clicking on Add Site, after filling out the address, title, and admin's e-mail address, adds the site instantly to the network and this table. You may want to then click on the action link to edit options for that site.") . '</p>' . 42 '<p>' . __('If the admin e-mail address for the new site does not exist in the database, a new user will also be created.') . '</p>' . 43 43 '<p><strong>' . __('For more information:') . '</strong></p>' . 44 44 '<p>' . __('<a href="http://codex.wordpress.org/Super_Admin_Sites_SubPanel" target="_blank">Documentation on Sites</a>') . '</p>' . 45 45 '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>' … … 729 729 <td><input name="blog[title]" type="text" class="regular-text" title="<?php _e( 'Title' ) ?>"/></td> 730 730 </tr> 731 731 <tr class="form-field form-required"> 732 <th scope="row"><?php _e( 'Admin E mail' ) ?></th>732 <th scope="row"><?php _e( 'Admin E-mail' ) ?></th> 733 733 <td><input name="blog[email]" type="text" class="regular-text" title="<?php _e( 'Email' ) ?>"/></td> 734 734 </tr> 735 735 <tr class="form-field"> 736 <td colspan="2"><?php _e( 'A new user will be created if the above e mail address is not in the database.' ) ?><br /><?php _e( 'The username and password will be mailed to this email address.' ) ?></td>736 <td colspan="2"><?php _e( 'A new user will be created if the above e-mail address is not in the database.' ) ?><br /><?php _e( 'The username and password will be mailed to this e-mail address.' ) ?></td> 737 737 </tr> 738 738 </table> 739 739 <p class="submit"> -
wp-admin/user-new.php
24 24 You've been invited to join '%s' at 25 25 %s as a %s. 26 26 If you do not want to join this site please ignore 27 this e mail. This invitation will expire in a few days.27 this e-mail message. This invitation will expire in a few days. 28 28 29 29 Please click the following link to activate your user account: 30 30 %%s" ), get_bloginfo('name'), site_url(), esc_html( $_REQUEST[ 'role' ] ) ); … … 88 88 } else { 89 89 $new_user_login = apply_filters('pre_user_login', sanitize_user(stripslashes($_REQUEST['user_login']), true)); 90 90 if ( isset( $_POST[ 'noconfirmation' ] ) && is_super_admin() ) { 91 add_filter( 'wpmu_signup_user_notification', '__return_false' ); // Disable confirmation e mail91 add_filter( 'wpmu_signup_user_notification', '__return_false' ); // Disable confirmation e-mail 92 92 } 93 93 wpmu_signup_user( $new_user_login, $_REQUEST[ 'email' ], array( 'add_to_blog' => $wpdb->blogid, 'new_role' => $_REQUEST[ 'role' ] ) ); 94 94 if ( isset( $_POST[ 'noconfirmation' ] ) && is_super_admin() ) { … … 118 118 '<li>' . __('Subscribers can read comments/comment/receive newsletters, etc.') . '</li>' . 119 119 '</ul>' . 120 120 '<p>' . __('You must assign a password to the new user, but don’t worry; when they log in for the first time they will be prompted to change it. The username, however, cannot be changed.') . '</p>' . 121 '<p>' . __('New users will receive an e mail letting them know they’ve been added as a user for your site. By default, this email will also contain their password. Uncheck the box if you don’t want the password to be included in the welcome email.') . '</p>' .121 '<p>' . __('New users will receive an e-mail message letting them know they’ve been added as a user for your site. By default, this e-mail message will also contain their password. Uncheck the box if you don’t want the password to be included in the welcome e-mail message.') . '</p>' . 122 122 '<p>' . __('Remember to click the Add User button at the bottom of this screen when you are finished.') . '</p>' . 123 123 '<p><strong>' . __('For more information:') . '</strong></p>' . 124 124 '<p>' . __('<a href="http://codex.wordpress.org/Users_Add_New_SubPanel" target="_blank">Documentation on Adding New Users</a>') . '</p>' . … … 136 136 if ( is_multisite() ) { 137 137 switch ( $_GET['update'] ) { 138 138 case "newuserconfimation": 139 $messages[] = __('Invitation e mail sent to new user. A confirmation link must be clicked before their account is created.');139 $messages[] = __('Invitation e-mail sent to new user. A confirmation link must be clicked before their account is created.'); 140 140 break; 141 141 case "add": 142 $messages[] = __('Invitation e mail sent to user. A confirmation link must be clicked for them to be added to your site.');142 $messages[] = __('Invitation e-mail sent to user. A confirmation link must be clicked for them to be added to your site.'); 143 143 break; 144 144 case "addnoconfirmation": 145 145 $messages[] = __('User has been added to your site.'); … … 191 191 else 192 192 echo '<p>' . sprintf(__('Users cannot currently <a href="%1$s">register themselves</a>, but you can manually create users here.'), admin_url('options-general.php#users_can_register')) . '</p>'; 193 193 } else { 194 echo '<p>' . __( 'You can add new users to your site in two ways:' ) . '<ol><li> ' . __( 'Enter the username and e mail address of an existing user on this network.' ) . '</li><li> ' . __( 'Enter the username and the email address of a person who is not already a member of this network. Choose the username carefully, it cannot be changed.' ) . '</li></ol></p>';195 echo '<p>' . __( 'That person will be sent an e mail asking them to click a link confirming the invite. New users will then be sent an emailwith a randomly generated password and a login link.' ) . '</p>';194 echo '<p>' . __( 'You can add new users to your site in two ways:' ) . '<ol><li> ' . __( 'Enter the username and e-mail address of an existing user on this network.' ) . '</li><li> ' . __( 'Enter the username and the e-mail address of a person who is not already a member of this network. Choose the username carefully, it cannot be changed.' ) . '</li></ol></p>'; 195 echo '<p>' . __( 'That person will be sent an e-mail message asking them to click a link confirming the invite. New users will then be sent an e-mail message with a randomly generated password and a login link.' ) . '</p>'; 196 196 } 197 197 ?> 198 198 <form action="#add-new-user" method="post" name="adduser" id="adduser" class="add:users: validate"<?php do_action('user_new_form_tag');?>> … … 243 243 </tr> 244 244 <tr> 245 245 <th scope="row"><label for="send_password"><?php _e('Send Password?') ?></label></th> 246 <td><label for="send_password"><input type="checkbox" name="send_password" id="send_password" <?php checked($new_user_send_password, true); ?> /> <?php _e('Send this password to the new user by e mail.'); ?></label></td>246 <td><label for="send_password"><input type="checkbox" name="send_password" id="send_password" <?php checked($new_user_send_password, true); ?> /> <?php _e('Send this password to the new user by e-mail.'); ?></label></td> 247 247 </tr> 248 248 <?php endif; ?> 249 249 <?php } // !is_multisite ?> … … 260 260 </tr> 261 261 <?php if ( is_multisite() && is_super_admin() ) { ?> 262 262 <tr> 263 <th scope="row"><label for="noconfirmation"><?php _e('Skip Confirmation E mail') ?></label></th>264 <td><label for="noconfirmation"><input type="checkbox" name="noconfirmation" id="noconfirmation" value="1" /> <?php _e( 'Site administrators can add a user without sending the confirmation e mail.' ); ?></label></td>263 <th scope="row"><label for="noconfirmation"><?php _e('Skip Confirmation E-mail') ?></label></th> 264 <td><label for="noconfirmation"><input type="checkbox" name="noconfirmation" id="noconfirmation" value="1" /> <?php _e( 'Site administrators can add a user without sending the confirmation e-mail.' ); ?></label></td> 265 265 </tr> 266 266 <?php } ?> 267 267 </table> -
wp-admin/ms-users.php
23 23 '<p>' . __('Hover over any user on the list to make the edit links appear. The Edit link on the left will take you to his or her Edit User profile page; the Edit link on the right by any site name goes to an Edit Site screen for that site.') . '</p>' . 24 24 '<p>' . __('You can also go to the user’s profile page by clicking on the individual username.') . '</p>' . 25 25 '<p>' . __('You can sort the table by clicking on any of the bold headings and switch between list and excerpt views by using the icons in the upper right.') . '</p>' . 26 '<p>' . __('The bulk action will permanently delete selected users, or mark/unmark those selected as spam. Spam users will have posts removed and will be unable to sign up again with the same e mail addresses.') . '</p>' .27 '<p>' . __('Add User will add that person to this table and send them an e mail.') . '</p>' .26 '<p>' . __('The bulk action will permanently delete selected users, or mark/unmark those selected as spam. Spam users will have posts removed and will be unable to sign up again with the same e-mail addresses.') . '</p>' . 27 '<p>' . __('Add User will add that person to this table and send them an e-mail message.') . '</p>' . 28 28 '<p>' . __('Users who are signed up to the network without a site are added as subscribers to the main or primary dashboard site, giving them profile pages to manage their accounts. These users will only see Dashboard and My Sites in the main navigation until a site is created for them.') . '</p>' . 29 29 '<p>' . __('You can make an existing user an additional super admin by going to the Edit User profile page and checking the box to grant that privilege.') . '</p>' . 30 30 '<p><strong>' . __('For more information:') . '</strong></p>' . … … 361 361 <td><input type="text" class="regular-text" name="user[username]" /></td> 362 362 </tr> 363 363 <tr class="form-field form-required"> 364 <th scope="row"><?php _e( 'E mail' ) ?></th>364 <th scope="row"><?php _e( 'E-mail' ) ?></th> 365 365 <td><input type="text" class="regular-text" name="user[email]" /></td> 366 366 </tr> 367 367 <tr class="form-field"> 368 <td colspan="2"><?php _e( 'Username and password will be mailed to the above e mail address.' ) ?></td>368 <td colspan="2"><?php _e( 'Username and password will be mailed to the above e-mail address.' ) ?></td> 369 369 </tr> 370 370 </table> 371 371 <p class="submit"> -
wp-admin/options.php
30 30 if ( !current_user_can('manage_options') ) 31 31 wp_die(__('Cheatin’ uh?')); 32 32 33 // Handle admin e mail change requests33 // Handle admin e-mail change requests 34 34 if ( is_multisite() ) { 35 35 if ( ! empty($_GET[ 'adminhash' ] ) ) { 36 36 $new_admin_details = get_option( 'adminhash' ); -
wp-admin/user-edit.php
74 74 if ( is_multisite() && ! current_user_can( 'manage_network_users' ) && $user_id != $current_user->ID && ! apply_filters( 'enable_edit_any_user_configuration', true ) ) 75 75 wp_die( __( 'You do not have permission to edit this user.' ) ); 76 76 77 // Execute confirmed e mailchange. See send_confirmation_on_profile_email().77 // Execute confirmed e-mail address change. See send_confirmation_on_profile_email(). 78 78 if ( is_multisite() && IS_PROFILE_PAGE && isset( $_GET[ 'newuseremail' ] ) && $current_user->ID ) { 79 79 $new_email = get_option( $current_user->ID . '_new_email' ); 80 80 if ( $new_email[ 'hash' ] == $_GET[ 'newuseremail' ] ) { … … 119 119 } else { 120 120 $user = get_userdata( $user_id ); 121 121 122 // Update the e mail address in signups, if present.122 // Update the e-mail address in signups, if present. 123 123 if ( $user->user_login && isset( $_POST[ 'email' ] ) && is_email( $_POST[ 'email' ] ) && $wpdb->get_var( $wpdb->prepare( "SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $user->user_login ) ) ) 124 124 $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->signups} SET user_email = %s WHERE user_login = %s", $_POST[ 'email' ], $user_login ) ); 125 125 -
wp-admin/install.php
127 127 <tr> 128 128 <th scope="row"><label for="admin_email"><?php _e( 'Your E-mail' ); ?></label></th> 129 129 <td><input name="admin_email" type="text" id="admin_email" size="25" value="<?php echo esc_attr( $admin_email ); ?>" /> 130 <p><?php _e( 'Double-check your e mail address before continuing.' ); ?></p></td>130 <p><?php _e( 'Double-check your e-mail address before continuing.' ); ?></p></td> 131 131 </tr> 132 132 <tr> 133 133 <td colspan="2"><label><input type="checkbox" name="blog_public" value="1" <?php checked( $blog_public ); ?> /> <?php _e( 'Allow my site to appear in search engines like Google and Technorati.' ); ?></label></td> -
wp-admin/ms-options.php
20 20 21 21 add_contextual_help($current_screen, 22 22 '<p>' . __('This screen sets and changes options for the network as a whole. The first site is the main site in the network and network options are pulled from that original site’s options.') . '</p>' . 23 '<p>' . __('Operational settings has fields for the network’s name and admin e mail.') . '</p>' .23 '<p>' . __('Operational settings has fields for the network’s name and admin e-mail.') . '</p>' . 24 24 '<p>' . __('Dashboard Site is an option to give a site to users who do not have a site on the system. Their default role is Subscriber, but that default can be changed. The Admin Notice Feed can provide a notice on all dashboards of the latest post via RSS or Atom, or provide no such notice if left blank.') . '</p>' . 25 25 '<p>' . __('Registration settings can disable/enable public signups. If you let others sign up for a site, install spam plugins. Spaces, not commas, should separate names banned as sites for this network.') . '</p>' . 26 '<p>' . __('New site settings are defaults applied when a new site is created in the network. These include welcome e mail for when a new site or user account is registered, and what᾿s put in the first post, page, comment, comment author, and comment URL.') . '</p>' .26 '<p>' . __('New site settings are defaults applied when a new site is created in the network. These include welcome e-mail for when a new site or user account is registered, and what᾿s put in the first post, page, comment, comment author, and comment URL.') . '</p>' . 27 27 '<p>' . __('Upload settings control the size of the uploaded files and the amount of available upload space for each site. You can change the default value for specific sites when you edit a particular site. Allowed file types are also listed (space separated only).') . '</p>' . 28 28 '<p>' . __('Checkboxes for media upload buttons set which are shown in the visual editor. If unchecked, a generic upload button is still visible; other media types can still be uploaded if on the allowed file types list.') . '</p>' . 29 29 '<p>' . __('Menu setting enables/disables the plugin menus from appearing for non super admins, so that only super admins, not site admins, have access to activate plugins.') . '</p>' . … … 59 59 </tr> 60 60 61 61 <tr valign="top"> 62 <th scope="row"><label for="admin_email"><?php _e( 'Network Admin E mail' ) ?></label></th>62 <th scope="row"><label for="admin_email"><?php _e( 'Network Admin E-mail' ) ?></label></th> 63 63 <td> 64 64 <input name="admin_email" type="text" id="admin_email" class="regular-text" value="<?php echo esc_attr( get_site_option('admin_email') ) ?>" /> 65 65 <br /> 66 <?php printf( __( 'Registration and support e mails will come from this address. Anaddress such as <code>support@%s</code> is recommended.' ), $current_site->domain ); ?>66 <?php printf( __( 'Registration and support e-mail messages will come from this address. An e-mail address such as <code>support@%s</code> is recommended.' ), $current_site->domain ); ?> 67 67 </td> 68 68 </tr> 69 69 </table> … … 133 133 update_site_option( 'registrationnotification', 'yes' ); 134 134 ?> 135 135 <td> 136 <label><input name="registrationnotification" type="checkbox" id="registrationnotification" value="yes"<?php checked( get_site_option( 'registrationnotification' ), 'yes' ) ?> /> <?php _e( 'Send the network admin an e mail notification every time someone registers a site or user account.' ) ?></label>136 <label><input name="registrationnotification" type="checkbox" id="registrationnotification" value="yes"<?php checked( get_site_option( 'registrationnotification' ), 'yes' ) ?> /> <?php _e( 'Send the network admin an e-mail notification every time someone registers a site or user account.' ) ?></label> 137 137 </td> 138 138 </tr> 139 139 … … 154 154 </tr> 155 155 156 156 <tr valign="top"> 157 <th scope="row"><label for="limited_email_domains"><?php _e( 'Limited E mail Registrations' ) ?></label></th>157 <th scope="row"><label for="limited_email_domains"><?php _e( 'Limited E-mail Registrations' ) ?></label></th> 158 158 <td> 159 159 <?php $limited_email_domains = get_site_option( 'limited_email_domains' ); 160 160 $limited_email_domains = str_replace( ' ', "\n", $limited_email_domains ); ?> … … 166 166 </tr> 167 167 168 168 <tr valign="top"> 169 <th scope="row"><label for="banned_email_domains"><?php _e('Banned E mail Domains') ?></label></th>169 <th scope="row"><label for="banned_email_domains"><?php _e('Banned E-mail Domains') ?></label></th> 170 170 <td> 171 171 <textarea name="banned_email_domains" id="banned_email_domains" cols="45" rows="5"> 172 172 <?php echo wp_htmledit_pre( get_site_option( 'banned_email_domains' ) == '' ? '' : implode( "\n", (array) get_site_option( 'banned_email_domains' ) ) ); ?></textarea> … … 180 180 <table class="form-table"> 181 181 182 182 <tr valign="top"> 183 <th scope="row"><label for="welcome_email"><?php _e( 'Welcome E mail' ) ?></label></th>183 <th scope="row"><label for="welcome_email"><?php _e( 'Welcome E-mail' ) ?></label></th> 184 184 <td> 185 185 <textarea name="welcome_email" id="welcome_email" rows="5" cols="45" class="large-text"> 186 186 <?php echo wp_htmledit_pre( stripslashes( get_site_option( 'welcome_email' ) ) ) ?></textarea> 187 187 <br /> 188 <?php _e( 'The welcome e mailsent to new site owners.' ) ?>188 <?php _e( 'The welcome e-mail message sent to new site owners.' ) ?> 189 189 </td> 190 190 </tr> 191 191 <tr valign="top"> 192 <th scope="row"><label for="welcome_user_email"><?php _e( 'Welcome User E mail' ) ?></label></th>192 <th scope="row"><label for="welcome_user_email"><?php _e( 'Welcome User E-mail' ) ?></label></th> 193 193 <td> 194 194 <textarea name="welcome_user_email" id="welcome_user_email" rows="5" cols="45" class="large-text"> 195 195 <?php echo wp_htmledit_pre( stripslashes( get_site_option( 'welcome_user_email' ) ) ) ?></textarea> 196 196 <br /> 197 <?php _e( 'The welcome e mailsent to new users.' ) ?>197 <?php _e( 'The welcome e-mail message sent to new users.' ) ?> 198 198 </td> 199 199 </tr> 200 200 <tr valign="top">