X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/bf5c68485ef07868ad0a91168ecd0092af7661ae..baca9ce86a38dc54c4574890ee2d352fd81f78b2:/wp-includes/ms-functions.php
diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php
index c9cd15fd..0f6794b5 100644
--- a/wp-includes/ms-functions.php
+++ b/wp-includes/ms-functions.php
@@ -152,17 +152,12 @@ function get_blog_count( $id = 0 ) {
*
* @param int $blog_id ID of the blog.
* @param int $post_id ID of the post you're looking for.
- * @return object The post.
+ * @return WP_Post|null WP_Post on success or null on failure
*/
function get_blog_post( $blog_id, $post_id ) {
- global $wpdb;
-
- $key = $blog_id . '-' . $post_id;
- $post = wp_cache_get( $key, 'global-posts' );
- if ( $post == false ) {
- $post = $wpdb->get_row( $wpdb->prepare( 'SELECT * FROM ' . $wpdb->get_blog_prefix( $blog_id ) . 'posts WHERE ID = %d', $post_id ) );
- wp_cache_add( $key, $post, 'global-posts' );
- }
+ switch_to_blog( $blog_id );
+ $post = get_post( $post_id );
+ restore_current_blog();
return $post;
}
@@ -183,11 +178,11 @@ function get_blog_post( $blog_id, $post_id ) {
function add_user_to_blog( $blog_id, $user_id, $role ) {
switch_to_blog($blog_id);
- $user = new WP_User($user_id);
+ $user = get_userdata( $user_id );
- if ( empty( $user->ID ) ) {
+ if ( ! $user ) {
restore_current_blog();
- return new WP_Error('user_does_not_exist', __('That user does not exist.'));
+ return new WP_Error( 'user_does_not_exist', __( 'The requested user does not exist.' ) );
}
if ( !get_user_meta($user_id, 'primary_blog', true) ) {
@@ -246,8 +241,8 @@ function remove_user_from_blog($user_id, $blog_id = '', $reassign = '') {
}
// wp_revoke_user($user_id);
- $user = new WP_User($user_id);
- if ( empty( $user->ID ) ) {
+ $user = get_userdata( $user_id );
+ if ( ! $user ) {
restore_current_blog();
return new WP_Error('user_does_not_exist', __('That user does not exist.'));
}
@@ -279,8 +274,8 @@ function remove_user_from_blog($user_id, $blog_id = '', $reassign = '') {
*
* @param string $domain The new blog's domain.
* @param string $path The new blog's path.
- * @param string $string The new blog's title.
- * @param int $site Optional. Defaults to 1.
+ * @param string $weblog_title The new blog's title.
+ * @param int $site_id Optional. Defaults to 1.
* @return int The ID of the newly created blog
*/
function create_empty_blog( $domain, $path, $weblog_title, $site_id = 1 ) {
@@ -313,19 +308,15 @@ function create_empty_blog( $domain, $path, $weblog_title, $site_id = 1 ) {
*
* @since MU 1.0
*
- * @param int $_blog_id ID of the source blog.
+ * @param int $blog_id ID of the source blog.
* @param int $post_id ID of the desired post.
* @return string The post's permalink
*/
-function get_blog_permalink( $_blog_id, $post_id ) {
- $key = "{$_blog_id}-{$post_id}-blog_permalink";
- $link = wp_cache_get( $key, 'site-options' );
- if ( $link == false ) {
- switch_to_blog( $_blog_id );
- $link = get_permalink( $post_id );
- restore_current_blog();
- wp_cache_add( $key, $link, 'site-options', 360 );
- }
+function get_blog_permalink( $blog_id, $post_id ) {
+ switch_to_blog( $blog_id );
+ $link = get_permalink( $post_id );
+ restore_current_blog();
+
return $link;
}
@@ -341,27 +332,27 @@ function get_blog_permalink( $_blog_id, $post_id ) {
*
* @param string $domain
* @param string $path Optional. Not required for subdomain installations.
- * @return int
+ * @return int 0 if no blog found, otherwise the ID of the matching blog
*/
function get_blog_id_from_url( $domain, $path = '/' ) {
global $wpdb;
- $domain = strtolower( $wpdb->escape( $domain ) );
- $path = strtolower( $wpdb->escape( $path ) );
+ $domain = strtolower( $domain );
+ $path = strtolower( $path );
$id = wp_cache_get( md5( $domain . $path ), 'blog-id-cache' );
- if ( $id == -1 ) { // blog does not exist
+ if ( $id == -1 ) // blog does not exist
return 0;
- } elseif ( $id ) {
- return (int)$id;
- }
+ elseif ( $id )
+ return (int) $id;
- $id = $wpdb->get_var( "SELECT blog_id FROM $wpdb->blogs WHERE domain = '$domain' and path = '$path' /* get_blog_id_from_url */" );
+ $id = $wpdb->get_var( $wpdb->prepare( "SELECT blog_id FROM $wpdb->blogs WHERE domain = %s and path = %s /* get_blog_id_from_url */", $domain, $path ) );
- if ( !$id ) {
+ if ( ! $id ) {
wp_cache_set( md5( $domain . $path ), -1, 'blog-id-cache' );
- return false;
+ return 0;
}
+
wp_cache_set( md5( $domain . $path ), $id, 'blog-id-cache' );
return $id;
@@ -384,25 +375,32 @@ function get_blog_id_from_url( $domain, $path = '/' ) {
*/
function is_email_address_unsafe( $user_email ) {
$banned_names = get_site_option( 'banned_email_domains' );
- if ($banned_names && !is_array( $banned_names ))
- $banned_names = explode( "\n", $banned_names);
+ if ( $banned_names && ! is_array( $banned_names ) )
+ $banned_names = explode( "\n", $banned_names );
+
+ $is_email_address_unsafe = false;
- if ( is_array( $banned_names ) && empty( $banned_names ) == false ) {
- $email_domain = strtolower( substr( $user_email, 1 + strpos( $user_email, '@' ) ) );
- foreach ( (array) $banned_names as $banned_domain ) {
- if ( $banned_domain == '' )
+ if ( $banned_names && is_array( $banned_names ) ) {
+ list( $email_local_part, $email_domain ) = explode( '@', $user_email );
+
+ foreach ( $banned_names as $banned_domain ) {
+ if ( ! $banned_domain )
continue;
- if (
- strstr( $email_domain, $banned_domain ) ||
- (
- strstr( $banned_domain, '/' ) &&
- preg_match( $banned_domain, $email_domain )
- )
- )
- return true;
+
+ if ( $email_domain == $banned_domain ) {
+ $is_email_address_unsafe = true;
+ break;
+ }
+
+ $dotted_domain = ".$banned_domain";
+ if ( $dotted_domain === substr( $user_email, -strlen( $dotted_domain ) ) ) {
+ $is_email_address_unsafe = true;
+ break;
+ }
}
}
- return false;
+
+ return apply_filters( 'is_email_address_unsafe', $is_email_address_unsafe, $user_email );
}
/**
@@ -436,10 +434,8 @@ function wpmu_validate_user_signup($user_name, $user_email) {
$orig_username = $user_name;
$user_name = preg_replace( '/\s+/', '', sanitize_user( $user_name, true ) );
- $maybe = array();
- preg_match( '/[a-z0-9]+/', $user_name, $maybe );
- if ( $user_name != $orig_username || $user_name != $maybe[0] ) {
+ if ( $user_name != $orig_username || preg_match( '/[^a-z0-9]/', $user_name ) ) {
$errors->add( 'user_name', __( 'Only lowercase letters (a-z) and numbers are allowed.' ) );
$user_name = $orig_username;
}
@@ -447,7 +443,7 @@ function wpmu_validate_user_signup($user_name, $user_email) {
$user_email = sanitize_email( $user_email );
if ( empty( $user_name ) )
- $errors->add('user_name', __('Please enter a username'));
+ $errors->add('user_name', __( 'Please enter a username.' ) );
$illegal_names = get_site_option( 'illegal_names' );
if ( is_array( $illegal_names ) == false ) {
@@ -455,13 +451,13 @@ function wpmu_validate_user_signup($user_name, $user_email) {
add_site_option( 'illegal_names', $illegal_names );
}
if ( in_array( $user_name, $illegal_names ) == true )
- $errors->add('user_name', __('That username is not allowed'));
+ $errors->add('user_name', __( 'That username is not allowed.' ) );
if ( is_email_address_unsafe( $user_email ) )
$errors->add('user_email', __('You cannot use that email address to signup. We are having problems with them blocking some of our email. Please use another email provider.'));
if ( strlen( $user_name ) < 4 )
- $errors->add('user_name', __('Username must be at least 4 characters'));
+ $errors->add('user_name', __( 'Username must be at least 4 characters.' ) );
if ( strpos( ' ' . $user_name, '_' ) != false )
$errors->add( 'user_name', __( 'Sorry, usernames may not contain the character “_”!' ) );
@@ -473,7 +469,7 @@ function wpmu_validate_user_signup($user_name, $user_email) {
$errors->add('user_name', __('Sorry, usernames must have letters too!'));
if ( !is_email( $user_email ) )
- $errors->add('user_email', __('Please enter a correct email address'));
+ $errors->add('user_email', __( 'Please enter a valid email address.' ) );
$limited_email_domains = get_site_option( 'limited_email_domains' );
if ( is_array( $limited_email_domains ) && empty( $limited_email_domains ) == false ) {
@@ -484,11 +480,11 @@ function wpmu_validate_user_signup($user_name, $user_email) {
// Check if the username has been used already.
if ( username_exists($user_name) )
- $errors->add('user_name', __('Sorry, that username already exists!'));
+ $errors->add( 'user_name', __( 'Sorry, that username already exists!' ) );
// Check if the email address has been used already.
if ( email_exists($user_email) )
- $errors->add('user_email', __('Sorry, that email address is already used!'));
+ $errors->add( 'user_email', __( 'Sorry, that email address is already used!' ) );
// Has someone already signed up for this username?
$signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE user_login = %s", $user_name) );
@@ -497,8 +493,8 @@ function wpmu_validate_user_signup($user_name, $user_email) {
$now = current_time( 'timestamp', true );
$diff = $now - $registered_at;
// If registered more than two days ago, cancel registration and let this signup go through.
- if ( $diff > 172800 )
- $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->signups WHERE user_login = %s", $user_name) );
+ if ( $diff > 2 * DAY_IN_SECONDS )
+ $wpdb->delete( $wpdb->signups, array( 'user_login' => $user_name ) );
else
$errors->add('user_name', __('That username is currently reserved but may be available in a couple of days.'));
@@ -510,8 +506,8 @@ function wpmu_validate_user_signup($user_name, $user_email) {
if ( $signup != null ) {
$diff = current_time( 'timestamp', true ) - mysql2date('U', $signup->registered);
// If registered more than two days ago, cancel registration and let this signup go through.
- if ( $diff > 172800 )
- $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->signups WHERE user_email = %s", $user_email) );
+ if ( $diff > 2 * DAY_IN_SECONDS )
+ $wpdb->delete( $wpdb->signups, array( 'user_email' => $user_email ) );
else
$errors->add('user_email', __('That email address has already been used. Please check your inbox for an activation email. It will become available in a couple of days if you do nothing.'));
}
@@ -544,7 +540,9 @@ function wpmu_validate_user_signup($user_name, $user_email) {
* @return array Contains the new site data and error messages.
*/
function wpmu_validate_blog_signup($blogname, $blog_title, $user = '') {
- global $wpdb, $domain, $base, $current_site;
+ global $wpdb, $domain, $current_site;
+
+ $base = $current_site->path;
$blog_title = strip_tags( $blog_title );
$blog_title = substr( $blog_title, 0, 50 );
@@ -561,16 +559,16 @@ function wpmu_validate_blog_signup($blogname, $blog_title, $user = '') {
$illegal_names = array_merge($illegal_names, apply_filters( 'subdirectory_reserved_names', array( 'page', 'comments', 'blog', 'files', 'feed' ) ) );
if ( empty( $blogname ) )
- $errors->add('blogname', __('Please enter a site name'));
+ $errors->add('blogname', __( 'Please enter a site name.' ) );
if ( preg_match( '/[^a-z0-9]+/', $blogname ) )
- $errors->add('blogname', __('Only lowercase letters and numbers allowed'));
+ $errors->add('blogname', __( 'Only lowercase letters (a-z) and numbers are allowed.' ) );
if ( in_array( $blogname, $illegal_names ) == true )
- $errors->add('blogname', __('That name is not allowed'));
+ $errors->add('blogname', __( 'That name is not allowed.' ) );
if ( strlen( $blogname ) < 4 && !is_super_admin() )
- $errors->add('blogname', __('Site name must be at least 4 characters'));
+ $errors->add('blogname', __( 'Site name must be at least 4 characters.' ) );
if ( strpos( ' ' . $blogname, '_' ) != false )
$errors->add( 'blogname', __( 'Sorry, site names may not contain the character “_”!' ) );
@@ -590,7 +588,7 @@ function wpmu_validate_blog_signup($blogname, $blog_title, $user = '') {
$blog_title = stripslashes( $blog_title );
if ( empty( $blog_title ) )
- $errors->add('blog_title', __('Please enter a site title'));
+ $errors->add('blog_title', __( 'Please enter a site title.' ) );
// Check if the domain/path has been used already.
if ( is_subdomain_install() ) {
@@ -600,8 +598,8 @@ function wpmu_validate_blog_signup($blogname, $blog_title, $user = '') {
$mydomain = "$domain";
$path = $base.$blogname.'/';
}
- if ( domain_exists($mydomain, $path) )
- $errors->add('blogname', __('Sorry, that site already exists!'));
+ if ( domain_exists($mydomain, $path, $current_site->id) )
+ $errors->add( 'blogname', __( 'Sorry, that site already exists!' ) );
if ( username_exists( $blogname ) ) {
if ( is_object( $user ) == false || ( is_object($user) && ( $user->user_login != $blogname ) ) )
@@ -613,13 +611,13 @@ function wpmu_validate_blog_signup($blogname, $blog_title, $user = '') {
if ( ! empty($signup) ) {
$diff = current_time( 'timestamp', true ) - mysql2date('U', $signup->registered);
// If registered more than two days ago, cancel registration and let this signup go through.
- if ( $diff > 172800 )
- $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->signups WHERE domain = %s AND path = %s", $mydomain, $path) );
+ if ( $diff > 2 * DAY_IN_SECONDS )
+ $wpdb->delete( $wpdb->signups, array( 'domain' => $mydomain , 'path' => $path ) );
else
$errors->add('blogname', __('That site is currently reserved but may be available in a couple days.'));
}
- $result = array('domain' => $mydomain, 'path' => $path, 'blogname' => $blogname, 'blog_title' => $blog_title, 'errors' => $errors);
+ $result = array('domain' => $mydomain, 'path' => $path, 'blogname' => $blogname, 'blog_title' => $blog_title, 'user' => $user, 'errors' => $errors);
return apply_filters('wpmu_validate_blog_signup', $result);
}
@@ -792,7 +790,7 @@ function wpmu_signup_user_notification($user, $user_email, $key, $meta = '') {
$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
$message = sprintf(
apply_filters( 'wpmu_signup_user_notification_email',
- __( "To activate your user, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login.\n\n" ),
+ __( "To activate your user, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login." ),
$user, $user_email, $key, $meta
),
site_url( "wp-activate.php?key=$key" )
@@ -845,7 +843,7 @@ function wpmu_activate_signup($key) {
return new WP_Error( 'already_active', __( 'The site is already active.' ), $signup );
}
- $meta = unserialize($signup->meta);
+ $meta = maybe_unserialize($signup->meta);
$user_login = $wpdb->escape($signup->user_login);
$user_email = $wpdb->escape($signup->user_email);
$password = wp_generate_password( 12, false );
@@ -880,7 +878,7 @@ function wpmu_activate_signup($key) {
// TODO: What to do if we create a user but cannot create a blog?
if ( is_wp_error($blog_id) ) {
// If blog is taken, that means a previous attempt to activate this blog failed in between creating the blog and
- // setting the activation flag. Let's just set the active flag and instruct the user to reset their password.
+ // setting the activation flag. Let's just set the active flag and instruct the user to reset their password.
if ( 'blog_taken' == $blog_id->get_error_code() ) {
$blog_id->add_data( $signup );
$wpdb->update( $wpdb->signups, array( 'active' => 1, 'activated' => $now ), array( 'activation_key' => $key ) );
@@ -967,7 +965,7 @@ function wpmu_create_blog($domain, $path, $title, $user_id, $meta = '', $site_id
// Check if the domain has been used already. We should return an error message.
if ( domain_exists($domain, $path, $site_id) )
- return new WP_Error('blog_taken', __('Site already exists.'));
+ return new WP_Error( 'blog_taken', __( 'Sorry, that site already exists!' ) );
if ( !defined('WP_INSTALLING') )
define( 'WP_INSTALLING', true );
@@ -1026,11 +1024,11 @@ function newblog_notify_siteadmin( $blog_id, $deprecated = '' ) {
$siteurl = site_url();
restore_current_blog();
- $msg = sprintf( __( 'New Site: %1s
-URL: %2s
-Remote IP: %3s
+ $msg = sprintf( __( 'New Site: %1$s
+URL: %2$s
+Remote IP: %3$s
-Disable these notifications: %4s' ), $blogname, $siteurl, $_SERVER['REMOTE_ADDR'], $options_site_url);
+Disable these notifications: %4$s' ), $blogname, $siteurl, $_SERVER['REMOTE_ADDR'], $options_site_url);
$msg = apply_filters( 'newblog_notify_siteadmin', $msg );
wp_mail( $email, sprintf( __( 'New Site Registration: %s' ), $siteurl ), $msg );
@@ -1044,6 +1042,7 @@ Disable these notifications: %4s' ), $blogname, $siteurl, $_SERVER['REMOTE_ADDR'
* the notification email.
*
* @since MU
+ * @uses apply_filters() Filter newuser_notify_siteadmin to change the content of the email message
*
* @param int $user_id The new user's ID.
* @return bool
@@ -1057,15 +1056,15 @@ function newuser_notify_siteadmin( $user_id ) {
if ( is_email($email) == false )
return false;
- $user = new WP_User($user_id);
+ $user = get_userdata( $user_id );
$options_site_url = esc_url(network_admin_url('settings.php'));
- $msg = sprintf(__('New User: %1s
-Remote IP: %2s
+ $msg = sprintf(__('New User: %1$s
+Remote IP: %2$s
-Disable these notifications: %3s'), $user->user_login, $_SERVER['REMOTE_ADDR'], $options_site_url);
+Disable these notifications: %3$s'), $user->user_login, $_SERVER['REMOTE_ADDR'], $options_site_url);
- $msg = apply_filters( 'newuser_notify_siteadmin', $msg );
+ $msg = apply_filters( 'newuser_notify_siteadmin', $msg, $user );
wp_mail( $email, sprintf(__('New User Registration: %s'), $user->user_login), $msg );
return true;
}
@@ -1085,7 +1084,8 @@ Disable these notifications: %3s'), $user->user_login, $_SERVER['REMOTE_ADDR'],
*/
function domain_exists($domain, $path, $site_id = 1) {
global $wpdb;
- return $wpdb->get_var( $wpdb->prepare("SELECT blog_id FROM $wpdb->blogs WHERE domain = %s AND path = %s AND site_id = %d", $domain, $path, $site_id) );
+ $result = $wpdb->get_var( $wpdb->prepare("SELECT blog_id FROM $wpdb->blogs WHERE domain = %s AND path = %s AND site_id = %d", $domain, $path, $site_id) );
+ return apply_filters( 'domain_exists', $result, $domain, $path, $site_id );
}
/**
@@ -1130,20 +1130,19 @@ function insert_blog($domain, $path, $site_id) {
* @param string $blog_title The title of the new site.
*/
function install_blog($blog_id, $blog_title = '') {
- global $wpdb, $table_prefix, $wp_roles;
- $wpdb->suppress_errors();
+ global $wpdb, $wp_roles, $current_site;
// Cast for security
$blog_id = (int) $blog_id;
require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
- if ( $wpdb->get_results("SELECT ID FROM $wpdb->posts") )
- die(__('Already Installed
You appear to have already installed WordPress. To reinstall please clear your old database tables first.
') . '