X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/76aea3697c6043c1613370f172395b4f65ee71f0..2376fb745f4ae8c6bd2353127524e0b28005143d:/wp-includes/pluggable.php
diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php
index e7ca2a73..b5198323 100644
--- a/wp-includes/pluggable.php
+++ b/wp-includes/pluggable.php
@@ -6,24 +6,6 @@
* @package WordPress
*/
-if ( !function_exists('set_current_user') ) :
-/**
- * Changes the current user by ID or name.
- *
- * Set $id to null and specify a name if you do not know a user's ID.
- *
- * @since 2.0.1
- * @see wp_set_current_user() An alias of wp_set_current_user()
- *
- * @param int|null $id User ID.
- * @param string $name Optional. The user's username
- * @return object returns wp_set_current_user()
- */
-function set_current_user($id, $name = '') {
- return wp_set_current_user($id, $name);
-}
-endif;
-
if ( !function_exists('wp_set_current_user') ) :
/**
* Changes the current user by ID or name.
@@ -34,7 +16,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 +44,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
*/
@@ -99,7 +81,7 @@ function get_currentuserinfo() {
return;
if ( ! $user = wp_validate_auth_cookie() ) {
- if ( empty($_COOKIE[LOGGED_IN_COOKIE]) || !$user = wp_validate_auth_cookie($_COOKIE[LOGGED_IN_COOKIE], 'logged_in') ) {
+ if ( is_admin() || empty($_COOKIE[LOGGED_IN_COOKIE]) || !$user = wp_validate_auth_cookie($_COOKIE[LOGGED_IN_COOKIE], 'logged_in') ) {
wp_set_current_user(0);
return false;
}
@@ -121,65 +103,97 @@ if ( !function_exists('get_userdata') ) :
function get_userdata( $user_id ) {
global $wpdb;
- $user_id = absint($user_id);
- if ( $user_id == 0 )
+ if ( ! is_numeric( $user_id ) )
+ return false;
+
+ $user_id = absint( $user_id );
+ if ( ! $user_id )
return false;
- $user = wp_cache_get($user_id, 'users');
+ $user = wp_cache_get( $user_id, 'users' );
if ( $user )
return $user;
- if ( !$user = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->users WHERE ID = %d LIMIT 1", $user_id)) )
+ if ( ! $user = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->users WHERE ID = %d LIMIT 1", $user_id ) ) )
return false;
- _fill_user($user);
+ _fill_user( $user );
return $user;
}
endif;
-if ( !function_exists('update_user_cache') ) :
+if ( !function_exists('cache_users') ) :
/**
- * Updates a users cache when overridden by a plugin.
+ * Retrieve info for user lists to prevent multiple queries by get_userdata()
*
- * Core function does nothing.
+ * @since 3.0.0
*
- * @since 1.5
- *
- * @return bool Only returns true
+ * @param array $users User ID numbers list
*/
-function update_user_cache() {
- return true;
+function cache_users( $users ) {
+ global $wpdb;
+
+ $clean = array();
+ foreach($users as $id) {
+ $id = (int) $id;
+ if (wp_cache_get($id, 'users')) {
+ // seems to be cached already
+ } else {
+ $clean[] = $id;
+ }
+ }
+
+ if ( 0 == count($clean) )
+ return;
+
+ $list = implode(',', $clean);
+
+ $results = $wpdb->get_results("SELECT * FROM $wpdb->users WHERE ID IN ($list)");
+
+ _fill_many_users($results);
}
endif;
-if ( !function_exists('get_userdatabylogin') ) :
+if ( !function_exists('get_user_by') ) :
/**
- * Retrieve user info by login name.
+ * Retrieve user info by a given field
*
- * @since 0.71
+ * @since 2.8.0
*
- * @param string $user_login User's username
+ * @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 get_userdatabylogin($user_login) {
+function get_user_by($field, $value) {
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');
+ 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 )
- return $user;
+ if ( false !== $user_id )
+ return get_userdata($user_id);
- if ( !$user = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->users WHERE user_login = %s", $user_login)) )
+ if ( !$user = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->users WHERE $field = %s", $value) ) )
return false;
_fill_user($user);
@@ -188,6 +202,20 @@ function get_userdatabylogin($user_login) {
}
endif;
+if ( !function_exists('get_userdatabylogin') ) :
+/**
+ * Retrieve user info by login name.
+ *
+ * @since 0.71
+ *
+ * @param string $user_login User's username
+ * @return bool|object False on failure, User DB row object
+ */
+function get_userdatabylogin($user_login) {
+ return get_user_by('login', $user_login);
+}
+endif;
+
if ( !function_exists('get_user_by_email') ) :
/**
* Retrieve user info by email.
@@ -198,23 +226,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;
@@ -249,15 +261,19 @@ if ( !function_exists( 'wp_mail' ) ) :
* @uses PHPMailer
* @
*
- * @param string $to Email address to send message
+ * @param string|array $to Array or comma-separated list of email addresses to send message.
* @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", str_replace( "\r\n", "\n", $attachments ) );
global $phpmailer;
@@ -271,54 +287,74 @@ 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 = explode( "\n", str_replace( "\r\n", "\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 );
// Cleanup crew
- $name = trim( $name );
+ $name = trim( $name );
$content = trim( $content );
- // Mainly for legacy -- process a From: header if it's there
- if ( 'from' == strtolower($name) ) {
- if ( strpos($content, '<' ) !== false ) {
- // So... making my life hard again?
- $from_name = substr( $content, 0, strpos( $content, '<' ) - 1 );
- $from_name = str_replace( '"', '', $from_name );
- $from_name = trim( $from_name );
-
- $from_email = substr( $content, strpos( $content, '<' ) + 1 );
- $from_email = str_replace( '>', '', $from_email );
- $from_email = trim( $from_email );
- } else {
- $from_name = 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 ) );
- } 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 );
+ switch ( strtolower( $name ) ) {
+ // Mainly for legacy -- process a From: header if it's there
+ case 'from':
+ if ( strpos($content, '<' ) !== false ) {
+ // So... making my life hard again?
+ $from_name = substr( $content, 0, strpos( $content, '<' ) - 1 );
+ $from_name = str_replace( '"', '', $from_name );
+ $from_name = trim( $from_name );
+
+ $from_email = substr( $content, strpos( $content, '<' ) + 1 );
+ $from_email = str_replace( '>', '', $from_email );
+ $from_email = trim( $from_email );
+ } else {
+ $from_email = trim( $content );
+ }
+ break;
+ case 'content-type':
+ if ( strpos( $content, ';' ) !== false ) {
+ list( $type, $charset ) = explode( ';', $content );
+ $content_type = trim( $type );
+ 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 );
+ }
+ break;
+ case 'cc':
+ $cc = array_merge( (array) $cc, explode( ',', $content ) );
+ break;
+ case 'bcc':
+ $bcc = array_merge( (array) $bcc, explode( ',', $content ) );
+ break;
+ default:
+ // Add it to our grand headers array
+ $headers[trim( $name )] = trim( $content );
+ break;
}
}
}
@@ -335,11 +371,16 @@ function wp_mail( $to, $subject, $message, $headers = '' ) {
// From email and name
// If we don't have a name from the input headers
- if ( !isset( $from_name ) ) {
+ if ( !isset( $from_name ) )
$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,25 +391,31 @@ function wp_mail( $to, $subject, $message, $headers = '' ) {
$from_email = 'wordpress@' . $sitename;
}
- // Set the from name and email
- $phpmailer->From = apply_filters( 'wp_mail_from', $from_email );
- $phpmailer->FromName = apply_filters( 'wp_mail_from_name', $from_name );
+ // 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 );
+
+ // Set destination addresses
+ if ( !is_array( $to ) )
+ $to = explode( ',', $to );
- // Set destination address
- $phpmailer->AddAddress( $to );
+ foreach ( (array) $to as $recipient ) {
+ $phpmailer->AddAddress( trim( $recipient ) );
+ }
// Set mail's subject and body
$phpmailer->Subject = $subject;
- $phpmailer->Body = $message;
+ $phpmailer->Body = $message;
// Add any CC and BCC recipients
- if ( !empty($cc) ) {
- foreach ($cc as $recipient) {
+ if ( !empty( $cc ) ) {
+ foreach ( (array) $cc as $recipient ) {
$phpmailer->AddCc( trim($recipient) );
}
}
- if ( !empty($bcc) ) {
- foreach ($bcc as $recipient) {
+
+ if ( !empty( $bcc ) ) {
+ foreach ( (array) $bcc as $recipient) {
$phpmailer->AddBcc( trim($recipient) );
}
}
@@ -378,32 +425,38 @@ function wp_mail( $to, $subject, $message, $headers = '' ) {
// Set Content-Type and charset
// If we don't have a content-type from the input headers
- if ( !isset( $content_type ) ) {
+ if ( !isset( $content_type ) )
$content_type = 'text/plain';
- }
$content_type = apply_filters( 'wp_mail_content_type', $content_type );
- // Set whether it's plaintext or not, depending on $content_type
- if ( $content_type == 'text/html' ) {
+ $phpmailer->ContentType = $content_type;
+
+ // Set whether it's plaintext, depending on $content_type
+ if ( 'text/html' == $content_type )
$phpmailer->IsHTML( true );
- } else {
- $phpmailer->IsHTML( false );
- }
// If we don't have a charset from the input headers
- if ( !isset( $charset ) ) {
+ if ( !isset( $charset ) )
$charset = get_bloginfo( 'charset' );
- }
// Set the content-type and charset
$phpmailer->CharSet = apply_filters( 'wp_mail_charset', $charset );
// 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 +468,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 +528,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 +543,31 @@ 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;
+ if ( $expiration < time() ) // AJAX/POST grace period set above
+ $GLOBALS['login_grace_period'] = 1;
+
+ do_action('auth_cookie_valid', $cookie_elements, $user);
return $user->ID;
}
@@ -545,7 +589,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 +600,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.
@@ -565,18 +658,18 @@ if ( !function_exists('wp_set_auth_cookie') ) :
* @since 2.5
*
* @param int $user_id User ID
- * @param bool $remember Whether to remember the user or not
+ * @param bool $remember Whether to remember the user
*/
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;
}
if ( '' === $secure )
- $secure = is_ssl() ? true : false;
+ $secure = is_ssl();
if ( $secure ) {
$auth_cookie_name = SECURE_AUTH_COOKIE;
@@ -592,11 +685,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 +712,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);
@@ -655,24 +762,35 @@ if ( !function_exists('auth_redirect') ) :
function auth_redirect() {
// Checks if a user is logged in, if not redirects them to the login page
- if ( is_ssl() || force_ssl_admin() )
- $secure = true;
- else
- $secure = false;
+ $secure = ( is_ssl() || force_ssl_admin() );
// 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( '', apply_filters( 'auth_redirect_scheme', '' ) ) ) {
+ 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 +800,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, true);
wp_redirect($login_url);
exit();
@@ -704,7 +824,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 +837,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)
@@ -726,7 +846,7 @@ function check_ajax_referer( $action = -1, $query_arg = false, $die = true ) {
if ( $query_arg )
$nonce = $_REQUEST[$query_arg];
else
- $nonce = $_REQUEST['_ajax_nonce'] ? $_REQUEST['_ajax_nonce'] : $_REQUEST['_wpnonce'];
+ $nonce = isset($_REQUEST['_ajax_nonce']) ? $_REQUEST['_ajax_nonce'] : $_REQUEST['_wpnonce'];
$result = wp_verify_nonce( $nonce, $action );
@@ -756,7 +876,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;
@@ -767,7 +887,7 @@ function wp_redirect($location, $status = 302) {
} else {
if ( php_sapi_name() != 'cgi-fcgi' )
status_header($status); // This causes problems on IIS and some FastCGI setups
- header("Location: $location");
+ header("Location: $location", true, $status);
}
}
endif;
@@ -781,21 +901,12 @@ 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
- $strip = array('%0d', '%0a');
- $found = true;
- while($found) {
- $found = false;
- foreach($strip as $val) {
- while(strpos($location, $val) !== false) {
- $found = true;
- $location = str_replace($val, '', $location);
- }
- }
- }
+ $strip = array('%0d', '%0a', '%0D', '%0A');
+ $location = _deep_replace($strip, $location);
return $location;
}
endif;
@@ -813,8 +924,7 @@ if ( !function_exists('wp_safe_redirect') ) :
* but only used in a few places.
*
* @since 2.3
- * @uses apply_filters() Calls 'allowed_redirect_hosts' on an array containing
- * WordPress host string and $location host string.
+ * @uses wp_validate_redirect() To validate the redirect is to an allowed host.
*
* @return void Does not return anything
**/
@@ -823,22 +933,60 @@ function wp_safe_redirect($location, $status = 302) {
// Need to look at the URL the way it will end up in wp_redirect()
$location = wp_sanitize_redirect($location);
+ $location = wp_validate_redirect($location, admin_url());
+
+ wp_redirect($location, $status);
+}
+endif;
+
+if ( !function_exists('wp_validate_redirect') ) :
+/**
+ * Validates a URL for use in a 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.
+ *
+ * If the host is not allowed, then the redirect is to $default supplied
+ *
+ * @since 2.8.1
+ * @uses apply_filters() Calls 'allowed_redirect_hosts' on an array containing
+ * WordPress host string and $location host string.
+ *
+ * @param string $location The redirect to validate
+ * @param string $default The value to return is $location is not allowed
+ * @return string redirect-sanitized URL
+ **/
+function wp_validate_redirect($location, $default = '') {
// browsers will assume 'http' is your protocol, and will obey a redirect to a URL starting with '//'
if ( substr($location, 0, 2) == '//' )
$location = 'http:' . $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'));
+
+ // Give up if malformed URL
+ if ( false === $lp )
+ return $default;
+
+ // Allow only http and https schemes. No data:, etc.
+ if ( isset($lp['scheme']) && !('http' == $lp['scheme'] || 'https' == $lp['scheme']) )
+ return $default;
+
+ // Reject if scheme is set but host is not. This catches urls like https:host.com for which parse_url does not set the host field.
+ if ( isset($lp['scheme']) && !isset($lp['host']) )
+ return $default;
+
+ $wpp = parse_url(home_url());
$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 = admin_url();
+ $location = $default;
- wp_redirect($location, $status);
+ return $location;
}
endif;
@@ -857,41 +1005,54 @@ function wp_notify_postauthor($comment_id, $comment_type='') {
$post = get_post($comment->comment_post_ID);
$user = get_userdata( $post->post_author );
+ 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
$comment_author_domain = @gethostbyaddr($comment->comment_author_IP);
- $blogname = get_option('blogname');
+ // The blogname option is escaped with esc_html on the way into the database in sanitize_option
+ // we want to reverse this for the plain text arena of emails.
+ $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
if ( empty( $comment_type ) ) $comment_type = 'comment';
if ('comment' == $comment_type) {
- $notify_message = sprintf( __('New comment on your post #%1$s "%2$s"'), $comment->comment_post_ID, $post->post_title ) . "\r\n";
+ $notify_message = sprintf( __( 'New comment on your post "%s"' ), $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) {
- $notify_message = sprintf( __('New trackback on your post #%1$s "%2$s"'), $comment->comment_post_ID, $post->post_title ) . "\r\n";
+ $notify_message = sprintf( __( 'New trackback on your post "%s"' ), $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) {
- $notify_message = sprintf( __('New pingback on your post #%1$s "%2$s"'), $comment->comment_post_ID, $post->post_title ) . "\r\n";
+ $notify_message = sprintf( __( 'New pingback on your post "%s"' ), $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'), 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";
+ if ( EMPTY_TRASH_DAYS )
+ $notify_message .= sprintf( __('Trash it: %s'), admin_url("comment.php?action=trash&c=$comment_id") ) . "\r\n";
+ else
+ $notify_message .= sprintf( __('Delete it: %s'), admin_url("comment.php?action=delete&c=$comment_id") ) . "\r\n";
+ $notify_message .= sprintf( __('Spam it: %s'), admin_url("comment.php?action=spam&c=$comment_id") ) . "\r\n";
$wp_email = 'wordpress@' . preg_replace('#^www\.#', '', strtolower($_SERVER['SERVER_NAME']));
@@ -943,24 +1104,28 @@ function wp_notify_moderator($comment_id) {
$comment_author_domain = @gethostbyaddr($comment->comment_author_IP);
$comments_waiting = $wpdb->get_var("SELECT count(comment_ID) FROM $wpdb->comments WHERE comment_approved = '0'");
+ // The blogname option is escaped with esc_html on the way into the database in sanitize_option
+ // we want to reverse this for the plain text arena of emails.
+ $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
+
switch ($comment->comment_type)
{
case 'trackback':
- $notify_message = sprintf( __('A new trackback on the post #%1$s "%2$s" is waiting for your approval'), $post->ID, $post->post_title ) . "\r\n";
+ $notify_message = sprintf( __('A new trackback on the post "%s" is waiting for your approval'), $post->post_title ) . "\r\n";
$notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n";
$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 .= __('Trackback excerpt: ') . "\r\n" . $comment->comment_content . "\r\n\r\n";
break;
case 'pingback':
- $notify_message = sprintf( __('A new pingback on the post #%1$s "%2$s" is waiting for your approval'), $post->ID, $post->post_title ) . "\r\n";
+ $notify_message = sprintf( __('A new pingback on the post "%s" is waiting for your approval'), $post->post_title ) . "\r\n";
$notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n";
$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 .= __('Pingback excerpt: ') . "\r\n" . $comment->comment_content . "\r\n\r\n";
break;
default: //Comments
- $notify_message = sprintf( __('A new comment on the post #%1$s "%2$s" is waiting for your approval'), $post->ID, $post->post_title ) . "\r\n";
+ $notify_message = sprintf( __('A new comment on the post "%s" is waiting for your approval'), $post->post_title ) . "\r\n";
$notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n";
$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";
@@ -970,26 +1135,52 @@ function wp_notify_moderator($comment_id) {
break;
}
- $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";
+ $notify_message .= sprintf( __('Approve it: %s'), admin_url("comment.php?action=approve&c=$comment_id") ) . "\r\n";
+ if ( EMPTY_TRASH_DAYS )
+ $notify_message .= sprintf( __('Trash it: %s'), admin_url("comment.php?action=trash&c=$comment_id") ) . "\r\n";
+ else
+ $notify_message .= sprintf( __('Delete it: %s'), admin_url("comment.php?action=delete&c=$comment_id") ) . "\r\n";
+ $notify_message .= sprintf( __('Spam it: %s'), admin_url("comment.php?action=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 );
+ $subject = sprintf( __('[%1$s] Please moderate: "%2$s"'), $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";
+ // The blogname option is escaped with esc_html on the way into the database in sanitize_option
+ // we want to reverse this for the plain text arena of emails.
+ $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
+ wp_mail(get_option('admin_email'), sprintf(__('[%s] Password Lost/Changed'), $blogname), $message);
+ }
+}
+endif;
+
if ( !function_exists('wp_new_user_notification') ) :
/**
* Notify the blog admin of a new user, normally via email.
@@ -1005,20 +1196,24 @@ function wp_new_user_notification($user_id, $plaintext_pass = '') {
$user_login = stripslashes($user->user_login);
$user_email = stripslashes($user->user_email);
- $message = sprintf(__('New user registration on your blog %s:'), get_option('blogname')) . "\r\n\r\n";
+ // The blogname option is escaped with esc_html on the way into the database in sanitize_option
+ // we want to reverse this for the plain text arena of emails.
+ $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
+
+ $message = sprintf(__('New user registration on your site %s:'), $blogname) . "\r\n\r\n";
$message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n";
$message .= sprintf(__('E-mail: %s'), $user_email) . "\r\n";
- @wp_mail(get_option('admin_email'), sprintf(__('[%s] New User Registration'), get_option('blogname')), $message);
+ @wp_mail(get_option('admin_email'), sprintf(__('[%s] New User Registration'), $blogname), $message);
if ( empty($plaintext_pass) )
return;
$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);
+ wp_mail($user_email, sprintf(__('[%s] Your username and password'), $blogname), $message);
}
endif;
@@ -1048,7 +1243,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 +1256,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 +1270,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 +1281,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 +1307,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,9 +1318,10 @@ 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
+ * @param string $scheme Authentication scheme
+ * @return string Salt value
*/
function wp_salt($scheme = 'auth') {
global $wp_default_secret_key;
@@ -1137,43 +1333,59 @@ function wp_salt($scheme = 'auth') {
if ( defined('AUTH_KEY') && ('' != AUTH_KEY) && ( $wp_default_secret_key != AUTH_KEY) )
$secret_key = AUTH_KEY;
- if ( defined('AUTH_SALT') ) {
+ if ( defined('AUTH_SALT') && ('' != AUTH_SALT) && ( $wp_default_secret_key != AUTH_SALT) ) {
$salt = AUTH_SALT;
- } elseif ( defined('SECRET_SALT') ) {
+ } elseif ( defined('SECRET_SALT') && ('' != SECRET_SALT) && ( $wp_default_secret_key != SECRET_SALT) ) {
$salt = SECRET_SALT;
} else {
- $salt = get_option('auth_salt');
+ $salt = get_site_option('auth_salt');
if ( empty($salt) ) {
- $salt = wp_generate_password();
- update_option('auth_salt', $salt);
+ $salt = wp_generate_password( 64, true, true );
+ update_site_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 = SECRET_AUTH_SALT;
+ if ( defined('SECURE_AUTH_SALT') && ('' != SECURE_AUTH_SALT) && ( $wp_default_secret_key != SECURE_AUTH_SALT) ) {
+ $salt = SECURE_AUTH_SALT;
} else {
- $salt = get_option('secure_auth_salt');
+ $salt = get_site_option('secure_auth_salt');
if ( empty($salt) ) {
- $salt = wp_generate_password();
- update_option('secure_auth_salt', $salt);
+ $salt = wp_generate_password( 64, true, true );
+ update_site_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') ) {
+ if ( defined('LOGGED_IN_SALT') && ('' != LOGGED_IN_SALT) && ( $wp_default_secret_key != LOGGED_IN_SALT) ) {
$salt = LOGGED_IN_SALT;
} else {
- $salt = get_option('logged_in_salt');
+ $salt = get_site_option('logged_in_salt');
if ( empty($salt) ) {
- $salt = wp_generate_password();
- update_option('logged_in_salt', $salt);
+ $salt = wp_generate_password( 64, true, true );
+ update_site_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') && ('' != NONCE_SALT) && ( $wp_default_secret_key != NONCE_SALT) ) {
+ $salt = NONCE_SALT;
+ } else {
+ $salt = get_site_option('nonce_salt');
+ if ( empty($salt) ) {
+ $salt = wp_generate_password( 64, true, true );
+ update_site_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 +1396,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,17 +1492,26 @@ 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. Default true.
+ * @param bool $extra_special_chars Whether to include other special characters. Used when
+ * generating secret keys and salts. Default false.
* @return string The random password
**/
-function wp_generate_password($length = 12, $special_chars = true) {
+function wp_generate_password( $length = 12, $special_chars = true, $extra_special_chars = false ) {
$chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
if ( $special_chars )
$chars .= '!@#$%^&*()';
+ if ( $extra_special_chars )
+ $chars .= '-_ []{}<>~`+=,.;:/?|';
$password = '';
- for ( $i = 0; $i < $length; $i++ )
+ for ( $i = 0; $i < $length; $i++ ) {
$password .= substr($chars, wp_rand(0, strlen($chars) - 1), 1);
- return $password;
+ }
+
+ // random_password filter was previously in random_password function which was deprecated
+ return apply_filters('random_password', $password);
}
endif;
@@ -1307,16 +1528,19 @@ if ( !function_exists('wp_rand') ) :
function wp_rand( $min = 0, $max = 0 ) {
global $rnd_value;
- $seed = get_option('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 ) {
+ if ( defined( 'WP_SETUP_CONFIG' ) )
+ static $seed = '';
+ else
+ $seed = get_transient('random_seed');
$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);
- update_option('random_seed', $seed);
+ if ( ! defined( 'WP_SETUP_CONFIG' ) )
+ set_transient('random_seed', $seed);
}
// Take the first 8 digits for our value
@@ -1332,7 +1556,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 +1578,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 +1592,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 +1614,11 @@ function get_avatar( $id_or_email, $size = '96', $default = '' ) {
if ( $user )
$email = $user->user_email;
} elseif ( is_object($id_or_email) ) {
+ // No avatar for pingbacks or trackbacks
+ $allowed_comment_types = apply_filters( 'get_avatar_comment_types', array( 'comment' ) );
+ if ( ! empty( $id_or_email->comment_type ) && ! in_array( $id_or_email->comment_type, (array) $allowed_comment_types ) )
+ return false;
+
if ( !empty($id_or_email->user_id) ) {
$id = (int) $id_or_email->user_id;
$user = get_userdata($id);
@@ -1404,22 +1639,34 @@ 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 ( !empty($email) )
+ $email_hash = md5( strtolower( $email ) );
+
+ if ( is_ssl() ) {
+ $host = 'https://secure.gravatar.com';
+ } else {
+ if ( !empty($email) )
+ $host = sprintf( "http://%d.gravatar.com", ( hexdec( $email_hash{0} ) % 2 ) );
+ else
+ $host = 'http://0.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 .= md5( strtolower( $email ) );
+ $out = "$host/avatar/";
+ $out .= $email_hash;
$out .= '?s='.$size;
$out .= '&d=' . urlencode( $default );
@@ -1427,99 +1674,12 @@ function get_avatar( $id_or_email, $size = '96', $default = '' ) {
if ( !empty( $rating ) )
$out .= "&r={$rating}";
- $avatar = "
";
+ $avatar = "";
} else {
- $avatar = "
";
+ $avatar = "";
}
- return apply_filters('get_avatar', $avatar, $id_or_email, $size, $default);
-}
-endif;
-
-if ( !function_exists('wp_setcookie') ) :
-/**
- * Sets a cookie for a user who just logged in.
- *
- * @since 1.5
- * @deprecated Use wp_set_auth_cookie()
- * @see wp_set_auth_cookie()
- *
- * @param string $username The user's username
- * @param string $password Optional. The user's password
- * @param bool $already_md5 Optional. Whether the password has already been through MD5
- * @param string $home Optional. Will be used instead of COOKIEPATH if set
- * @param string $siteurl Optional. Will be used instead of SITECOOKIEPATH if set
- * @param bool $remember Optional. Remember that the user is logged in
- */
-function wp_setcookie($username, $password = '', $already_md5 = false, $home = '', $siteurl = '', $remember = false) {
- _deprecated_function( __FUNCTION__, '2.5', 'wp_set_auth_cookie()' );
- $user = get_userdatabylogin($username);
- wp_set_auth_cookie($user->ID, $remember);
-}
-endif;
-
-if ( !function_exists('wp_clearcookie') ) :
-/**
- * Clears the authentication cookie, logging the user out.
- *
- * @since 1.5
- * @deprecated Use wp_clear_auth_cookie()
- * @see wp_clear_auth_cookie()
- */
-function wp_clearcookie() {
- _deprecated_function( __FUNCTION__, '2.5', 'wp_clear_auth_cookie()' );
- wp_clear_auth_cookie();
-}
-endif;
-
-if ( !function_exists('wp_get_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.
- *
- * @since 2.0.4
- * @deprecated No alternative
- *
- * @return bool Always returns false
- */
-function wp_get_cookie_login() {
- _deprecated_function( __FUNCTION__, '2.5', '' );
- return false;
-}
-endif;
-
-if ( !function_exists('wp_login') ) :
-/**
- * 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.
- *
- * 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()
- * @global string $error Error when false is returned
- *
- * @param string $username User's username
- * @param string $password User's password
- * @param bool $deprecated Not used
- * @return bool False on login failure, true on successful check
- */
-function wp_login($username, $password, $deprecated = '') {
- global $error;
-
- $user = wp_authenticate($username, $password);
-
- if ( ! is_wp_error($user) )
- return true;
-
- $error = $user->get_error_message();
- return false;
+ return apply_filters('get_avatar', $avatar, $id_or_email, $size, $default, $alt);
}
endif;
@@ -1557,14 +1717,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);
@@ -1597,5 +1752,3 @@ function wp_text_diff( $left_string, $right_string, $args = null ) {
return $r;
}
endif;
-
-?>
\ No newline at end of file