'; + echo '' . $current_network->domain . $current_network->path . '
'; else - echo '.' . ( $site_domain = preg_replace( '|^www\.|', '', $current_site->domain ) ) . '
'; - - if ( !is_user_logged_in() ) { - if ( !is_subdomain_install() ) - $site = $current_site->domain . $current_site->path . __( 'sitename' ); - else - $site = __( 'domain' ) . '.' . $site_domain . $current_site->path; - echo '
(' . sprintf( __('Your address will be %s.'), $site ) . ') ' . __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed, so choose carefully!' ) . '
'; + echo '.' . ( $site_domain = preg_replace( '|^www\.|', '', $current_network->domain ) ) . ''; + + if ( ! is_user_logged_in() ) { + if ( ! is_subdomain_install() ) { + $site = $current_network->domain . $current_network->path . __( 'sitename' ); + } else { + $site = __( 'domain' ) . '.' . $site_domain . $current_network->path; + } + + /* translators: %s: site address */ + echo '
(' . sprintf( __( 'Your address will be %s.' ), $site ) . ') ' . __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed, so choose carefully!' ) . '
'; } // Blog Title @@ -121,6 +136,38 @@ function show_blog_form($blogname = '', $blog_title = '', $errors = '') { echo ''; ?> + ++ + 'WPLANG', + 'id' => 'site-language', + 'selected' => $lang, + 'languages' => $languages, + 'show_available_translations' => false, + ) ); + ?> +
+ +@@ -143,7 +190,7 @@ function show_blog_form($blogname = '', $blog_title = '', $errors = '') { * * @since 3.0.0 * - * @param array $errors An array possibly containing 'blogname' or 'blog_title' errors. + * @param WP_Error $errors A WP_Error object possibly containing 'blogname' or 'blog_title' errors. */ do_action( 'signup_blogform', $errors ); } @@ -153,8 +200,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() { @@ -170,17 +215,21 @@ function validate_blog_form() { * * @since MU * - * @param string $user_name The entered username - * @param string $user_email The entered email address - * @param array $errors + * @param string $user_name The entered username. + * @param string $user_email The entered email address. + * @param WP_Error|string $errors A WP_Error object containing existing errors. Defaults to empty string. */ function show_user_form($user_name = '', $user_email = '', $errors = '') { + if ( ! is_wp_error( $errors ) ) { + $errors = new WP_Error(); + } + // User name echo ''; if ( $errmsg = $errors->get_error_message('user_name') ) { echo '
'.$errmsg.'
'; } - echo ''; + echo '
'; _e( '(Must be at least 4 characters, letters and numbers only.)' ); ?> @@ -188,7 +237,7 @@ function show_user_form($user_name = '', $user_email = '', $errors = '') { get_error_message('user_email') ) { ?> -
+
get_error_message('generic') ) { echo '
' . $errmsg . '
'; @@ -198,7 +247,7 @@ function show_user_form($user_name = '', $user_email = '', $errors = '') { * * @since 3.0.0 * - * @param array $errors An array possibly containing 'user_name' or 'user_email' errors. + * @param WP_Error $errors A WP_Error object containing containing 'user_name' or 'user_email' errors. */ do_action( 'signup_extra_fields', $errors ); } @@ -208,7 +257,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,13 +268,11 @@ 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 + * @param string $blogname The new site name + * @param string $blog_title The new site title. + * @param WP_Error|string $errors A WP_Error object containing existing errors. Defaults to empty string. */ -function signup_another_blog($blogname = '', $blog_title = '', $errors = '') { - global $current_site; +function signup_another_blog( $blogname = '', $blog_title = '', $errors = '' ) { $current_user = wp_get_current_user(); if ( ! is_wp_error($errors) ) { @@ -240,16 +286,16 @@ function signup_another_blog($blogname = '', $blog_title = '', $errors = '') { ); /** - * Filter the default site sign-up variables. + * Filters the default site sign-up variables. * * @since 3.0.0 * * @param array $signup_defaults { * An array of default site sign-up variables. * - * @type string $blogname The site blogname. - * @type string $blog_title The site title. - * @type array $errors An array possibly containing 'blogname' or 'blog_title' errors. + * @type string $blogname The site blogname. + * @type string $blog_title The site title. + * @type WP_Error $errors A WP_Error object possibly containing 'blogname' or 'blog_title' errors. * } */ $filtered_results = apply_filters( 'signup_another_blog_init', $signup_defaults ); @@ -258,7 +304,7 @@ function signup_another_blog($blogname = '', $blog_title = '', $errors = '') { $blog_title = $filtered_results['blog_title']; $errors = $filtered_results['errors']; - echo '' . sprintf( __( 'Get another %s site in seconds' ), $current_site->site_name ) . '
'; + echo '' . sprintf( __( 'Get another %s site in seconds' ), get_network()->site_name ) . '
'; if ( $errors->get_error_code() ) { echo '' . __( 'There was a problem, please correct the form below and try again.' ) . '
'; @@ -300,23 +346,28 @@ function signup_another_blog($blogname = '', $blog_title = '', $errors = '') { } /** - * Validate a new blog signup + * Validate a new site signup. * * @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 site 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); @@ -330,17 +381,35 @@ 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. + * Filters the new site meta variables. + * + * Use the {@see 'add_signup_meta'} filter instead. * * @since MU - * @deprecated 3.0.0 Use the 'add_signup_meta' filter instead. + * @deprecated 3.0.0 Use the {@see 'add_signup_meta'} filter instead. * * @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. + * Filters the new default site meta variables. * * @since 3.0.0 * @@ -351,29 +420,63 @@ 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; } /** - * Confirm a new site signup + * Confirm a new site signup. * * @since MU - * - * @param string $domain The domain URL - * @param string $path The site root path - * @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() + * @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 site title. + * @param string $user_name The username. + * @param string $user_email The user's email address. + * @param array $meta Any additional meta from the {@see 'add_signup_meta'} filter in validate_blog_signup(). + * @param int $blog_id The site 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 + ); ?>
-site_name ) ?>
-' . __( 'The site you were looking for, %s, does not exist, but you can create it now!' ) . '
', $newblog ); + /* translators: %s: site address */ + printf( '' . __( 'The site you were looking for, %s, does not exist, but you can create it now!' ) . '
', + '' . $newblog . '' + ); else - printf( '' . __( 'The site you were looking for, %s, does not exist.' ) . '
', $newblog ); + /* translators: %s: site address */ + printf( '' . __( 'The site you were looking for, %s, does not exist.' ) . '
', + '' . $newblog . '' + ); } break; } @@ -733,4 +900,4 @@ if ( $active_signup == 'none' ) { */ do_action( 'after_signup_form' ); ?> - +