+ + 'WPLANG', + 'id' => 'site-language', + 'selected' => $lang, + 'languages' => $languages, + 'show_available_translations' => false, + ) ); + ?> +
+ +@@ -153,8 +193,6 @@ function show_blog_form( $blogname = '', $blog_title = '', $errors = '' ) { * * @since MU * - * @uses wp_get_current_user() to retrieve the current user - * @uses wpmu_validate_blog_signup() to validate new site signup for the current user * @return array Contains the new site data and error messages. */ function validate_blog_form() { @@ -188,7 +226,7 @@ function show_user_form($user_name = '', $user_email = '', $errors = '') { get_error_message('user_email') ) { ?>
-+
get_error_message('generic') ) { echo '
' . $errmsg . '
'; @@ -208,7 +246,6 @@ function show_user_form($user_name = '', $user_email = '', $errors = '') { * * @since MU * - * @uses wpmu_validate_user_signup() to retrieve an array of user data * @return array Contains username, email, and error messages. */ function validate_user_form() { @@ -220,7 +257,6 @@ function validate_user_form() { * * @since MU * - * @uses wp_get_current_user() to get the current user * @param string $blogname The new site name * @param string $blog_title The new blog title * @param array $errors @@ -303,19 +339,24 @@ function signup_another_blog( $blogname = '', $blog_title = '', $errors = '' ) { * * @since MU * - * @uses wp_get_current_user() to retrieve the current user - * @uses wpmu_create_blog() to add a new site - * @uses confirm_another_blog_signup() to confirm the user's new site signup - * @return bool True if blog signup was validated, false if error + * @return null|bool True if blog signup was validated, false if error. + * The function halts all execution if the user is not logged in. */ function validate_another_blog_signup() { global $wpdb, $blogname, $blog_title, $errors, $domain, $path; $current_user = wp_get_current_user(); - if ( !is_user_logged_in() ) + if ( ! is_user_logged_in() ) { die(); + } $result = validate_blog_form(); - extract($result); + + // Extracted values set/overwrite globals. + $domain = $result['domain']; + $path = $result['path']; + $blogname = $result['blogname']; + $blog_title = $result['blog_title']; + $errors = $result['errors']; if ( $errors->get_error_code() ) { signup_another_blog($blogname, $blog_title, $errors); @@ -329,6 +370,21 @@ function validate_another_blog_signup() { 'public' => $public ); + // Handle the language setting for the new site. + if ( ! empty( $_POST['WPLANG'] ) ) { + + $languages = signup_get_available_languages(); + + if ( in_array( $_POST['WPLANG'], $languages ) ) { + $language = wp_unslash( sanitize_text_field( $_POST['WPLANG'] ) ); + + if ( $language ) { + $blog_meta_defaults['WPLANG'] = $language; + } + } + + } + /** * Filter the new site meta variables. * @@ -337,7 +393,8 @@ function validate_another_blog_signup() { * * @param array $blog_meta_defaults An array of default blog meta variables. */ - $meta = apply_filters( 'signup_create_blog_meta', $blog_meta_defaults ); + $meta_defaults = apply_filters( 'signup_create_blog_meta', $blog_meta_defaults ); + /** * Filter the new default site meta variables. * @@ -350,10 +407,15 @@ function validate_another_blog_signup() { * @type int $blog_public Whether search engines should be discouraged from indexing the site. 1 for true, 0 for false. * } */ - $meta = apply_filters( 'add_signup_meta', $meta ); + $meta = apply_filters( 'add_signup_meta', $meta_defaults ); - wpmu_create_blog( $domain, $path, $blog_title, $current_user->ID, $meta, $wpdb->siteid ); - confirm_another_blog_signup($domain, $path, $blog_title, $current_user->user_login, $current_user->user_email, $meta); + $blog_id = wpmu_create_blog( $domain, $path, $blog_title, $current_user->ID, $meta, $wpdb->siteid ); + + if ( is_wp_error( $blog_id ) ) { + return false; + } + + confirm_another_blog_signup( $domain, $path, $blog_title, $current_user->user_login, $current_user->user_email, $meta, $blog_id ); return true; } @@ -361,18 +423,43 @@ function validate_another_blog_signup() { * Confirm a new site signup * * @since MU + * @since 4.4.0 Added the `$blog_id` parameter. * * @param string $domain The domain URL * @param string $path The site root path + * @param string $blog_title The blog title * @param string $user_name The username * @param string $user_email The user's email address - * @param array $meta Any additional meta from the 'add_signup_meta' filter in validate_blog_signup() + * @param array $meta Any additional meta from the 'add_signup_meta' filter in validate_blog_signup() + * @param int $blog_id The blog ID */ -function confirm_another_blog_signup( $domain, $path, $blog_title, $user_name, $user_email = '', $meta = array() ) { +function confirm_another_blog_signup( $domain, $path, $blog_title, $user_name, $user_email = '', $meta = array(), $blog_id = 0 ) { + + if ( $blog_id ) { + switch_to_blog( $blog_id ); + $home_url = home_url( '/' ); + $login_url = wp_login_url(); + restore_current_blog(); + } else { + $home_url = 'http://' . $domain . $path; + $login_url = 'http://' . $domain . $path . 'wp-login.php'; + } + + $site = sprintf( '%2$s', + esc_url( $home_url ), + $blog_title + ); + ?> -{$blog_title}" ) ?>
+- http://%2$s is your new site. Log in as “%4$s” using your existing password.' ), $domain.$path, $domain.$path, "http://" . $domain.$path . "wp-login.php", $user_name ) ?> + %2$s is your new site. Log in as “%4$s” using your existing password.' ), + esc_url( $home_url ), + untrailingslashit( $domain . $path ), + esc_url( $login_url ), + $user_name + ); ?>