+ + 'WPLANG', + 'id' => 'site-language', + 'selected' => $lang, + 'languages' => $languages, + 'show_available_translations' => false, + ) ); + ?> +
+ +@@ -218,7 +258,7 @@ function validate_user_form() { * @since MU * * @param string $blogname The new site name - * @param string $blog_title The new blog title + * @param string $blog_title The new site title. * @param array $errors */ function signup_another_blog( $blogname = '', $blog_title = '', $errors = '' ) { @@ -295,12 +335,12 @@ function signup_another_blog( $blogname = '', $blog_title = '', $errors = '' ) { } /** - * Validate a new blog signup + * Validate a new site signup. * * @since MU * - * @return null|boolean True if blog signup was validated, false if error. - * The function halts all execution if the user is not logged in. + * @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; @@ -330,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. * @@ -339,6 +394,7 @@ function validate_another_blog_signup() { * @param array $blog_meta_defaults An array of default blog meta variables. */ $meta_defaults = apply_filters( 'signup_create_blog_meta', $blog_meta_defaults ); + /** * Filter the new default site meta variables. * @@ -353,27 +409,57 @@ function validate_another_blog_signup() { */ $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 '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 + ); ?>
- +you must activate it.' ) ?>
-%s and click the link given.' ), $user_email ); ?>
+' . $user_email . '' ); ?>
1, '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 ) { + $signup_meta['WPLANG'] = $language; + } + } + + } + /** This filter is documented in wp-signup.php */ $meta = apply_filters( 'add_signup_meta', $signup_meta ); @@ -623,10 +726,12 @@ function validate_blog_signup() { */ function confirm_blog_signup( $domain, $path, $blog_title, $user_name = '', $user_email = '', $meta = array() ) { ?> -{$blog_title}" ) ?>
+{$blog_title}" ) ?>
you must activate it.' ) ?>
-%s and click the link given.' ), $user_email) ?>
+' . $user_email . '' ); ?>
@@ -642,6 +747,39 @@ function confirm_blog_signup( $domain, $path, $blog_title, $user_name = '', $use do_action( 'signup_finished' ); } +/** + * Retrieves languages available during the site/user signup process. + * + * @since 4.4.0 + * + * @see get_available_languages() + * + * @return array List of available languages. + */ +function signup_get_available_languages() { + /** + * Filter the list of available languages for front-end site signups. + * + * Passing an empty array to this hook will disable output of the setting on the + * signup form, and the default language will be used when creating the site. + * + * Languages not already installed will be stripped. + * + * @since 4.4.0 + * + * @param array $available_languages Available languages. + */ + $languages = (array) apply_filters( 'signup_get_available_languages', get_available_languages() ); + + /* + * Strip any non-installed languages and return. + * + * Re-call get_available_languages() here in case a language pack was installed + * in a callback hooked to the 'signup_get_available_languages' filter before this point. + */ + return array_intersect_assoc( $languages, get_available_languages() ); +} + // Main $active_signup = get_site_option( 'registration', 'none' ); /** @@ -669,7 +807,7 @@ $current_user = wp_get_current_user(); if ( $active_signup == 'none' ) { _e( 'Registration has been disabled.' ); } elseif ( $active_signup == 'blog' && !is_user_logged_in() ) { - $login_url = site_url( 'wp-login.php?redirect_to=' . urlencode( network_site_url( 'wp-signup.php' ) ) ); + $login_url = wp_login_url( network_site_url( 'wp-signup.php' ) ); echo sprintf( __( 'You must first log in, and then you can create a new site.' ), $login_url ); } else { $stage = isset( $_POST['stage'] ) ? $_POST['stage'] : 'default'; @@ -700,9 +838,9 @@ if ( $active_signup == 'none' ) { do_action( 'preprocess_signup_form' ); if ( is_user_logged_in() && ( $active_signup == 'all' || $active_signup == 'blog' ) ) signup_another_blog($newblogname); - elseif ( is_user_logged_in() == false && ( $active_signup == 'all' || $active_signup == 'user' ) ) + elseif ( ! is_user_logged_in() && ( $active_signup == 'all' || $active_signup == 'user' ) ) signup_user( $newblogname, $user_email ); - elseif ( is_user_logged_in() == false && ( $active_signup == 'blog' ) ) + elseif ( ! is_user_logged_in() && ( $active_signup == 'blog' ) ) _e( 'Sorry, new registrations are not allowed at this time.' ); else _e( 'You are logged in already. No need to register again!' ); @@ -711,9 +849,15 @@ if ( $active_signup == 'none' ) { $newblog = get_blogaddress_by_name( $newblogname ); if ( $active_signup == 'blog' || $active_signup == 'all' ) - printf( '
' . __( '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; } @@ -729,4 +873,4 @@ if ( $active_signup == 'none' ) { */ do_action( 'after_signup_form' ); ?> - +