X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/8a06f4f9392d1ac373442f82ee40428a3cb81395..refs/tags/wordpress-2.8-scripts:/wp-includes/pluggable.php diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php index e7ca2a73..6074b00f 100644 --- a/wp-includes/pluggable.php +++ b/wp-includes/pluggable.php @@ -34,7 +34,7 @@ if ( !function_exists('wp_set_current_user') ) : * the signed in user. Therefore, it opens the ability to edit and perform * actions on users who aren't signed in. * - * @since 2.0.4 + * @since 2.0.3 * @global object $current_user The current user object which holds the user data. * @uses do_action() Calls 'set_current_user' hook after setting the current user. * @@ -62,7 +62,7 @@ if ( !function_exists('wp_get_current_user') ) : /** * Retrieve the current user object. * - * @since 2.0.4 + * @since 2.0.3 * * @return WP_User Current user WP_User object */ @@ -139,18 +139,49 @@ function get_userdata( $user_id ) { } endif; -if ( !function_exists('update_user_cache') ) : +if ( !function_exists('get_user_by') ) : /** - * Updates a users cache when overridden by a plugin. + * Retrieve user info by a given field * - * Core function does nothing. + * @since 2.8.0 * - * @since 1.5 - * - * @return bool Only returns true + * @param string $field The field to retrieve the user with. id | slug | email | login + * @param int|string $value A value for $field. A user ID, slug, email address, or login name. + * @return bool|object False on failure, User DB row object */ -function update_user_cache() { - return true; +function get_user_by($field, $value) { + global $wpdb; + + switch ($field) { + case 'id': + return get_userdata($value); + break; + case 'slug': + $user_id = wp_cache_get($value, 'userslugs'); + $field = 'user_nicename'; + break; + case 'email': + $user_id = wp_cache_get($value, 'useremail'); + $field = 'user_email'; + break; + case 'login': + $value = sanitize_user( $value ); + $user_id = wp_cache_get($value, 'userlogins'); + $field = 'user_login'; + break; + default: + return false; + } + + if ( false !== $user_id ) + return get_userdata($user_id); + + if ( !$user = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->users WHERE $field = %s", $value) ) ) + return false; + + _fill_user($user); + + return $user; } endif; @@ -164,27 +195,7 @@ if ( !function_exists('get_userdatabylogin') ) : * @return bool|object False on failure, User DB row object */ function get_userdatabylogin($user_login) { - global $wpdb; - $user_login = sanitize_user( $user_login ); - - if ( empty( $user_login ) ) - return false; - - $user_id = wp_cache_get($user_login, 'userlogins'); - - $user = false; - if ( false !== $user_id ) - $user = wp_cache_get($user_id, 'users'); - - if ( false !== $user ) - return $user; - - if ( !$user = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->users WHERE user_login = %s", $user_login)) ) - return false; - - _fill_user($user); - - return $user; + return get_user_by('login', $user_login); } endif; @@ -198,23 +209,7 @@ if ( !function_exists('get_user_by_email') ) : * @return bool|object False on failure, User DB row object */ function get_user_by_email($email) { - global $wpdb; - - $user_id = wp_cache_get($email, 'useremail'); - - $user = false; - if ( false !== $user_id ) - $user = wp_cache_get($user_id, 'users'); - - if ( false !== $user ) - return $user; - - if ( !$user = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->users WHERE user_email = %s", $email)) ) - return false; - - _fill_user($user); - - return $user; + return get_user_by('email', $email); } endif; @@ -253,11 +248,15 @@ if ( !function_exists( 'wp_mail' ) ) : * @param string $subject Email subject * @param string $message Message contents * @param string|array $headers Optional. Additional headers. + * @param string|array $attachments Optional. Files to attach. * @return bool Whether the email contents were sent successfully. */ -function wp_mail( $to, $subject, $message, $headers = '' ) { +function wp_mail( $to, $subject, $message, $headers = '', $attachments = array() ) { // Compact the input, apply the filters, and extract them back out - extract( apply_filters( 'wp_mail', compact( 'to', 'subject', 'message', 'headers' ) ) ); + extract( apply_filters( 'wp_mail', compact( 'to', 'subject', 'message', 'headers', 'attachments' ) ) ); + + if ( !is_array($attachments) ) + $attachments = explode( "\n", $attachments ); global $phpmailer; @@ -271,18 +270,27 @@ function wp_mail( $to, $subject, $message, $headers = '' ) { // Headers if ( empty( $headers ) ) { $headers = array(); - } elseif ( !is_array( $headers ) ) { - // Explode the headers out, so this function can take both - // string headers and an array of headers. - $tempheaders = (array) explode( "\n", $headers ); + } else { + if ( !is_array( $headers ) ) { + // Explode the headers out, so this function can take both + // string headers and an array of headers. + $tempheaders = (array) explode( "\n", $headers ); + } else { + $tempheaders = $headers; + } $headers = array(); // If it's actually got contents if ( !empty( $tempheaders ) ) { // Iterate through the raw headers - foreach ( $tempheaders as $header ) { - if ( strpos($header, ':') === false ) + foreach ( (array) $tempheaders as $header ) { + if ( strpos($header, ':') === false ) { + if ( false !== stripos( $header, 'boundary=' ) ) { + $parts = preg_split('/boundary=/i', trim( $header ) ); + $boundary = trim( str_replace( array( "'", '"' ), '', $parts[1] ) ); + } continue; + } // Explode them out list( $name, $content ) = explode( ':', trim( $header ), 2 ); @@ -302,13 +310,18 @@ function wp_mail( $to, $subject, $message, $headers = '' ) { $from_email = str_replace( '>', '', $from_email ); $from_email = trim( $from_email ); } else { - $from_name = trim( $content ); + $from_email = trim( $content ); } } elseif ( 'content-type' == strtolower($name) ) { if ( strpos( $content,';' ) !== false ) { list( $type, $charset ) = explode( ';', $content ); $content_type = trim( $type ); - $charset = trim( str_replace( array( 'charset=', '"' ), '', $charset ) ); + if ( false !== stripos( $charset, 'charset=' ) ) { + $charset = trim( str_replace( array( 'charset=', '"' ), '', $charset ) ); + } elseif ( false !== stripos( $charset, 'boundary=' ) ) { + $boundary = trim( str_replace( array( 'BOUNDARY=', 'boundary=', '"' ), '', $charset ) ); + $charset = ''; + } } else { $content_type = trim( $content ); } @@ -339,7 +352,13 @@ function wp_mail( $to, $subject, $message, $headers = '' ) { $from_name = 'WordPress'; } - // If we don't have an email from the input headers + /* If we don't have an email from the input headers default to wordpress@$sitename + * Some hosts will block outgoing mail from this address if it doesn't exist but + * there's no easy alternative. Defaulting to admin_email might appear to be another + * option but some hosts may refuse to relay mail from an unknown domain. See + * http://trac.wordpress.org/ticket/5007. + */ + if ( !isset( $from_email ) ) { // Get the site domain and get rid of www. $sitename = strtolower( $_SERVER['SERVER_NAME'] ); @@ -350,7 +369,7 @@ function wp_mail( $to, $subject, $message, $headers = '' ) { $from_email = 'wordpress@' . $sitename; } - // Set the from name and email + // Plugin authors can override the potentially troublesome default $phpmailer->From = apply_filters( 'wp_mail_from', $from_email ); $phpmailer->FromName = apply_filters( 'wp_mail_from_name', $from_name ); @@ -363,12 +382,12 @@ function wp_mail( $to, $subject, $message, $headers = '' ) { // Add any CC and BCC recipients if ( !empty($cc) ) { - foreach ($cc as $recipient) { + foreach ( (array) $cc as $recipient ) { $phpmailer->AddCc( trim($recipient) ); } } if ( !empty($bcc) ) { - foreach ($bcc as $recipient) { + foreach ( (array) $bcc as $recipient) { $phpmailer->AddBcc( trim($recipient) ); } } @@ -384,11 +403,11 @@ function wp_mail( $to, $subject, $message, $headers = '' ) { $content_type = apply_filters( 'wp_mail_content_type', $content_type ); + $phpmailer->ContentType = $content_type; + // Set whether it's plaintext or not, depending on $content_type if ( $content_type == 'text/html' ) { $phpmailer->IsHTML( true ); - } else { - $phpmailer->IsHTML( false ); } // If we don't have a charset from the input headers @@ -401,9 +420,18 @@ function wp_mail( $to, $subject, $message, $headers = '' ) { // Set custom headers if ( !empty( $headers ) ) { - foreach ( $headers as $name => $content ) { + foreach( (array) $headers as $name => $content ) { $phpmailer->AddCustomHeader( sprintf( '%1$s: %2$s', $name, $content ) ); } + if ( false !== stripos( $content_type, 'multipart' ) && ! empty($boundary) ) { + $phpmailer->AddCustomHeader( sprintf( "Content-Type: %s;\n\t boundary=\"%s\"", $content_type, $boundary ) ); + } + } + + if ( !empty( $attachments ) ) { + foreach ( $attachments as $attachment ) { + $phpmailer->AddAttachment($attachment); + } } do_action_ref_array( 'phpmailer_init', array( &$phpmailer ) ); @@ -415,53 +443,44 @@ function wp_mail( $to, $subject, $message, $headers = '' ) { } endif; +if ( !function_exists('wp_authenticate') ) : /** * Checks a user's login information and logs them in if it checks out. * - * @since 2.5 + * @since 2.5.0 * * @param string $username User's username * @param string $password User's password * @return WP_Error|WP_User WP_User object if login successful, otherwise WP_Error object. */ -if ( !function_exists('wp_authenticate') ) : function wp_authenticate($username, $password) { $username = sanitize_user($username); + $password = trim($password); - if ( '' == $username ) - return new WP_Error('empty_username', __('ERROR: The username field is empty.')); + $user = apply_filters('authenticate', null, $username, $password); - if ( '' == $password ) - return new WP_Error('empty_password', __('ERROR: The password field is empty.')); - - $user = get_userdatabylogin($username); - - if ( !$user || ($user->user_login != $username) ) { - do_action( 'wp_login_failed', $username ); - return new WP_Error('invalid_username', __('ERROR: Invalid username.')); + if ( $user == null ) { + // TODO what should the error message be? (Or would these even happen?) + // Only needed if all authentication handlers fail to return anything. + $user = new WP_Error('authentication_failed', __('ERROR: Invalid username or incorrect password.')); } - $user = apply_filters('wp_authenticate_user', $user, $password); - if ( is_wp_error($user) ) { - do_action( 'wp_login_failed', $username ); - return $user; - } + $ignore_codes = array('empty_username', 'empty_password'); - if ( !wp_check_password($password, $user->user_pass, $user->ID) ) { - do_action( 'wp_login_failed', $username ); - return new WP_Error('incorrect_password', __('ERROR: Incorrect password.')); + if (is_wp_error($user) && !in_array($user->get_error_code(), $ignore_codes) ) { + do_action('wp_login_failed', $username); } - return new WP_User($user->ID); + return $user; } endif; +if ( !function_exists('wp_logout') ) : /** * Log the current user out. * - * @since 2.5 + * @since 2.5.0 */ -if ( !function_exists('wp_logout') ) : function wp_logout() { wp_clear_auth_cookie(); do_action('wp_logout'); @@ -484,26 +503,13 @@ if ( !function_exists('wp_validate_auth_cookie') ) : * @param string $scheme Optional. The cookie scheme to use: auth, secure_auth, or logged_in * @return bool|int False if invalid cookie, User ID if valid. */ -function wp_validate_auth_cookie($cookie = '', $scheme = 'auth') { - if ( empty($cookie) ) { - if ( is_ssl() ) { - $cookie_name = SECURE_AUTH_COOKIE; - $scheme = 'secure_auth'; - } else { - $cookie_name = AUTH_COOKIE; - $scheme = 'auth'; - } - - if ( empty($_COOKIE[$cookie_name]) ) - return false; - $cookie = $_COOKIE[$cookie_name]; - } - - $cookie_elements = explode('|', $cookie); - if ( count($cookie_elements) != 3 ) +function wp_validate_auth_cookie($cookie = '', $scheme = '') { + if ( ! $cookie_elements = wp_parse_auth_cookie($cookie, $scheme) ) { + do_action('auth_cookie_malformed', $cookie, $scheme); return false; + } - list($username, $expiration, $hmac) = $cookie_elements; + extract($cookie_elements, EXTR_OVERWRITE); $expired = $expiration; @@ -512,18 +518,28 @@ function wp_validate_auth_cookie($cookie = '', $scheme = 'auth') { $expired += 3600; // Quick check to see if an honest cookie has expired - if ( $expired < time() ) + if ( $expired < time() ) { + do_action('auth_cookie_expired', $cookie_elements); return false; + } - $key = wp_hash($username . '|' . $expiration, $scheme); + $user = get_userdatabylogin($username); + if ( ! $user ) { + do_action('auth_cookie_bad_username', $cookie_elements); + return false; + } + + $pass_frag = substr($user->user_pass, 8, 4); + + $key = wp_hash($username . $pass_frag . '|' . $expiration, $scheme); $hash = hash_hmac('md5', $username . '|' . $expiration, $key); - if ( $hmac != $hash ) + if ( $hmac != $hash ) { + do_action('auth_cookie_bad_hash', $cookie_elements); return false; + } - $user = get_userdatabylogin($username); - if ( ! $user ) - return false; + do_action('auth_cookie_valid', $cookie_elements, $user); return $user->ID; } @@ -545,7 +561,9 @@ if ( !function_exists('wp_generate_auth_cookie') ) : function wp_generate_auth_cookie($user_id, $expiration, $scheme = 'auth') { $user = get_userdata($user_id); - $key = wp_hash($user->user_login . '|' . $expiration, $scheme); + $pass_frag = substr($user->user_pass, 8, 4); + + $key = wp_hash($user->user_login . $pass_frag . '|' . $expiration, $scheme); $hash = hash_hmac('md5', $user->user_login . '|' . $expiration, $key); $cookie = $user->user_login . '|' . $expiration . '|' . $hash; @@ -554,6 +572,53 @@ function wp_generate_auth_cookie($user_id, $expiration, $scheme = 'auth') { } endif; +if ( !function_exists('wp_parse_auth_cookie') ) : +/** + * Parse a cookie into its components + * + * @since 2.7 + * + * @param string $cookie + * @param string $scheme Optional. The cookie scheme to use: auth, secure_auth, or logged_in + * @return array Authentication cookie components + */ +function wp_parse_auth_cookie($cookie = '', $scheme = '') { + if ( empty($cookie) ) { + switch ($scheme){ + case 'auth': + $cookie_name = AUTH_COOKIE; + break; + case 'secure_auth': + $cookie_name = SECURE_AUTH_COOKIE; + break; + case "logged_in": + $cookie_name = LOGGED_IN_COOKIE; + break; + default: + if ( is_ssl() ) { + $cookie_name = SECURE_AUTH_COOKIE; + $scheme = 'secure_auth'; + } else { + $cookie_name = AUTH_COOKIE; + $scheme = 'auth'; + } + } + + if ( empty($_COOKIE[$cookie_name]) ) + return false; + $cookie = $_COOKIE[$cookie_name]; + } + + $cookie_elements = explode('|', $cookie); + if ( count($cookie_elements) != 3 ) + return false; + + list($username, $expiration, $hmac) = $cookie_elements; + + return compact('username', 'expiration', 'hmac', 'scheme'); +} +endif; + if ( !function_exists('wp_set_auth_cookie') ) : /** * Sets the authentication cookies based User ID. @@ -569,9 +634,9 @@ if ( !function_exists('wp_set_auth_cookie') ) : */ function wp_set_auth_cookie($user_id, $remember = false, $secure = '') { if ( $remember ) { - $expiration = $expire = time() + 1209600; + $expiration = $expire = time() + apply_filters('auth_cookie_expiration', 1209600, $user_id, $remember); } else { - $expiration = time() + 172800; + $expiration = time() + apply_filters('auth_cookie_expiration', 172800, $user_id, $remember); $expire = 0; } @@ -592,11 +657,23 @@ function wp_set_auth_cookie($user_id, $remember = false, $secure = '') { do_action('set_auth_cookie', $auth_cookie, $expire, $expiration, $user_id, $scheme); do_action('set_logged_in_cookie', $logged_in_cookie, $expire, $expiration, $user_id, 'logged_in'); - setcookie($auth_cookie_name, $auth_cookie, $expire, PLUGINS_COOKIE_PATH, COOKIE_DOMAIN, $secure); - setcookie($auth_cookie_name, $auth_cookie, $expire, ADMIN_COOKIE_PATH, COOKIE_DOMAIN, $secure); - setcookie(LOGGED_IN_COOKIE, $logged_in_cookie, $expire, COOKIEPATH, COOKIE_DOMAIN); - if ( COOKIEPATH != SITECOOKIEPATH ) - setcookie(LOGGED_IN_COOKIE, $logged_in_cookie, $expire, SITECOOKIEPATH, COOKIE_DOMAIN); + // Set httponly if the php version is >= 5.2.0 + if ( version_compare(phpversion(), '5.2.0', 'ge') ) { + setcookie($auth_cookie_name, $auth_cookie, $expire, PLUGINS_COOKIE_PATH, COOKIE_DOMAIN, $secure, true); + setcookie($auth_cookie_name, $auth_cookie, $expire, ADMIN_COOKIE_PATH, COOKIE_DOMAIN, $secure, true); + setcookie(LOGGED_IN_COOKIE, $logged_in_cookie, $expire, COOKIEPATH, COOKIE_DOMAIN, false, true); + if ( COOKIEPATH != SITECOOKIEPATH ) + setcookie(LOGGED_IN_COOKIE, $logged_in_cookie, $expire, SITECOOKIEPATH, COOKIE_DOMAIN, false, true); + } else { + $cookie_domain = COOKIE_DOMAIN; + if ( !empty($cookie_domain) ) + $cookie_domain .= '; HttpOnly'; + setcookie($auth_cookie_name, $auth_cookie, $expire, PLUGINS_COOKIE_PATH, $cookie_domain, $secure); + setcookie($auth_cookie_name, $auth_cookie, $expire, ADMIN_COOKIE_PATH, $cookie_domain, $secure); + setcookie(LOGGED_IN_COOKIE, $logged_in_cookie, $expire, COOKIEPATH, $cookie_domain); + if ( COOKIEPATH != SITECOOKIEPATH ) + setcookie(LOGGED_IN_COOKIE, $logged_in_cookie, $expire, SITECOOKIEPATH, $cookie_domain); + } } endif; @@ -607,6 +684,8 @@ if ( !function_exists('wp_clear_auth_cookie') ) : * @since 2.5 */ function wp_clear_auth_cookie() { + do_action('clear_auth_cookie'); + setcookie(AUTH_COOKIE, ' ', time() - 31536000, ADMIN_COOKIE_PATH, COOKIE_DOMAIN); setcookie(SECURE_AUTH_COOKIE, ' ', time() - 31536000, ADMIN_COOKIE_PATH, COOKIE_DOMAIN); setcookie(AUTH_COOKIE, ' ', time() - 31536000, PLUGINS_COOKIE_PATH, COOKIE_DOMAIN); @@ -661,18 +740,32 @@ function auth_redirect() { $secure = false; // If https is required and request is http, redirect - if ( $secure && !is_ssl() ) { + if ( $secure && !is_ssl() && false !== strpos($_SERVER['REQUEST_URI'], 'wp-admin') ) { if ( 0 === strpos($_SERVER['REQUEST_URI'], 'http') ) { wp_redirect(preg_replace('|^http://|', 'https://', $_SERVER['REQUEST_URI'])); exit(); } else { wp_redirect('https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']); - exit(); + exit(); } } - if ( wp_validate_auth_cookie() ) + if ( $user_id = wp_validate_auth_cookie() ) { + do_action('auth_redirect', $user_id); + + // If the user wants ssl but the session is not ssl, redirect. + if ( !$secure && get_user_option('use_ssl', $user_id) && false !== strpos($_SERVER['REQUEST_URI'], 'wp-admin') ) { + if ( 0 === strpos($_SERVER['REQUEST_URI'], 'http') ) { + wp_redirect(preg_replace('|^http://|', 'https://', $_SERVER['REQUEST_URI'])); + exit(); + } else { + wp_redirect('https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']); + exit(); + } + } + return; // The cookie is good so we're done + } // The cookie is no good so force login nocache_headers(); @@ -682,7 +775,9 @@ function auth_redirect() { else $proto = 'http://'; - $login_url = site_url( 'wp-login.php?redirect_to=' . urlencode($proto . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']), 'login' ); + $redirect = ( strpos($_SERVER['REQUEST_URI'], '/options.php') && wp_get_referer() ) ? wp_get_referer() : $proto . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']; + + $login_url = wp_login_url($redirect); wp_redirect($login_url); exit(); @@ -704,7 +799,7 @@ if ( !function_exists('check_admin_referer') ) : function check_admin_referer($action = -1, $query_arg = '_wpnonce') { $adminurl = strtolower(admin_url()); $referer = strtolower(wp_get_referer()); - $result = wp_verify_nonce($_REQUEST[$query_arg], $action); + $result = isset($_REQUEST[$query_arg]) ? wp_verify_nonce($_REQUEST[$query_arg], $action) : false; if ( !$result && !(-1 == $action && strpos($referer, $adminurl) !== false) ) { wp_nonce_ays($action); die(); @@ -717,7 +812,7 @@ if ( !function_exists('check_ajax_referer') ) : /** * Verifies the AJAX request to prevent processing requests external of the blog. * - * @since 2.0.4 + * @since 2.0.3 * * @param string $action Action nonce * @param string $query_arg where to look for nonce in $_REQUEST (since 2.5) @@ -756,7 +851,7 @@ function wp_redirect($location, $status = 302) { $location = apply_filters('wp_redirect', $location, $status); $status = apply_filters('wp_redirect_status', $status, $location); - + if ( !$location ) // allows the wp_redirect filter to cancel a redirect return false; @@ -781,7 +876,7 @@ if ( !function_exists('wp_sanitize_redirect') ) : * @return string redirect-sanitized URL **/ function wp_sanitize_redirect($location) { - $location = preg_replace('|[^a-z0-9-~+_.?#=&;,/:%]|i', '', $location); + $location = preg_replace('|[^a-z0-9-~+_.?#=&;,/:%!]|i', '', $location); $location = wp_kses_no_null($location); // remove %0d and %0a from location @@ -789,7 +884,7 @@ function wp_sanitize_redirect($location) { $found = true; while($found) { $found = false; - foreach($strip as $val) { + foreach( (array) $strip as $val ) { while(strpos($location, $val) !== false) { $found = true; $location = str_replace($val, '', $location); @@ -829,7 +924,7 @@ function wp_safe_redirect($location, $status = 302) { // In php 5 parse_url may fail if the URL query part contains http://, bug #38143 $test = ( $cut = strpos($location, '?') ) ? substr( $location, 0, $cut ) : $location; - + $lp = parse_url($test); $wpp = parse_url(get_option('home')); @@ -856,6 +951,9 @@ function wp_notify_postauthor($comment_id, $comment_type='') { $comment = get_comment($comment_id); $post = get_post($comment->comment_post_ID); $user = get_userdata( $post->post_author ); + $current_user = wp_get_current_user(); + + if ( $comment->user_id == $post->post_author ) return false; // The author moderated a comment on his own post if ('' == $user->user_email) return false; // If there's no email to send the comment to @@ -866,27 +964,36 @@ function wp_notify_postauthor($comment_id, $comment_type='') { if ( empty( $comment_type ) ) $comment_type = 'comment'; if ('comment' == $comment_type) { + /* translators: 1: post id, 2: post title */ $notify_message = sprintf( __('New comment on your post #%1$s "%2$s"'), $comment->comment_post_ID, $post->post_title ) . "\r\n"; + /* translators: 1: comment author, 2: author IP, 3: author domain */ $notify_message .= sprintf( __('Author : %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; $notify_message .= sprintf( __('E-mail : %s'), $comment->comment_author_email ) . "\r\n"; $notify_message .= sprintf( __('URL : %s'), $comment->comment_author_url ) . "\r\n"; $notify_message .= sprintf( __('Whois : http://ws.arin.net/cgi-bin/whois.pl?queryinput=%s'), $comment->comment_author_IP ) . "\r\n"; $notify_message .= __('Comment: ') . "\r\n" . $comment->comment_content . "\r\n\r\n"; $notify_message .= __('You can see all comments on this post here: ') . "\r\n"; + /* translators: 1: blog name, 2: post title */ $subject = sprintf( __('[%1$s] Comment: "%2$s"'), $blogname, $post->post_title ); } elseif ('trackback' == $comment_type) { + /* translators: 1: post id, 2: post title */ $notify_message = sprintf( __('New trackback on your post #%1$s "%2$s"'), $comment->comment_post_ID, $post->post_title ) . "\r\n"; + /* translators: 1: website name, 2: author IP, 3: author domain */ $notify_message .= sprintf( __('Website: %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; $notify_message .= sprintf( __('URL : %s'), $comment->comment_author_url ) . "\r\n"; $notify_message .= __('Excerpt: ') . "\r\n" . $comment->comment_content . "\r\n\r\n"; $notify_message .= __('You can see all trackbacks on this post here: ') . "\r\n"; + /* translators: 1: blog name, 2: post title */ $subject = sprintf( __('[%1$s] Trackback: "%2$s"'), $blogname, $post->post_title ); } elseif ('pingback' == $comment_type) { + /* translators: 1: post id, 2: post title */ $notify_message = sprintf( __('New pingback on your post #%1$s "%2$s"'), $comment->comment_post_ID, $post->post_title ) . "\r\n"; + /* translators: 1: comment author, 2: author IP, 3: author domain */ $notify_message .= sprintf( __('Website: %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; $notify_message .= sprintf( __('URL : %s'), $comment->comment_author_url ) . "\r\n"; $notify_message .= __('Excerpt: ') . "\r\n" . sprintf('[...] %s [...]', $comment->comment_content ) . "\r\n\r\n"; $notify_message .= __('You can see all pingbacks on this post here: ') . "\r\n"; + /* translators: 1: blog name, 2: post title */ $subject = sprintf( __('[%1$s] Pingback: "%2$s"'), $blogname, $post->post_title ); } $notify_message .= get_permalink($comment->comment_post_ID) . "#comments\r\n\r\n"; @@ -974,22 +1081,42 @@ function wp_notify_moderator($comment_id) { $notify_message .= sprintf( __('Delete it: %s'), admin_url("comment.php?action=cdc&c=$comment_id") ) . "\r\n"; $notify_message .= sprintf( __('Spam it: %s'), admin_url("comment.php?action=cdc&dt=spam&c=$comment_id") ) . "\r\n"; - $notify_message .= sprintf( __ngettext('Currently %s comment is waiting for approval. Please visit the moderation panel:', + $notify_message .= sprintf( _n('Currently %s comment is waiting for approval. Please visit the moderation panel:', 'Currently %s comments are waiting for approval. Please visit the moderation panel:', $comments_waiting), number_format_i18n($comments_waiting) ) . "\r\n"; $notify_message .= admin_url("edit-comments.php?comment_status=moderated") . "\r\n"; $subject = sprintf( __('[%1$s] Please moderate: "%2$s"'), get_option('blogname'), $post->post_title ); $admin_email = get_option('admin_email'); + $message_headers = ''; $notify_message = apply_filters('comment_moderation_text', $notify_message, $comment_id); $subject = apply_filters('comment_moderation_subject', $subject, $comment_id); + $message_headers = apply_filters('comment_moderation_headers', $message_headers); - @wp_mail($admin_email, $subject, $notify_message); + @wp_mail($admin_email, $subject, $notify_message, $message_headers); return true; } endif; +if ( !function_exists('wp_password_change_notification') ) : +/** + * Notify the blog admin of a user changing password, normally via email. + * + * @since 2.7 + * + * @param object $user User Object + */ +function wp_password_change_notification(&$user) { + // send a copy of password change notification to the admin + // but check to see if it's the admin whose password we're changing, and skip this + if ( $user->user_email != get_option('admin_email') ) { + $message = sprintf(__('Password Lost and Changed for user: %s'), $user->user_login) . "\r\n"; + wp_mail(get_option('admin_email'), sprintf(__('[%s] Password Lost/Changed'), get_option('blogname')), $message); + } +} +endif; + if ( !function_exists('wp_new_user_notification') ) : /** * Notify the blog admin of a new user, normally via email. @@ -1016,7 +1143,7 @@ function wp_new_user_notification($user_id, $plaintext_pass = '') { $message = sprintf(__('Username: %s'), $user_login) . "\r\n"; $message .= sprintf(__('Password: %s'), $plaintext_pass) . "\r\n"; - $message .= site_url("wp-login.php", 'login') . "\r\n"; + $message .= wp_login_url() . "\r\n"; wp_mail($user_email, sprintf(__('[%s] Your username and password'), get_option('blogname')), $message); @@ -1048,7 +1175,7 @@ if ( !function_exists('wp_verify_nonce') ) : * The user is given an amount of time to use the token, so therefore, since the * UID and $action remain the same, the independent variable is the time. * - * @since 2.0.4 + * @since 2.0.3 * * @param string $nonce Nonce that was used in the form to verify * @param string|int $action Should give context to what is taking place and be the same when nonce was created. @@ -1061,10 +1188,10 @@ function wp_verify_nonce($nonce, $action = -1) { $i = wp_nonce_tick(); // Nonce generated 0-12 hours ago - if ( substr(wp_hash($i . $action . $uid), -12, 10) == $nonce ) + if ( substr(wp_hash($i . $action . $uid, 'nonce'), -12, 10) == $nonce ) return 1; // Nonce generated 12-24 hours ago - if ( substr(wp_hash(($i - 1) . $action . $uid), -12, 10) == $nonce ) + if ( substr(wp_hash(($i - 1) . $action . $uid, 'nonce'), -12, 10) == $nonce ) return 2; // Invalid nonce return false; @@ -1075,7 +1202,7 @@ if ( !function_exists('wp_create_nonce') ) : /** * Creates a random, one time use token. * - * @since 2.0.4 + * @since 2.0.3 * * @param string|int $action Scalar value to add context to the nonce. * @return string The one use form token @@ -1086,7 +1213,7 @@ function wp_create_nonce($action = -1) { $i = wp_nonce_tick(); - return substr(wp_hash($i . $action . $uid), -12, 10); + return substr(wp_hash($i . $action . $uid, 'nonce'), -12, 10); } endif; @@ -1112,7 +1239,7 @@ if ( !function_exists('wp_salt') ) : * Below is an example of how the SECRET_KEY constant is defined with a value. * You must not copy the below example and paste into your wp-config.php. If you * need an example, then you can have a - * {@link http://api.wordpress.org/secret-key/1.0/ secret key created} for you. + * {@link https://api.wordpress.org/secret-key/1.1/ secret key created} for you. * * * define('SECRET_KEY', 'mAry1HadA15|\/|b17w55w1t3asSn09w'); @@ -1123,7 +1250,7 @@ if ( !function_exists('wp_salt') ) : * salt string is not weak. * * @since 2.5 - * @link http://api.wordpress.org/secret-key/1.0/ Create a Secret Key for wp-config.php + * @link https://api.wordpress.org/secret-key/1.1/ Create a Secret Key for wp-config.php * * @return string Salt value from either 'SECRET_KEY' or 'secret' option */ @@ -1144,7 +1271,7 @@ function wp_salt($scheme = 'auth') { } else { $salt = get_option('auth_salt'); if ( empty($salt) ) { - $salt = wp_generate_password(); + $salt = wp_generate_password(64); update_option('auth_salt', $salt); } } @@ -1153,11 +1280,11 @@ function wp_salt($scheme = 'auth') { $secret_key = SECURE_AUTH_KEY; if ( defined('SECURE_AUTH_SALT') ) { - $salt = SECRET_AUTH_SALT; + $salt = SECURE_AUTH_SALT; } else { $salt = get_option('secure_auth_salt'); if ( empty($salt) ) { - $salt = wp_generate_password(); + $salt = wp_generate_password(64); update_option('secure_auth_salt', $salt); } } @@ -1170,10 +1297,26 @@ function wp_salt($scheme = 'auth') { } else { $salt = get_option('logged_in_salt'); if ( empty($salt) ) { - $salt = wp_generate_password(); + $salt = wp_generate_password(64); update_option('logged_in_salt', $salt); } } + } elseif ( 'nonce' == $scheme ) { + if ( defined('NONCE_KEY') && ('' != NONCE_KEY) && ( $wp_default_secret_key != NONCE_KEY) ) + $secret_key = NONCE_KEY; + + if ( defined('NONCE_SALT') ) { + $salt = NONCE_SALT; + } else { + $salt = get_option('nonce_salt'); + if ( empty($salt) ) { + $salt = wp_generate_password(64); + update_option('nonce_salt', $salt); + } + } + } else { + // ensure each auth scheme has its own unique salt + $salt = hash_hmac('md5', $scheme, $secret_key); } return apply_filters('salt', $secret_key . $salt, $scheme); @@ -1184,7 +1327,7 @@ if ( !function_exists('wp_hash') ) : /** * Get hash of given string. * - * @since 2.0.4 + * @since 2.0.3 * @uses wp_salt() Get WordPress salt * * @param string $data Plain text to hash @@ -1280,6 +1423,8 @@ if ( !function_exists('wp_generate_password') ) : * * @since 2.5 * + * @param int $length The length of password to generate + * @param bool $special_chars Whether to include standard special characters * @return string The random password **/ function wp_generate_password($length = 12, $special_chars = true) { @@ -1307,7 +1452,7 @@ if ( !function_exists('wp_rand') ) : function wp_rand( $min = 0, $max = 0 ) { global $rnd_value; - $seed = get_option('random_seed'); + $seed = get_transient('random_seed'); // Reset $rnd_value after 14 uses // 32(md5) + 40(sha1) + 40(sha1) / 8 = 14 random numbers from $rnd_value @@ -1316,7 +1461,7 @@ function wp_rand( $min = 0, $max = 0 ) { $rnd_value .= sha1($rnd_value); $rnd_value .= sha1($rnd_value . $seed); $seed = md5($seed . $rnd_value); - update_option('random_seed', $seed); + set_transient('random_seed', $seed); } // Take the first 8 digits for our value @@ -1332,7 +1477,7 @@ function wp_rand( $min = 0, $max = 0 ) { if ( $max != 0 ) $value = $min + (($max - $min + 1) * ($value / (4294967295 + 1))); - return abs(intval($value)); + return abs(intval($value)); } endif; @@ -1354,8 +1499,8 @@ function wp_set_password( $password, $user_id ) { global $wpdb; $hash = wp_hash_password($password); - $query = $wpdb->prepare("UPDATE $wpdb->users SET user_pass = %s, user_activation_key = '' WHERE ID = %d", $hash, $user_id); - $wpdb->query($query); + $wpdb->update($wpdb->users, array('user_pass' => $hash, 'user_activation_key' => ''), array('ID' => $user_id) ); + wp_cache_delete($user_id, 'users'); } endif; @@ -1368,12 +1513,18 @@ if ( !function_exists( 'get_avatar' ) ) : * @param int|string|object $id_or_email A user ID, email address, or comment object * @param int $size Size of the avatar image * @param string $default URL to a default image to use if no avatar is available + * @param string $alt Alternate text to use in image tag. Defaults to blank * @return string tag for the user's avatar */ -function get_avatar( $id_or_email, $size = '96', $default = '' ) { +function get_avatar( $id_or_email, $size = '96', $default = '', $alt = false ) { if ( ! get_option('show_avatars') ) return false; + if ( false === $alt) + $safe_alt = ''; + else + $safe_alt = esc_attr( $alt ); + if ( !is_numeric($size) ) $size = '96'; @@ -1384,6 +1535,9 @@ function get_avatar( $id_or_email, $size = '96', $default = '' ) { if ( $user ) $email = $user->user_email; } elseif ( is_object($id_or_email) ) { + if ( isset($id_or_email->comment_type) && '' != $id_or_email->comment_type && 'comment' != $id_or_email->comment_type ) + return false; // No avatar for pingbacks or trackbacks + if ( !empty($id_or_email->user_id) ) { $id = (int) $id_or_email->user_id; $user = get_userdata($id); @@ -1404,21 +1558,26 @@ function get_avatar( $id_or_email, $size = '96', $default = '' ) { $default = $avatar_default; } - if ( 'custom' == $default ) - $default = add_query_arg( 's', $size, $defaults[$avatar_default][1] ); - elseif ( 'mystery' == $default ) - $default = "http://www.gravatar.com/avatar/ad516503a11cd5ca435acc9bb6523536?s={$size}"; // ad516503a11cd5ca435acc9bb6523536 == md5('unknown@gravatar.com') + if ( is_ssl() ) + $host = 'https://secure.gravatar.com'; + else + $host = 'http://www.gravatar.com'; + + if ( 'mystery' == $default ) + $default = "$host/avatar/ad516503a11cd5ca435acc9bb6523536?s={$size}"; // ad516503a11cd5ca435acc9bb6523536 == md5('unknown@gravatar.com') elseif ( 'blank' == $default ) $default = includes_url('images/blank.gif'); elseif ( !empty($email) && 'gravatar_default' == $default ) $default = ''; elseif ( 'gravatar_default' == $default ) - $default = "http://www.gravatar.com/avatar/s={$size}"; + $default = "$host/avatar/s={$size}"; elseif ( empty($email) ) - $default = "http://www.gravatar.com/avatar/?d=$default&s={$size}"; + $default = "$host/avatar/?d=$default&s={$size}"; + elseif ( strpos($default, 'http://') === 0 ) + $default = add_query_arg( 's', $size, $default ); if ( !empty($email) ) { - $out = 'http://www.gravatar.com/avatar/'; + $out = "$host/avatar/"; $out .= md5( strtolower( $email ) ); $out .= '?s='.$size; $out .= '&d=' . urlencode( $default ); @@ -1427,12 +1586,12 @@ function get_avatar( $id_or_email, $size = '96', $default = '' ) { if ( !empty( $rating ) ) $out .= "&r={$rating}"; - $avatar = ""; + $avatar = "{$safe_alt}"; } else { - $avatar = ""; + $avatar = "{$safe_alt}"; } - return apply_filters('get_avatar', $avatar, $id_or_email, $size, $default); + return apply_filters('get_avatar', $avatar, $id_or_email, $size, $default, $alt); } endif; @@ -1479,7 +1638,7 @@ if ( !function_exists('wp_get_cookie_login') ): * This function is deprecated and should no longer be extended as it won't be * used anywhere in WordPress. Also, plugins shouldn't use it either. * - * @since 2.0.4 + * @since 2.0.3 * @deprecated No alternative * * @return bool Always returns false @@ -1557,14 +1716,9 @@ function wp_text_diff( $left_string, $right_string, $args = null ) { if ( !class_exists( 'WP_Text_Diff_Renderer_Table' ) ) require( ABSPATH . WPINC . '/wp-diff.php' ); - // Normalize whitespace - $left_string = trim($left_string); - $right_string = trim($right_string); - $left_string = str_replace("\r", "\n", $left_string); - $right_string = str_replace("\r", "\n", $right_string); - $left_string = preg_replace( array( '/\n+/', '/[ \t]+/' ), array( "\n", ' ' ), $left_string ); - $right_string = preg_replace( array( '/\n+/', '/[ \t]+/' ), array( "\n", ' ' ), $right_string ); - + $left_string = normalize_whitespace($left_string); + $right_string = normalize_whitespace($right_string); + $left_lines = split("\n", $left_string); $right_lines = split("\n", $right_string); @@ -1598,4 +1752,4 @@ function wp_text_diff( $left_string, $right_string, $args = null ) { } endif; -?> \ No newline at end of file +?>