X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/959f97d8ecd5c1668103a3e41c795486b944bc68..refs/tags/wordpress-2.8-scripts:/wp-includes/pluggable.php diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php index 1a2bdc26..6074b00f 100644 --- a/wp-includes/pluggable.php +++ b/wp-includes/pluggable.php @@ -1,16 +1,16 @@ get_row( $wpdb->prepare("SELECT * FROM $wpdb->users WHERE $field = %s", $value) ) ) + return false; + + _fill_user($user); + + return $user; } endif; if ( !function_exists('get_userdatabylogin') ) : /** - * get_userdatabylogin() - Retrieve user info by login name + * Retrieve user info by login name. * * @since 0.71 * @@ -163,33 +195,13 @@ 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; if ( !function_exists('get_user_by_email') ) : /** - * get_user_by_email() - Retrieve user info by email + * Retrieve user info by email. * * @since 2.5 * @@ -197,47 +209,29 @@ 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; if ( !function_exists( 'wp_mail' ) ) : /** - * wp_mail() - Function to send mail, similar to PHP's mail + * Send mail, similar to PHP's mail * - * A true return value does not automatically mean that the - * user received the email successfully. It just only means - * that the method used was able to process the request - * without any errors. + * A true return value does not automatically mean that the user received the + * email successfully. It just only means that the method used was able to + * process the request without any errors. * - * Using the two 'wp_mail_from' and 'wp_mail_from_name' hooks - * allow from creating a from address like 'Name ' - * when both are set. If just 'wp_mail_from' is set, then just - * the email address will be used with no name. + * Using the two 'wp_mail_from' and 'wp_mail_from_name' hooks allow from + * creating a from address like 'Name ' when both are set. If + * just 'wp_mail_from' is set, then just the email address will be used with no + * name. * - * The default content type is 'text/plain' which does not - * allow using HTML. However, you can set the content type - * of the email by using the 'wp_mail_content_type' filter. + * The default content type is 'text/plain' which does not allow using HTML. + * However, you can set the content type of the email by using the + * 'wp_mail_content_type' filter. * - * The default charset is based on the charset used on the - * blog. The charset can be set using the 'wp_mail_charset' - * filter. + * The default charset is based on the charset used on the blog. The charset can + * be set using the 'wp_mail_charset' filter. * * @since 1.2.1 * @uses apply_filters() Calls 'wp_mail' hook on an array of all of the parameters. @@ -254,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; @@ -272,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 ); @@ -303,16 +310,25 @@ 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 ); } + } elseif ( 'cc' == strtolower($name) ) { + $cc = explode(",", $content); + } elseif ( 'bcc' == strtolower($name) ) { + $bcc = explode(",", $content); } else { // Add it to our grand headers array $headers[trim( $name )] = trim( $content ); @@ -336,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'] ); @@ -347,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 ); @@ -358,6 +380,18 @@ function wp_mail( $to, $subject, $message, $headers = '' ) { $phpmailer->Subject = $subject; $phpmailer->Body = $message; + // Add any CC and BCC recipients + if ( !empty($cc) ) { + foreach ( (array) $cc as $recipient ) { + $phpmailer->AddCc( trim($recipient) ); + } + } + if ( !empty($bcc) ) { + foreach ( (array) $bcc as $recipient) { + $phpmailer->AddBcc( trim($recipient) ); + } + } + // Set to use PHP's mail() $phpmailer->IsMail(); @@ -369,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 @@ -386,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 ) ); @@ -400,52 +443,44 @@ function wp_mail( $to, $subject, $message, $headers = '' ) { } endif; +if ( !function_exists('wp_authenticate') ) : /** - * wp_authenticate() - Checks a user's login information and logs them in if it checks out - * @since 2.5 + * Checks a user's login information and logs them in if it checks out. + * + * @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.')); - - if ( '' == $password ) - return new WP_Error('empty_password', __('ERROR: The password field is empty.')); + $user = apply_filters('authenticate', null, $username, $password); - $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') ) : /** - * wp_logout() - Log the current user out - * @since 2.5 + * Log the current user out. * + * @since 2.5.0 */ -if ( !function_exists('wp_logout') ) : function wp_logout() { wp_clear_auth_cookie(); do_action('wp_logout'); @@ -454,31 +489,27 @@ endif; if ( !function_exists('wp_validate_auth_cookie') ) : /** - * wp_validate_auth_cookie() - Validates authentication cookie + * Validates authentication cookie. * - * The checks include making sure that the authentication cookie - * is set and pulling in the contents (if $cookie is not used). + * The checks include making sure that the authentication cookie is set and + * pulling in the contents (if $cookie is not used). * - * Makes sure the cookie is not expired. Verifies the hash in - * cookie is what is should be and compares the two. + * Makes sure the cookie is not expired. Verifies the hash in cookie is what is + * should be and compares the two. * * @since 2.5 * * @param string $cookie Optional. If used, will validate contents instead of cookie's + * @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 = '') { - if ( empty($cookie) ) { - if ( empty($_COOKIE[AUTH_COOKIE]) ) - return false; - $cookie = $_COOKIE[AUTH_COOKIE]; - } - - $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; @@ -487,18 +518,28 @@ function wp_validate_auth_cookie($cookie = '') { $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); + $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; } @@ -506,7 +547,7 @@ endif; if ( !function_exists('wp_generate_auth_cookie') ) : /** - * wp_generate_auth_cookie() - Generate authentication cookie contents + * Generate authentication cookie contents. * * @since 2.5 * @uses apply_filters() Calls 'auth_cookie' hook on $cookie contents, User ID @@ -514,63 +555,151 @@ if ( !function_exists('wp_generate_auth_cookie') ) : * * @param int $user_id User ID * @param int $expiration Cookie expiration in seconds + * @param string $scheme Optional. The cookie scheme to use: auth, secure_auth, or logged_in * @return string Authentication cookie contents */ -function wp_generate_auth_cookie($user_id, $expiration) { +function wp_generate_auth_cookie($user_id, $expiration, $scheme = 'auth') { $user = get_userdata($user_id); - $key = wp_hash($user->user_login . '|' . $expiration); + $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; - return apply_filters('auth_cookie', $cookie, $user_id, $expiration); + return apply_filters('auth_cookie', $cookie, $user_id, $expiration, $scheme); +} +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') ) : /** - * wp_set_auth_cookie() - Sets the authentication cookies based User ID + * Sets the authentication cookies based User ID. * - * The $remember parameter increases the time that the cookie will - * be kept. The default the cookie is kept without remembering is - * two days. When $remember is set, the cookies will be kept for - * 14 days or two weeks. + * The $remember parameter increases the time that the cookie will be kept. The + * default the cookie is kept without remembering is two days. When $remember is + * set, the cookies will be kept for 14 days or two weeks. * * @since 2.5 * * @param int $user_id User ID * @param bool $remember Whether to remember the user or not */ -function wp_set_auth_cookie($user_id, $remember = false) { +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; } - $cookie = wp_generate_auth_cookie($user_id, $expiration); + if ( '' === $secure ) + $secure = is_ssl() ? true : false; + + if ( $secure ) { + $auth_cookie_name = SECURE_AUTH_COOKIE; + $scheme = 'secure_auth'; + } else { + $auth_cookie_name = AUTH_COOKIE; + $scheme = 'auth'; + } + + $auth_cookie = wp_generate_auth_cookie($user_id, $expiration, $scheme); + $logged_in_cookie = wp_generate_auth_cookie($user_id, $expiration, 'logged_in'); - do_action('set_auth_cookie', $cookie, $expire); + 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, $cookie, $expire, COOKIEPATH, COOKIE_DOMAIN); - if ( COOKIEPATH != SITECOOKIEPATH ) - setcookie(AUTH_COOKIE, $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; if ( !function_exists('wp_clear_auth_cookie') ) : /** - * wp_clear_auth_cookie() - Deletes all of the cookies associated with authentication + * Removes all of the cookies associated with authentication. * * @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); + setcookie(SECURE_AUTH_COOKIE, ' ', time() - 31536000, PLUGINS_COOKIE_PATH, COOKIE_DOMAIN); + setcookie(LOGGED_IN_COOKIE, ' ', time() - 31536000, COOKIEPATH, COOKIE_DOMAIN); + setcookie(LOGGED_IN_COOKIE, ' ', time() - 31536000, SITECOOKIEPATH, COOKIE_DOMAIN); + + // Old cookies setcookie(AUTH_COOKIE, ' ', time() - 31536000, COOKIEPATH, COOKIE_DOMAIN); setcookie(AUTH_COOKIE, ' ', time() - 31536000, SITECOOKIEPATH, COOKIE_DOMAIN); + setcookie(SECURE_AUTH_COOKIE, ' ', time() - 31536000, COOKIEPATH, COOKIE_DOMAIN); + setcookie(SECURE_AUTH_COOKIE, ' ', time() - 31536000, SITECOOKIEPATH, COOKIE_DOMAIN); - // Old cookies + // Even older cookies setcookie(USER_COOKIE, ' ', time() - 31536000, COOKIEPATH, COOKIE_DOMAIN); setcookie(PASS_COOKIE, ' ', time() - 31536000, COOKIEPATH, COOKIE_DOMAIN); setcookie(USER_COOKIE, ' ', time() - 31536000, SITECOOKIEPATH, COOKIE_DOMAIN); @@ -580,7 +709,7 @@ endif; if ( !function_exists('is_user_logged_in') ) : /** - * is_user_logged_in() - Checks if the current visitor is a logged in user + * Checks if the current visitor is a logged in user. * * @since 2.0.0 * @@ -598,26 +727,68 @@ endif; if ( !function_exists('auth_redirect') ) : /** - * auth_redirect() - Checks if a user is logged in, if not it redirects them to the login page + * Checks if a user is logged in, if not it redirects them to the login page. * * @since 1.5 */ function auth_redirect() { // Checks if a user is logged in, if not redirects them to the login page - if ( (!empty($_COOKIE[AUTH_COOKIE]) && - !wp_validate_auth_cookie($_COOKIE[AUTH_COOKIE])) || - (empty($_COOKIE[AUTH_COOKIE])) ) { - nocache_headers(); - wp_redirect(get_option('siteurl') . '/wp-login.php?redirect_to=' . urlencode($_SERVER['REQUEST_URI'])); - exit(); + if ( is_ssl() || force_ssl_admin() ) + $secure = true; + else + $secure = false; + + // If https is required and request is http, redirect + 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(); + } + } + + 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(); + + if ( is_ssl() ) + $proto = 'https://'; + else + $proto = 'http://'; + + $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(); } endif; if ( !function_exists('check_admin_referer') ) : /** - * check_admin_referer() - Makes sure that a user was referred from another admin page, to avoid security exploits + * Makes sure that a user was referred from another admin page. + * + * To avoid security exploits. * * @since 1.2.0 * @uses do_action() Calls 'check_admin_referer' on $action. @@ -626,9 +797,9 @@ if ( !function_exists('check_admin_referer') ) : * @param string $query_arg where to look for nonce in $_REQUEST (since 2.5) */ function check_admin_referer($action = -1, $query_arg = '_wpnonce') { - $adminurl = strtolower(get_option('siteurl')).'/wp-admin'; + $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(); @@ -639,9 +810,9 @@ function check_admin_referer($action = -1, $query_arg = '_wpnonce') { if ( !function_exists('check_ajax_referer') ) : /** - * check_ajax_referer() - Verifies the AJAX request to prevent processing requests external of the blog. + * 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) @@ -665,7 +836,7 @@ endif; if ( !function_exists('wp_redirect') ) : /** - * wp_redirect() - Redirects to another page, with a workaround for the IIS Set-Cookie bug + * Redirects to another page, with a workaround for the IIS Set-Cookie bug. * * @link http://support.microsoft.com/kb/q176113/ * @since 1.5.1 @@ -680,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; @@ -698,14 +869,14 @@ endif; if ( !function_exists('wp_sanitize_redirect') ) : /** - * wp_sanitize_redirect() - Sanitizes a URL for use in a redirect + * Sanitizes a URL for use in a redirect. * * @since 2.3 * * @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 @@ -713,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); @@ -726,14 +897,15 @@ endif; if ( !function_exists('wp_safe_redirect') ) : /** - * wp_safe_redirect() - Performs a safe (local) redirect, using wp_redirect() + * Performs a safe (local) redirect, using wp_redirect(). * * Checks whether the $location is using an allowed host, if it has an absolute - * path. A plugin can therefore set or remove allowed host(s) to or from the list. + * path. A plugin can therefore set or remove allowed host(s) to or from the + * list. * * If the host is not allowed, then the redirect is to wp-admin on the siteurl - * instead. This prevents malicious redirects which redirect to another host, but - * only used in a few places. + * instead. This prevents malicious redirects which redirect to another host, + * but only used in a few places. * * @since 2.3 * @uses apply_filters() Calls 'allowed_redirect_hosts' on an array containing @@ -750,13 +922,16 @@ function wp_safe_redirect($location, $status = 302) { if ( substr($location, 0, 2) == '//' ) $location = 'http:' . $location; - $lp = parse_url($location); + // 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')); $allowed_hosts = (array) apply_filters('allowed_redirect_hosts', array($wpp['host']), isset($lp['host']) ? $lp['host'] : ''); if ( isset($lp['host']) && ( !in_array($lp['host'], $allowed_hosts) && $lp['host'] != strtolower($wpp['host'])) ) - $location = get_option('siteurl') . '/wp-admin/'; + $location = admin_url(); wp_redirect($location, $status); } @@ -764,7 +939,7 @@ endif; if ( ! function_exists('wp_notify_postauthor') ) : /** - * wp_notify_postauthor() - Notify an author of a comment/trackback/pingback to one of their posts + * Notify an author of a comment/trackback/pingback to one of their posts. * * @since 1.0.0 * @@ -776,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 @@ -786,32 +964,41 @@ 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"; - $notify_message .= sprintf( __('Delete it: %s'), get_option('siteurl')."/wp-admin/comment.php?action=cdc&c=$comment_id" ) . "\r\n"; - $notify_message .= sprintf( __('Spam it: %s'), get_option('siteurl')."/wp-admin/comment.php?action=cdc&dt=spam&c=$comment_id" ) . "\r\n"; + $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"; $wp_email = 'wordpress@' . preg_replace('#^www\.#', '', strtolower($_SERVER['SERVER_NAME'])); @@ -843,7 +1030,7 @@ endif; if ( !function_exists('wp_notify_moderator') ) : /** - * wp_notify_moderator() - Notifies the moderator of the blog about a new comment that is awaiting approval + * Notifies the moderator of the blog about a new comment that is awaiting approval. * * @since 1.0 * @uses $wpdb @@ -890,29 +1077,49 @@ function wp_notify_moderator($comment_id) { break; } - $notify_message .= sprintf( __('Approve it: %s'), get_option('siteurl')."/wp-admin/comment.php?action=mac&c=$comment_id" ) . "\r\n"; - $notify_message .= sprintf( __('Delete it: %s'), get_option('siteurl')."/wp-admin/comment.php?action=cdc&c=$comment_id" ) . "\r\n"; - $notify_message .= sprintf( __('Spam it: %s'), get_option('siteurl')."/wp-admin/comment.php?action=cdc&dt=spam&c=$comment_id" ) . "\r\n"; + $notify_message .= sprintf( __('Approve it: %s'), admin_url("comment.php?action=mac&c=$comment_id") ) . "\r\n"; + $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"; - $strCommentsPending = sprintf( __ngettext('%s comment', '%s comments', $comments_waiting), $comments_waiting ); - $notify_message .= sprintf( __('Currently %s are waiting for approval. Please visit the moderation panel:'), $strCommentsPending ) . "\r\n"; - $notify_message .= get_option('siteurl') . "/wp-admin/edit-comments.php?comment_status=moderated\r\n"; + $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') ) : /** - * wp_new_user_notification() - Notify the blog admin of a new user, normally via email + * Notify the blog admin of a new user, normally via email. * * @since 2.0 * @@ -936,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 .= get_option('siteurl') . "/wp-login.php\r\n"; + $message .= wp_login_url() . "\r\n"; wp_mail($user_email, sprintf(__('[%s] Your username and password'), get_option('blogname')), $message); @@ -945,9 +1152,10 @@ endif; if ( !function_exists('wp_nonce_tick') ) : /** - * wp_nonce_tick() - Get the time-dependent variable for nonce creation + * Get the time-dependent variable for nonce creation. * - * A nonce has a lifespan of two ticks. Nonces in their second tick may be updated, e.g. by autosave. + * A nonce has a lifespan of two ticks. Nonces in their second tick may be + * updated, e.g. by autosave. * * @since 2.5 * @@ -962,12 +1170,12 @@ endif; if ( !function_exists('wp_verify_nonce') ) : /** - * wp_verify_nonce() - Verify that correct nonce was used with time limit + * Verify that correct nonce was used with time limit. * - * 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. + * 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. @@ -980,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; @@ -992,9 +1200,9 @@ endif; if ( !function_exists('wp_create_nonce') ) : /** - * wp_create_nonce() - Creates a random, one time use token + * 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 @@ -1005,76 +1213,128 @@ 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; if ( !function_exists('wp_salt') ) : /** - * wp_salt() - Get salt to add to hashes to help prevent attacks + * Get salt to add to hashes to help prevent attacks. + * + * The secret key is located in two places: the database in case the secret key + * isn't defined in the second place, which is in the wp-config.php file. If you + * are going to set the secret key, then you must do so in the wp-config.php + * file. * - * You can set the salt by defining two areas. One is in the database and - * the other is in your wp-config.php file. The database location is defined - * in the option named 'secret', but most likely will not need to be changed. + * The secret key in the database is randomly generated and will be appended to + * the secret key that is in wp-config.php file in some instances. It is + * important to have the secret key defined or changed in wp-config.php. * - * The second, located in wp-config.php, is a constant named 'SECRET_KEY', but - * is not required. If the constant is not defined then the database constants - * will be used, since they are most likely given to be unique. However, given - * that the salt will be added to the password and can be seen, the constant - * is recommended to be set manually. + * If you have installed WordPress 2.5 or later, then you will have the + * SECRET_KEY defined in the wp-config.php already. You will want to change the + * value in it because hackers will know what it is. If you have upgraded to + * WordPress 2.5 or later version from a version before WordPress 2.5, then you + * should add the constant to your wp-config.php file. + * + * 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 https://api.wordpress.org/secret-key/1.1/ secret key created} for you. * * * define('SECRET_KEY', 'mAry1HadA15|\/|b17w55w1t3asSn09w'); * * - * Attention: Do not use above example! - * - * Salting passwords helps against tools which has stored hashed values - * of common dictionary strings. The added values makes it harder to crack - * if given salt string is not weak. - * - * Salting only helps if the string is not predictable and should be - * made up of various characters. Think of the salt as a password for - * securing your passwords, but common among all of your passwords. - * Therefore the salt should be as long as possible as as difficult as - * possible, because you will not have to remember it. + * Salting passwords helps against tools which has stored hashed values of + * common dictionary strings. The added values makes it harder to crack if given + * salt string is not weak. * * @since 2.5 + * @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 */ -function wp_salt() { +function wp_salt($scheme = 'auth') { global $wp_default_secret_key; $secret_key = ''; if ( defined('SECRET_KEY') && ('' != SECRET_KEY) && ( $wp_default_secret_key != SECRET_KEY) ) $secret_key = SECRET_KEY; - if ( defined('SECRET_SALT') ) { - $salt = SECRET_SALT; - } else { - $salt = get_option('secret'); - if ( empty($salt) ) { - $salt = wp_generate_password(); - update_option('secret', $salt); + if ( 'auth' == $scheme ) { + if ( defined('AUTH_KEY') && ('' != AUTH_KEY) && ( $wp_default_secret_key != AUTH_KEY) ) + $secret_key = AUTH_KEY; + + if ( defined('AUTH_SALT') ) { + $salt = AUTH_SALT; + } elseif ( defined('SECRET_SALT') ) { + $salt = SECRET_SALT; + } else { + $salt = get_option('auth_salt'); + if ( empty($salt) ) { + $salt = wp_generate_password(64); + update_option('auth_salt', $salt); + } + } + } elseif ( 'secure_auth' == $scheme ) { + if ( defined('SECURE_AUTH_KEY') && ('' != SECURE_AUTH_KEY) && ( $wp_default_secret_key != SECURE_AUTH_KEY) ) + $secret_key = SECURE_AUTH_KEY; + + if ( defined('SECURE_AUTH_SALT') ) { + $salt = SECURE_AUTH_SALT; + } else { + $salt = get_option('secure_auth_salt'); + if ( empty($salt) ) { + $salt = wp_generate_password(64); + update_option('secure_auth_salt', $salt); + } + } + } elseif ( 'logged_in' == $scheme ) { + if ( defined('LOGGED_IN_KEY') && ('' != LOGGED_IN_KEY) && ( $wp_default_secret_key != LOGGED_IN_KEY) ) + $secret_key = LOGGED_IN_KEY; + + if ( defined('LOGGED_IN_SALT') ) { + $salt = LOGGED_IN_SALT; + } else { + $salt = get_option('logged_in_salt'); + if ( empty($salt) ) { + $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); + return apply_filters('salt', $secret_key . $salt, $scheme); } endif; if ( !function_exists('wp_hash') ) : /** - * wp_hash() - Get hash of given string + * 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 * @return string Hash of $data */ -function wp_hash($data) { - $salt = wp_salt(); +function wp_hash($data, $scheme = 'auth') { + $salt = wp_salt($scheme); return hash_hmac('md5', $data, $salt); } @@ -1082,11 +1342,10 @@ endif; if ( !function_exists('wp_hash_password') ) : /** - * wp_hash_password() - Create a hash (encrypt) of a plain text password + * Create a hash (encrypt) of a plain text password. * - * For integration with other applications, this function can be - * overwritten to instead use the other package password checking - * algorithm. + * For integration with other applications, this function can be overwritten to + * instead use the other package password checking algorithm. * * @since 2.5 * @global object $wp_hasher PHPass object @@ -1110,17 +1369,15 @@ endif; if ( !function_exists('wp_check_password') ) : /** - * wp_check_password() - Checks the plaintext password against the encrypted Password + * Checks the plaintext password against the encrypted Password. * - * Maintains compatibility between old version and the new cookie - * authentication protocol using PHPass library. The $hash parameter - * is the encrypted password and the function compares the plain text - * password when encypted similarly against the already encrypted - * password to see if they match. + * Maintains compatibility between old version and the new cookie authentication + * protocol using PHPass library. The $hash parameter is the encrypted password + * and the function compares the plain text password when encypted similarly + * against the already encrypted password to see if they match. * - * For integration with other applications, this function can be - * overwritten to instead use the other package password checking - * algorithm. + * For integration with other applications, this function can be overwritten to + * instead use the other package password checking algorithm. * * @since 2.5 * @global object $wp_hasher PHPass object used for checking the password @@ -1162,28 +1419,74 @@ endif; if ( !function_exists('wp_generate_password') ) : /** - * wp_generate_password() - Generates a random password drawn from the defined set of characters + * Generates a random password drawn from the defined set of characters. * * @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) { - $chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()"; +function wp_generate_password($length = 12, $special_chars = true) { + $chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'; + if ( $special_chars ) + $chars .= '!@#$%^&*()'; + $password = ''; for ( $i = 0; $i < $length; $i++ ) - $password .= substr($chars, mt_rand(0, strlen($chars) - 1), 1); + $password .= substr($chars, wp_rand(0, strlen($chars) - 1), 1); return $password; } endif; +if ( !function_exists('wp_rand') ) : + /** + * Generates a random number + * + * @since 2.6.2 + * + * @param int $min Lower limit for the generated number (optional, default is 0) + * @param int $max Upper limit for the generated number (optional, default is 4294967295) + * @return int A random number between min and max + */ +function wp_rand( $min = 0, $max = 0 ) { + global $rnd_value; + + $seed = get_transient('random_seed'); + + // Reset $rnd_value after 14 uses + // 32(md5) + 40(sha1) + 40(sha1) / 8 = 14 random numbers from $rnd_value + if ( strlen($rnd_value) < 8 ) { + $rnd_value = md5( uniqid(microtime() . mt_rand(), true ) . $seed ); + $rnd_value .= sha1($rnd_value); + $rnd_value .= sha1($rnd_value . $seed); + $seed = md5($seed . $rnd_value); + set_transient('random_seed', $seed); + } + + // Take the first 8 digits for our value + $value = substr($rnd_value, 0, 8); + + // Strip the first eight, leaving the remainder for the next call to wp_rand(). + $rnd_value = substr($rnd_value, 8); + + $value = abs(hexdec($value)); + + // Reduce the value to be within the min - max range + // 4294967295 = 0xffffffff = max random number + if ( $max != 0 ) + $value = $min + (($max - $min + 1) * ($value / (4294967295 + 1))); + + return abs(intval($value)); +} +endif; + if ( !function_exists('wp_set_password') ) : /** - * wp_set_password() - Updates the user's password with a new encrypted one + * Updates the user's password with a new encrypted one. * - * For integration with other applications, this function can be - * overwritten to instead use the other package password checking - * algorithm. + * For integration with other applications, this function can be overwritten to + * instead use the other package password checking algorithm. * * @since 2.5 * @uses $wpdb WordPress database object for queries @@ -1196,28 +1499,32 @@ 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; if ( !function_exists( 'get_avatar' ) ) : /** - * get_avatar() - Get avatar for a user - * - * Retrieve the avatar for a user provided a user ID or email address + * Retrieve the avatar for a user who provided a user ID or email address. * * @since 2.5 * @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'; @@ -1228,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); @@ -1240,11 +1550,34 @@ function get_avatar( $id_or_email, $size = '96', $default = '' ) { $email = $id_or_email; } - if ( empty($default) ) - $default = "http://www.gravatar.com/avatar/ad516503a11cd5ca435acc9bb6523536?s=$size"; // ad516503a11cd5ca435acc9bb6523536 == md5('unknown@gravatar.com') + if ( empty($default) ) { + $avatar_default = get_option('avatar_default'); + if ( empty($avatar_default) ) + $default = 'mystery'; + else + $default = $avatar_default; + } + + 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 = "$host/avatar/s={$size}"; + elseif ( empty($email) ) + $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 ); @@ -1253,18 +1586,18 @@ 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; if ( !function_exists('wp_setcookie') ) : /** - * wp_setcookie() - Sets a cookie for a user who just logged in + * Sets a cookie for a user who just logged in. * * @since 1.5 * @deprecated Use wp_set_auth_cookie() @@ -1286,7 +1619,7 @@ endif; if ( !function_exists('wp_clearcookie') ) : /** - * wp_clearcookie() - Clears the authentication cookie, logging the user out + * Clears the authentication cookie, logging the user out. * * @since 1.5 * @deprecated Use wp_clear_auth_cookie() @@ -1300,12 +1633,12 @@ endif; if ( !function_exists('wp_get_cookie_login') ): /** - * wp_get_cookie_login() - Gets the user cookie login + * Gets the user 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. + * 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 @@ -1318,15 +1651,14 @@ endif; if ( !function_exists('wp_login') ) : /** - * wp_login() - Checks a users login information and logs them in if it checks out + * Checks a users login information and logs them in if it checks out. * - * Use the global $error to get the reason why the login failed. - * If the username is blank, no error will be set, so assume - * blank username on that case. + * Use the global $error to get the reason why the login failed. If the username + * is blank, no error will be set, so assume blank username on that case. * - * Plugins extending this function should also provide the global - * $error and set what the error is, so that those checking the - * global for why there was a failure can utilize it later. + * Plugins extending this function should also provide the global $error and set + * what the error is, so that those checking the global for why there was a + * failure can utilize it later. * * @since 1.2.2 * @deprecated Use wp_signon() @@ -1350,4 +1682,74 @@ function wp_login($username, $password, $deprecated = '') { } endif; +if ( !function_exists( 'wp_text_diff' ) ) : +/** + * Displays a human readable HTML representation of the difference between two strings. + * + * The Diff is available for getting the changes between versions. The output is + * HTML, so the primary use is for displaying the changes. If the two strings + * are equivalent, then an empty string will be returned. + * + * The arguments supported and can be changed are listed below. + * + * 'title' : Default is an empty string. Titles the diff in a manner compatible + * with the output. + * 'title_left' : Default is an empty string. Change the HTML to the left of the + * title. + * 'title_right' : Default is an empty string. Change the HTML to the right of + * the title. + * + * @since 2.6 + * @see wp_parse_args() Used to change defaults to user defined settings. + * @uses Text_Diff + * @uses WP_Text_Diff_Renderer_Table + * + * @param string $left_string "old" (left) version of string + * @param string $right_string "new" (right) version of string + * @param string|array $args Optional. Change 'title', 'title_left', and 'title_right' defaults. + * @return string Empty string if strings are equivalent or HTML with differences. + */ +function wp_text_diff( $left_string, $right_string, $args = null ) { + $defaults = array( 'title' => '', 'title_left' => '', 'title_right' => '' ); + $args = wp_parse_args( $args, $defaults ); + + if ( !class_exists( 'WP_Text_Diff_Renderer_Table' ) ) + require( ABSPATH . WPINC . '/wp-diff.php' ); + + $left_string = normalize_whitespace($left_string); + $right_string = normalize_whitespace($right_string); + + $left_lines = split("\n", $left_string); + $right_lines = split("\n", $right_string); + + $text_diff = new Text_Diff($left_lines, $right_lines); + $renderer = new WP_Text_Diff_Renderer_Table(); + $diff = $renderer->render($text_diff); + + if ( !$diff ) + return ''; + + $r = "\n"; + $r .= ""; + + if ( $args['title'] || $args['title_left'] || $args['title_right'] ) + $r .= ""; + if ( $args['title'] ) + $r .= "\n"; + if ( $args['title_left'] || $args['title_right'] ) { + $r .= "\n"; + $r .= "\t\n"; + $r .= "\t\n"; + $r .= "\n"; + } + if ( $args['title'] || $args['title_left'] || $args['title_right'] ) + $r .= "\n"; + + $r .= "\n$diff\n\n"; + $r .= "
$args[title]
$args[title_left]$args[title_right]
"; + + return $r; +} +endif; + ?>