X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/76aea3697c6043c1613370f172395b4f65ee71f0..11be8dc178e77d0b46189bbd8e33a216a9b90942:/wp-includes/pluggable.php diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php index e7ca2a73..7e3f4f13 100644 --- a/wp-includes/pluggable.php +++ b/wp-includes/pluggable.php @@ -253,11 +253,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; @@ -280,7 +284,7 @@ function wp_mail( $to, $subject, $message, $headers = '' ) { // If it's actually got contents if ( !empty( $tempheaders ) ) { // Iterate through the raw headers - foreach ( $tempheaders as $header ) { + foreach ( (array) $tempheaders as $header ) { if ( strpos($header, ':') === false ) continue; // Explode them out @@ -363,12 +367,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) ); } } @@ -401,11 +405,17 @@ 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 ( !empty( $attachments ) ) { + foreach ( $attachments as $attachment ) { + $phpmailer->AddAttachment($attachment); + } + } + do_action_ref_array( 'phpmailer_init', array( &$phpmailer ) ); // Send! @@ -415,16 +425,16 @@ 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); @@ -456,12 +466,12 @@ function wp_authenticate($username, $password) { } 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 +494,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 +509,26 @@ 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); $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 ) + if ( ! $user ) { + do_action('auth_cookie_bad_username', $cookie_elements); return false; + } + + do_action('auth_cookie_valid', $cookie_elements, $user); return $user->ID; } @@ -554,6 +559,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. @@ -592,11 +644,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 +671,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 +727,30 @@ 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() ) { + // 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 +760,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 = site_url( 'wp-login.php?redirect_to=' . urlencode( $redirect ), 'login' ); wp_redirect($login_url); exit(); @@ -704,7 +784,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(); @@ -756,7 +836,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; @@ -789,7 +869,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 +909,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')); @@ -974,7 +1054,7 @@ 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( __ngettext('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"; @@ -990,6 +1070,24 @@ function wp_notify_moderator($comment_id) { } 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. @@ -1061,10 +1159,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; @@ -1086,7 +1184,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 +1210,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 +1221,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 */ @@ -1174,6 +1272,22 @@ function wp_salt($scheme = 'auth') { 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(); + 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); @@ -1280,6 +1394,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) { @@ -1332,7 +1448,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; @@ -1368,12 +1484,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 = attribute_escape( $alt ); + if ( !is_numeric($size) ) $size = '96'; @@ -1384,6 +1506,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 +1529,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 +1557,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; @@ -1557,14 +1687,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 +1723,4 @@ function wp_text_diff( $left_string, $right_string, $args = null ) { } endif; -?> \ No newline at end of file +?>