X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/febc815b2c9d85be5717da9e8d164bd2daa97e31..16e7b37c7914d753890c1a05a9335f3b43751eb8:/wp-includes/ms-functions.php diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php index 3f5ee2c9..2e9ca946 100644 --- a/wp-includes/ms-functions.php +++ b/wp-includes/ms-functions.php @@ -53,9 +53,9 @@ function get_active_blog_for_user( $user_id ) { if ( false !== $primary_blog ) { if ( ! isset( $blogs[ $primary_blog ] ) ) { update_user_meta( $user_id, 'primary_blog', $first_blog->userblog_id ); - $primary = get_blog_details( $first_blog->userblog_id ); + $primary = get_site( $first_blog->userblog_id ); } else { - $primary = get_blog_details( $primary_blog ); + $primary = get_site( $primary_blog ); } } else { //TODO Review this call to add_user_to_blog too - to get here the user must have a role on this blog? @@ -71,7 +71,7 @@ function get_active_blog_for_user( $user_id ) { foreach ( (array) $blogs as $blog_id => $blog ) { if ( $blog->site_id != $wpdb->siteid ) continue; - $details = get_blog_details( $blog_id ); + $details = get_site( $blog_id ); if ( is_object( $details ) && $details->archived == 0 && $details->spam == 0 && $details->deleted == 0 ) { $ret = $blog; if ( get_user_meta( $user_id , 'primary_blog', true ) != $blog_id ) @@ -161,8 +161,8 @@ function add_user_to_blog( $blog_id, $user_id, $role ) { if ( !get_user_meta($user_id, 'primary_blog', true) ) { update_user_meta($user_id, 'primary_blog', $blog_id); - $details = get_blog_details($blog_id); - update_user_meta($user_id, 'source_domain', $details->domain); + $site = get_site( $blog_id ); + update_user_meta( $user_id, 'source_domain', $site->domain ); } $user->set_role($role); @@ -546,8 +546,8 @@ function wpmu_validate_user_signup($user_name, $user_email) { function wpmu_validate_blog_signup( $blogname, $blog_title, $user = '' ) { global $wpdb, $domain; - $current_site = get_current_site(); - $base = $current_site->path; + $current_network = get_network(); + $base = $current_network->path; $blog_title = strip_tags( $blog_title ); @@ -580,7 +580,7 @@ function wpmu_validate_blog_signup( $blogname, $blog_title, $user = '' ) { $errors->add('blogname', __( 'Site name must be at least 4 characters.' ) ); // do not allow users to create a blog that conflicts with a page on the main blog. - if ( !is_subdomain_install() && $wpdb->get_var( $wpdb->prepare( "SELECT post_name FROM " . $wpdb->get_blog_prefix( $current_site->blog_id ) . "posts WHERE post_type = 'page' AND post_name = %s", $blogname ) ) ) + if ( !is_subdomain_install() && $wpdb->get_var( $wpdb->prepare( "SELECT post_name FROM " . $wpdb->get_blog_prefix( $current_network->site_id ) . "posts WHERE post_type = 'page' AND post_name = %s", $blogname ) ) ) $errors->add( 'blogname', __( 'Sorry, you may not use that site name.' ) ); // all numeric? @@ -612,7 +612,7 @@ function wpmu_validate_blog_signup( $blogname, $blog_title, $user = '' ) { $mydomain = "$domain"; $path = $base.$blogname.'/'; } - if ( domain_exists($mydomain, $path, $current_site->id) ) + if ( domain_exists($mydomain, $path, $current_network->id) ) $errors->add( 'blogname', __( 'Sorry, that site already exists!' ) ); if ( username_exists( $blogname ) ) { @@ -669,7 +669,7 @@ function wpmu_validate_blog_signup( $blogname, $blog_title, $user = '' ) { function wpmu_signup_blog( $domain, $path, $title, $user, $user_email, $meta = array() ) { global $wpdb; - $key = substr( md5( time() . wp_rand() . $domain ), 0, 16 ); + $key = substr( md5( time() . rand() . $domain ), 0, 16 ); $meta = serialize($meta); $wpdb->insert( $wpdb->signups, array( @@ -719,7 +719,7 @@ function wpmu_signup_user( $user, $user_email, $meta = array() ) { // Format data $user = preg_replace( '/\s+/', '', sanitize_user( $user, true ) ); $user_email = sanitize_email( $user_email ); - $key = substr( md5( time() . wp_rand() . $user_email ), 0, 16 ); + $key = substr( md5( time() . rand() . $user_email ), 0, 16 ); $meta = serialize($meta); $wpdb->insert( $wpdb->signups, array( @@ -764,13 +764,13 @@ function wpmu_signup_user( $user, $user_email, $meta = array() ) { * @param string $domain The new blog domain. * @param string $path The new blog path. * @param string $title The site title. - * @param string $user The user's login name. + * @param string $user_login The user's login name. * @param string $user_email The user's email address. * @param string $key The activation key created in wpmu_signup_blog() * @param array $meta By default, contains the requested privacy setting and lang_id. * @return bool */ -function wpmu_signup_blog_notification( $domain, $path, $title, $user, $user_email, $key, $meta = array() ) { +function wpmu_signup_blog_notification( $domain, $path, $title, $user_login, $user_email, $key, $meta = array() ) { /** * Filters whether to bypass the new site email notification. * @@ -779,17 +779,17 @@ function wpmu_signup_blog_notification( $domain, $path, $title, $user, $user_ema * @param string|bool $domain Site domain. * @param string $path Site path. * @param string $title Site title. - * @param string $user User login name. + * @param string $user_login User login name. * @param string $user_email User email address. * @param string $key Activation key created in wpmu_signup_blog(). * @param array $meta By default, contains the requested privacy setting and lang_id. */ - if ( ! apply_filters( 'wpmu_signup_blog_notification', $domain, $path, $title, $user, $user_email, $key, $meta ) ) { + if ( ! apply_filters( 'wpmu_signup_blog_notification', $domain, $path, $title, $user_login, $user_email, $key, $meta ) ) { return false; } // Send email with activation link. - if ( !is_subdomain_install() || get_current_site()->id != 1 ) + if ( !is_subdomain_install() || get_current_network_id() != 1 ) $activate_url = network_site_url("wp-activate.php?key=$key"); else $activate_url = "http://{$domain}{$path}wp-activate.php?key=$key"; // @todo use *_url() API @@ -800,6 +800,10 @@ function wpmu_signup_blog_notification( $domain, $path, $title, $user, $user_ema $admin_email = 'support@' . $_SERVER['SERVER_NAME']; $from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) ); $message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n"; + + $user = get_user_by( 'login', $user_login ); + $switched_locale = switch_to_locale( get_user_locale( $user ) ); + $message = sprintf( /** * Filters the message content of the new blog notification email. @@ -812,14 +816,14 @@ function wpmu_signup_blog_notification( $domain, $path, $title, $user, $user_ema * @param string $domain Site domain. * @param string $path Site path. * @param string $title Site title. - * @param string $user User login name. + * @param string $user_login User login name. * @param string $user_email User email address. * @param string $key Activation key created in wpmu_signup_blog(). * @param array $meta By default, contains the requested privacy setting and lang_id. */ apply_filters( 'wpmu_signup_blog_notification_email', __( "To activate your blog, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login.\n\nAfter you activate, you can visit your site here:\n\n%s" ), - $domain, $path, $title, $user, $user_email, $key, $meta + $domain, $path, $title, $user_login, $user_email, $key, $meta ), $activate_url, esc_url( "http://{$domain}{$path}" ), @@ -836,19 +840,25 @@ function wpmu_signup_blog_notification( $domain, $path, $title, $user, $user_ema * @param string $domain Site domain. * @param string $path Site path. * @param string $title Site title. - * @param string $user User login name. + * @param string $user_login User login name. * @param string $user_email User email address. * @param string $key Activation key created in wpmu_signup_blog(). * @param array $meta By default, contains the requested privacy setting and lang_id. */ apply_filters( 'wpmu_signup_blog_notification_subject', - __( '[%1$s] Activate %2$s' ), - $domain, $path, $title, $user, $user_email, $key, $meta + /* translators: New site notification email subject. 1: Network name, 2: New site URL */ + _x( '[%1$s] Activate %2$s', 'New site notification email subject' ), + $domain, $path, $title, $user_login, $user_email, $key, $meta ), $from_name, esc_url( 'http://' . $domain . $path ) ); wp_mail( $user_email, wp_specialchars_decode( $subject ), $message, $message_headers ); + + if ( $switched_locale ) { + restore_previous_locale(); + } + return true; } @@ -867,26 +877,29 @@ function wpmu_signup_blog_notification( $domain, $path, $title, $user, $user_ema * * @since MU * - * @param string $user The user's login name. + * @param string $user_login The user's login name. * @param string $user_email The user's email address. * @param string $key The activation key created in wpmu_signup_user() * @param array $meta By default, an empty array. * @return bool */ -function wpmu_signup_user_notification( $user, $user_email, $key, $meta = array() ) { +function wpmu_signup_user_notification( $user_login, $user_email, $key, $meta = array() ) { /** * Filters whether to bypass the email notification for new user sign-up. * * @since MU * - * @param string $user User login name. + * @param string $user_login User login name. * @param string $user_email User email address. * @param string $key Activation key created in wpmu_signup_user(). * @param array $meta Signup meta data. */ - if ( ! apply_filters( 'wpmu_signup_user_notification', $user, $user_email, $key, $meta ) ) + if ( ! apply_filters( 'wpmu_signup_user_notification', $user_login, $user_email, $key, $meta ) ) return false; + $user = get_user_by( 'login', $user_login ); + $switched_locale = switch_to_locale( get_user_locale( $user ) ); + // Send email with activation link. $admin_email = get_site_option( 'admin_email' ); if ( $admin_email == '' ) @@ -902,14 +915,14 @@ function wpmu_signup_user_notification( $user, $user_email, $key, $meta = array( * @since MU * * @param string $content Content of the notification email. - * @param string $user User login name. + * @param string $user_login User login name. * @param string $user_email User email address. * @param string $key Activation key created in wpmu_signup_user(). * @param array $meta Signup meta data. */ 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." ), - $user, $user_email, $key, $meta + $user_login, $user_email, $key, $meta ), site_url( "wp-activate.php?key=$key" ) ); @@ -921,19 +934,25 @@ function wpmu_signup_user_notification( $user, $user_email, $key, $meta = array( * @since MU * * @param string $subject Subject of the notification email. - * @param string $user User login name. + * @param string $user_login User login name. * @param string $user_email User email address. * @param string $key Activation key created in wpmu_signup_user(). * @param array $meta Signup meta data. */ apply_filters( 'wpmu_signup_user_notification_subject', - __( '[%1$s] Activate %2$s' ), - $user, $user_email, $key, $meta + /* translators: New user notification email subject. 1: Network name, 2: New user login */ + _x( '[%1$s] Activate %2$s', 'New user notification email subject' ), + $user_login, $user_email, $key, $meta ), $from_name, - $user + $user_login ); wp_mail( $user_email, wp_specialchars_decode( $subject ), $message, $message_headers ); + + if ( $switched_locale ) { + restore_previous_locale(); + } + return true; } @@ -1092,7 +1111,10 @@ function wpmu_create_user( $user_name, $password, $email ) { * @return int|WP_Error Returns WP_Error object on failure, int $blog_id on success */ function wpmu_create_blog( $domain, $path, $title, $user_id, $meta = array(), $site_id = 1 ) { - $defaults = array( 'public' => 0 ); + $defaults = array( + 'public' => 0, + 'WPLANG' => get_site_option( 'WPLANG' ), + ); $meta = wp_parse_args( $meta, $defaults ); $domain = preg_replace( '/\s+/', '', sanitize_user( $domain, true ) ); @@ -1130,7 +1152,6 @@ function wpmu_create_blog( $domain, $path, $title, $user_id, $meta = array(), $s update_option( $key, $value ); } - add_option( 'WPLANG', get_site_option( 'WPLANG' ) ); update_option( 'blog_public', (int) $meta['public'] ); if ( ! is_super_admin( $user_id ) && ! get_user_meta( $user_id, 'primary_blog', true ) ) @@ -1183,6 +1204,7 @@ function newblog_notify_siteadmin( $blog_id, $deprecated = '' ) { $siteurl = site_url(); restore_current_blog(); + /* translators: New site notification email. 1: Site URL, 2: User IP address, 3: Settings screen URL */ $msg = sprintf( __( 'New Site: %1$s URL: %2$s Remote IP: %3$s @@ -1225,6 +1247,7 @@ function newuser_notify_siteadmin( $user_id ) { $user = get_userdata( $user_id ); $options_site_url = esc_url(network_admin_url('settings.php')); + /* translators: New user notification email. 1: User login, 2: User IP address, 3: Settings screen URL */ $msg = sprintf(__('New User: %1$s Remote IP: %2$s @@ -1332,7 +1355,7 @@ 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, $wp_roles, $current_site; + global $wpdb, $wp_roles; // Cast for security $blog_id = (int) $blog_id; @@ -1361,7 +1384,7 @@ function install_blog( $blog_id, $blog_title = '' ) { if ( 'https' === parse_url( get_site_option( 'siteurl' ), PHP_URL_SCHEME ) ) { $siteurl = set_url_scheme( $siteurl, 'https' ); } - if ( 'https' === parse_url( get_home_url( $current_site->blog_id ), PHP_URL_SCHEME ) ) { + if ( 'https' === parse_url( get_home_url( get_network()->site_id ), PHP_URL_SCHEME ) ) { $home = set_url_scheme( $home, 'https' ); } @@ -1373,7 +1396,7 @@ function install_blog( $blog_id, $blog_title = '' ) { if ( get_site_option( 'ms_files_rewriting' ) ) update_option( 'upload_path', UPLOADBLOGSDIR . "/$blog_id/files" ); else - update_option( 'upload_path', get_blog_option( get_current_site()->blog_id, 'upload_path' ) ); + update_option( 'upload_path', get_blog_option( get_network()->site_id, 'upload_path' ) ); update_option( 'blogname', wp_unslash( $blog_title ) ); update_option( 'admin_email', '' ); @@ -1428,7 +1451,7 @@ function install_blog_defaults($blog_id, $user_id) { * @return bool */ function wpmu_welcome_notification( $blog_id, $user_id, $password, $title, $meta = array() ) { - $current_site = get_current_site(); + $current_network = get_network(); /** * Filters whether to bypass the welcome email after site activation. @@ -1446,6 +1469,10 @@ function wpmu_welcome_notification( $blog_id, $user_id, $password, $title, $meta if ( ! apply_filters( 'wpmu_welcome_notification', $blog_id, $user_id, $password, $title, $meta ) ) return false; + $user = get_userdata( $user_id ); + + $switched_locale = switch_to_locale( get_user_locale( $user ) ); + $welcome_email = get_site_option( 'welcome_email' ); if ( $welcome_email == false ) { /* translators: Do not translate USERNAME, SITE_NAME, BLOG_URL, PASSWORD: those are placeholders. */ @@ -1466,9 +1493,8 @@ We hope you enjoy your new site. Thanks! } $url = get_blogaddress_by_id($blog_id); - $user = get_userdata( $user_id ); - $welcome_email = str_replace( 'SITE_NAME', $current_site->site_name, $welcome_email ); + $welcome_email = str_replace( 'SITE_NAME', $current_network->site_name, $welcome_email ); $welcome_email = str_replace( 'BLOG_TITLE', $title, $welcome_email ); $welcome_email = str_replace( 'BLOG_URL', $url, $welcome_email ); $welcome_email = str_replace( 'USERNAME', $user->user_login, $welcome_email ); @@ -1498,8 +1524,11 @@ We hope you enjoy your new site. Thanks! $message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n"; $message = $welcome_email; - if ( empty( $current_site->site_name ) ) - $current_site->site_name = 'WordPress'; + if ( empty( $current_network->site_name ) ) + $current_network->site_name = 'WordPress'; + + /* translators: New site notification email subject. 1: Network name, 2: New site name */ + $subject = __( 'New %1$s Site: %2$s' ); /** * Filters the subject of the welcome email after site activation. @@ -1508,8 +1537,13 @@ We hope you enjoy your new site. Thanks! * * @param string $subject Subject of the email. */ - $subject = apply_filters( 'update_welcome_subject', sprintf( __( 'New %1$s Site: %2$s' ), $current_site->site_name, wp_unslash( $title ) ) ); + $subject = apply_filters( 'update_welcome_subject', sprintf( $subject, $current_network->site_name, wp_unslash( $title ) ) ); wp_mail( $user->user_email, wp_specialchars_decode( $subject ), $message, $message_headers ); + + if ( $switched_locale ) { + restore_previous_locale(); + } + return true; } @@ -1529,7 +1563,7 @@ We hope you enjoy your new site. Thanks! * @return bool */ function wpmu_welcome_user_notification( $user_id, $password, $meta = array() ) { - $current_site = get_current_site(); + $current_network = get_network(); /** * Filters whether to bypass the welcome email after user activation. @@ -1549,6 +1583,8 @@ function wpmu_welcome_user_notification( $user_id, $password, $meta = array() ) $user = get_userdata( $user_id ); + $switched_locale = switch_to_locale( get_user_locale( $user ) ); + /** * Filters the content of the welcome email after user activation. * @@ -1562,7 +1598,7 @@ function wpmu_welcome_user_notification( $user_id, $password, $meta = array() ) * @param array $meta Signup meta data. */ $welcome_email = apply_filters( 'update_welcome_user_email', $welcome_email, $user_id, $password, $meta ); - $welcome_email = str_replace( 'SITE_NAME', $current_site->site_name, $welcome_email ); + $welcome_email = str_replace( 'SITE_NAME', $current_network->site_name, $welcome_email ); $welcome_email = str_replace( 'USERNAME', $user->user_login, $welcome_email ); $welcome_email = str_replace( 'PASSWORD', $password, $welcome_email ); $welcome_email = str_replace( 'LOGINLINK', wp_login_url(), $welcome_email ); @@ -1576,8 +1612,11 @@ function wpmu_welcome_user_notification( $user_id, $password, $meta = array() ) $message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n"; $message = $welcome_email; - if ( empty( $current_site->site_name ) ) - $current_site->site_name = 'WordPress'; + if ( empty( $current_network->site_name ) ) + $current_network->site_name = 'WordPress'; + + /* translators: New user notification email subject. 1: Network name, 2: New user login */ + $subject = __( 'New %1$s User: %2$s' ); /** * Filters the subject of the welcome email after user activation. @@ -1586,8 +1625,13 @@ function wpmu_welcome_user_notification( $user_id, $password, $meta = array() ) * * @param string $subject Subject of the email. */ - $subject = apply_filters( 'update_welcome_user_subject', sprintf( __( 'New %1$s User: %2$s' ), $current_site->site_name, $user->user_login) ); + $subject = apply_filters( 'update_welcome_user_subject', sprintf( $subject, $current_network->site_name, $user->user_login) ); wp_mail( $user->user_email, wp_specialchars_decode( $subject ), $message, $message_headers ); + + if ( $switched_locale ) { + restore_previous_locale(); + } + return true; } @@ -1760,8 +1804,8 @@ function check_upload_mimes( $mimes ) { * * WordPress MS stores a blog's post count as an option so as * to avoid extraneous COUNTs when a blog's details are fetched - * with get_blog_details(). This function is called when posts - * are published or unpublished to make sure the count stays current. + * with get_site(). This function is called when posts are published + * or unpublished to make sure the count stays current. * * @since MU * @@ -1875,7 +1919,7 @@ function global_terms( $term_id, $deprecated = '' ) { * @return array The current site's domain */ function redirect_this_site( $deprecated = '' ) { - return array( get_current_site()->domain ); + return array( get_network()->domain ); } /** @@ -1985,15 +2029,12 @@ function maybe_add_existing_user_to_blog() { * * @since MU * - * @global int $blog_id - * * @param array $details * @return true|WP_Error|void */ function add_existing_user_to_blog( $details = false ) { - global $blog_id; - if ( is_array( $details ) ) { + $blog_id = get_current_blog_id(); $result = add_user_to_blog( $blog_id, $details[ 'user_id' ], $details[ 'role' ] ); /** * Fires immediately after an existing user is added to a site. @@ -2025,7 +2066,7 @@ function add_new_user_to_blog( $user_id, $password, $meta ) { if ( !empty( $meta[ 'add_to_blog' ] ) ) { $blog_id = $meta[ 'add_to_blog' ]; $role = $meta[ 'new_role' ]; - remove_user_from_blog($user_id, get_current_site()->blog_id); // remove user from main blog. + remove_user_from_blog($user_id, get_network()->site_id); // remove user from main blog. add_user_to_blog( $blog_id, $user_id, $role ); update_user_meta( $user_id, 'primary_blog', $blog_id ); } @@ -2039,7 +2080,7 @@ function add_new_user_to_blog( $user_id, $password, $meta ) { * @param PHPMailer $phpmailer The PHPMailer instance, passed by reference. */ function fix_phpmailer_messageid( $phpmailer ) { - $phpmailer->Hostname = get_current_site()->domain; + $phpmailer->Hostname = get_network()->domain; } /**