Ticket #31928: 31928.diff

src/wp-activate.php

@@ -18 +18 @@
         die();
 }
 
-if ( is_object( $wp_object_cache ) )
+if ( is_object( $wp_object_cache ) ) {
         $wp_object_cache->cache_enabled = false;
+}
 
 // Fix for page title
 $wp_query->is_404 = false;
 
+// Handle signup stage
+signup_handle_stage( 'activate' );
+
 /**
  * Fires before the Site Activation page is loaded.
  *
@@ -31 +35 @@
  */
 do_action( 'activate_header' );
 
-/**
- * Adds an action hook specific to this page.
- *
- * Fires on {@see 'wp_head'}.
- *
- * @since MU
- */
-function do_activate_header() {
-        /**
-         * Fires before the Site Activation page is loaded.
-         *
-         * Fires on the {@see 'wp_head'} action.
-     *
-     * @since 3.0.0
-     */
-    do_action( 'activate_wp_head' );
-}
-add_action( 'wp_head', 'do_activate_header' );
-
-/**
- * Loads styles specific to this page.
- *
- * @since MU
- */
-function wpmu_activate_stylesheet() {
-        ?>
-        <style type="text/css">
-                form { margin-top: 2em; }
-                #submit, #key { width: 90%; font-size: 24px; }
-                #language { margin-top: .5em; }
-                .error { background: #f66; }
-                span.h3 { padding: 0 8px; font-size: 1.3em; font-weight: bold; }
-        </style>
-        <?php
-}
-add_action( 'wp_head', 'wpmu_activate_stylesheet' );
+// Add activate headers
+activate_head_actions();
 
+// Load the activate header
 get_header( 'wp-activate' );
-?>
-
-<div id="signup-content" class="widecolumn">
-        <div class="wp-activate-container">
-        <?php if ( empty($_GET['key']) && empty($_POST['key']) ) { ?>
-
-                <h2><?php _e('Activation Key Required') ?></h2>
-                <form name="activateform" id="activateform" method="post" action="<?php echo network_site_url('wp-activate.php'); ?>">
-                        <p>
-                            <label for="key"><?php _e('Activation Key:') ?></label>
-                            <br /><input type="text" name="key" id="key" value="" size="50" />
-                        </p>
-                        <p class="submit">
-                            <input id="submit" type="submit" name="Submit" class="submit" value="<?php esc_attr_e('Activate') ?>" />
-                        </p>
-                </form>
-
-        <?php } else {
-
-                $key = !empty($_GET['key']) ? $_GET['key'] : $_POST['key'];
-                $result = wpmu_activate_signup( $key );
-                if ( is_wp_error($result) ) {
-                        if ( 'already_active' == $result->get_error_code() || 'blog_taken' == $result->get_error_code() ) {
-                                $signup = $result->get_error_data();
-                                ?>
-                                <h2><?php _e('Your account is now active!'); ?></h2>
-                                <?php
-                                echo '<p class="lead-in">';
-                                if ( $signup->domain . $signup->path == '' ) {
-                                        printf(
-                                                /* translators: 1: login URL, 2: username, 3: user email, 4: lost password URL */
-                                                __( 'Your account has been activated. You may now <a href="%1$s">log in</a> to the site using your chosen username of &#8220;%2$s&#8221;. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.' ),
-                                                network_site_url( 'wp-login.php', 'login' ),
-                                                $signup->user_login,
-                                                $signup->user_email,
-                                                wp_lostpassword_url()
-                                        );
-                                } else {
-                                        printf(
-                                                /* translators: 1: site URL, 2: site domain, 3: username, 4: user email, 5: lost password URL */
-                                                __( 'Your site at <a href="%1$s">%2$s</a> is active. You may now log in to your site using your chosen username of &#8220;%3$s&#8221;. Please check your email inbox at %4$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%5$s">reset your password</a>.' ),
-                                                'http://' . $signup->domain,
-                                                $signup->domain,
-                                                $signup->user_login,
-                                                $signup->user_email,
-                                                wp_lostpassword_url()
-                                        );
-                                }
-                                echo '</p>';
-                        } else {
-                                ?>
-                                <h2><?php _e( 'An error occurred during the activation' ); ?></h2>
-                                <p><?php echo $result->get_error_message(); ?></p>
-                                <?php
-                        }
-                } else {
-                        $url = isset( $result['blog_id'] ) ? get_home_url( (int) $result['blog_id'] ) : '';
-                        $user = get_userdata( (int) $result['user_id'] );
-                        ?>
-                        <h2><?php _e('Your account is now active!'); ?></h2>
 
-                        <div id="signup-welcome">
-                                <p><span class="h3"><?php _e('Username:'); ?></span> <?php echo $user->user_login ?></p>
-                                <p><span class="h3"><?php _e('Password:'); ?></span> <?php echo $result['password']; ?></p>
-                        </div>
+// Display the signup template
+get_template_part( 'signup' );
 
-                        <?php if ( $url && $url != network_home_url( '', 'http' ) ) :
-                                switch_to_blog( (int) $result['blog_id'] );
-                                $login_url = wp_login_url();
-                                restore_current_blog();
-                                ?>
-                                <p class="view"><?php
-                                        /* translators: 1: site URL, 2: login URL */
-                                        printf( __( 'Your account is now activated. <a href="%1$s">View your site</a> or <a href="%2$s">Log in</a>' ), $url, esc_url( $login_url ) );
-                                ?></p>
-                        <?php else: ?>
-                                <p class="view"><?php
-                                        /* translators: 1: login URL, 2: network home URL */
-                                        printf( __( 'Your account is now activated. <a href="%1$s">Log in</a> or go back to the <a href="%2$s">homepage</a>.' ), network_site_url( 'wp-login.php', 'login' ), network_home_url() );
-                                ?></p>
-                        <?php endif;
-                }
-        }
-        ?>
-        </div>
-</div>
-<script type="text/javascript">
-        var key_input = document.getElementById('key');
-        key_input && key_input.focus();
-</script>
-<?php get_footer( 'wp-activate' );
+get_footer( 'wp-activate' );

src/wp-includes/css/wp-signup.css

@@ +1 @@
+.mu_register {
+        width: 90%;
+        margin:0 auto;
+}
+
+.mu_register form {
+        margin-top: 2em;
+}
+
+.mu_register .error {
+        font-weight: 700;
+        padding: 10px;
+        color: #333333;
+        background: #FFEBE8;
+        border: 1px solid #CC0000;
+}
+
+.mu_register input[type="submit"],
+.mu_register #blog_title,
+.mu_register #user_email,
+.mu_register #blogname,
+.mu_register #user_name {
+        width: 100%;
+        font-size: 24px;
+        margin: 5px 0;
+}
+
+.mu_register #site-language {
+        display: block;
+}
+
+.mu_register .prefix_address,
+.mu_register .suffix_address {
+        font-size: 18px;
+        display: inline;
+}
+
+.mu_register label {
+        font-weight: 700;
+        font-size: 15px;
+        display: block;
+        margin: 10px 0;
+}
+
+.mu_register label.checkbox {
+        display: inline;
+}
+
+.mu_register .mu_alert {
+        font-weight: 700;
+        padding: 10px;
+        color: #333333;
+        background: #ffffe0;
+        border: 1px solid #e6db55;
+}
+
+.wp-activate-container form {
+        margin-top: 2em;
+}
+
+.wp-activate-container form #submit,
+.wp-activate-container form #key {
+        width: 90%;
+        font-size: 24px;
+}
+
+.wp-activate-container #language {
+        margin-top: .5em;
+}
+
+.wp-activate-container .error {
+        background: #f66;
+}
+
+.wp-activate-container span.h3 {
+        padding: 0 8px;
+        font-size: 1.3em;
+        font-weight: bold;
+}

src/wp-includes/ms-default-filters.php

@@ -42 +42 @@
 // Register Nonce
 add_action( 'signup_hidden_fields', 'signup_nonce_fields' );
 
+/**
+ * Add actions to the 'wp_head' hook for the signup page.
+ *
+ * This function is used in wp-signup.php to
+ * make sure the signup page is beeing displayed.
+ *
+ * @since  ?
+ */
+function signup_head_actions() {
+        add_action( 'wp_head', 'wp_no_robots' );
+        add_action( 'wp_head', 'do_signup_header' );
+        add_action( 'wp_head', 'wpmu_signup_stylesheet' );
+}
+
+/**
+ * Add actions to the 'wp_head' hook for the activate page.
+ *
+ * This function is used in wp-activate.php to
+ * make sure the activate page is beeing displayed.
+ *
+ * @since  ?
+ */
+function activate_head_actions() {
+        add_action( 'wp_head', 'do_activate_header' );
+        add_action( 'wp_head', 'wpmu_activate_stylesheet' );
+}
+
 // Template
 add_action( 'template_redirect', 'maybe_redirect_404' );
 add_filter( 'allowed_redirect_hosts', 'redirect_this_site' );

src/wp-includes/ms-deprecated.php

@@ -513 +513 @@
 
         return $results;
 }
+
+/**
+ * Validate user signup name and email
+ *
+ * @since MU
+ * @deprecated ?
+ *
+ * @return array Contains username, email, and error messages.
+ */
+function validate_user_form() {
+        _deprecated_function( __FUNCTION__, '?' );
+
+        return wpmu_validate_user_signup( $_POST['user_name'], $_POST['user_email'] );
+}
+
+/**
+ * Validate the new site signup
+ *
+ * @since MU
+ * @deprecated ?
+ *
+ * @return array Contains the new site data and error messages.
+ */
+function validate_blog_form() {
+        _deprecated_function( __FUNCTION__, '?' );
+
+        $user = '';
+        if ( is_user_logged_in() ) {
+                $user = wp_get_current_user();
+        }
+
+        return wpmu_validate_blog_signup( $_POST['blogname'], $_POST['blog_title'], $user );
+}

src/wp-includes/ms-functions.php

@@ -388 +388 @@
 }
 
 /**
+ * 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() {
+        /**
+         * Filters 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() );
+}
+
+/**
+ * Handle the signup stage and act accordingly.
+ *
+ * @since  ?
+ *
+ * @param  string $page The page being displayed between the signup and the activate page.
+ */
+function signup_handle_stage( $page = 'signup' ) {
+        global $stage_errors, $active_signup, $signup_action;
+
+        $stage_errors  = new WP_Error();
+        $signup_action = array();
+
+        // Activation
+        if ( 'activate' === $page ) {
+                if ( empty( $_GET['key'] ) && empty( $_POST['key'] ) ) {
+                        $signup_action['action'] = 'activate_form';
+                } else {
+                        if ( ! empty( $_GET['key'] ) ) {
+                                $key = $_GET['key'];
+                        } else {
+                                $key = $_POST['key'];
+                        }
+
+                        $signup_action = array(
+                                'action' => 'process_activation',
+                                'key'    => $key,
+                        );
+                }
+                return;
+        }
+
+        // Registration
+        $signup_stage = 'default';
+        if ( isset( $_POST['stage'] ) ) {
+                $signup_stage = $_POST['stage'];
+        }
+
+        $signup_for = '';
+        if ( ! empty( $_POST[ 'signup_for' ] ) ) {
+                $signup_for = $_POST[ 'signup_for' ];
+        }
+
+        $newblogname = null;
+        if ( isset( $_GET['new'] ) ) {
+                $newblogname = strtolower( preg_replace( '/^-|-$|[^-a-zA-Z0-9]/', '', $_GET['new'] ) );
+        }
+
+        // Signup is disabled
+        if ( 'none' === $active_signup ) {
+                $stage_errors->add( 'registration_closed', __( 'Registration has been disabled.' ) );
+
+        // Loggedin users can add new sites.
+        } elseif ( 'blog' === $active_signup && ! is_user_logged_in() ) {
+                $stage_errors->add( 'blog_registration_not_logged_in', sprintf(
+                        /* translators: %s: login URL */
+                        __( 'You must first <a href="%s">log in</a>, and then you can create a new site.' ),
+                        esc_url( wp_login_url( network_site_url( 'wp-signup.php' ) ) )
+                ) );
+
+        // User validate stage reached although user registration is disabled.
+        } elseif ( 'validate-user-signup' === $signup_stage && ! (
+                'all'  === $active_signup ||
+                'blog' === $signup_for && 'blog' === $active_signup ||
+                'user' === $signup_for && 'user' === $active_signup
+        ) ) {
+                $stage_errors->add( 'wrong_validate_user_stage', __( 'User registration has been disabled.' ) );
+
+        // Blog validate stage reached although blog registration is disabled.
+        } elseif ( 'validate-blog-signup' === $signup_stage && ! (
+                'all' === $active_signup || 'blog' === $active_signup
+        ) ) {
+                $stage_errors->add( 'wrong_validate_blog_stage', __( 'Site registration has been disabled.' ) );
+
+        // Default stage reached but..
+        } elseif ( 'default' === $signup_stage ) {
+                // Users can't register accounts.
+                if ( ! is_user_logged_in() && 'blog' === $active_signup ) {
+                        $stage_errors->add( 'wrong_default_blog_stage', __( 'Sorry, new registrations are not allowed at this time.' ) );
+
+                // Users is already regitered.
+                } elseif ( is_user_logged_in() && 'user' === $active_signup ) {
+                        $stage_errors->add( 'wrong_default_user_stage', __( 'You are logged in already. No need to register again!' ) );
+                }
+        }
+
+        // Only process stages if no errors
+        if ( ! $stage_errors->get_error_code() ) {
+                switch ( $signup_stage ) {
+                        case 'validate-user-signup' :
+                        case 'validate-blog-signup' :
+                                $user_name = '';
+                                if ( isset( $_POST['user_name'] ) ) {
+                                        $user_name = $_POST['user_name'];
+                                }
+
+                                $user_email = '';
+                                if ( isset( $_POST['user_email'] ) ) {
+                                        $user_email = $_POST['user_email'];
+                                }
+
+                                $signup_for = 'blog';
+                                if ( isset( $_POST['signup_for'] ) ) {
+                                        $signup_for = $_POST['signup_for'];
+                                }
+
+                                // Always Validate user.
+                                $result = wpmu_validate_user_signup( $user_name, $user_email );
+
+                                $signup_action = array(
+                                        'type'       => $signup_for,
+                                        'action'     => 'validate',
+                                        'result'     => $result['errors'],
+                                        'user_name'  => $result['user_name'],
+                                        'user_email' => $result['user_email'],
+                                );
+
+                                if ( $result['errors']->get_error_code() ) {
+                                        $signup_action['action'] = 'form';
+                                        $signup_action['type']   = 'user';
+
+                                // Validate site only if needed.
+                                } elseif ( 'blog' === $signup_for ) {
+                                        $signup_action['action'] = 'form';
+
+                                        $signup_action['blogname'] = '';
+                                        if ( isset( $_POST['blogname'] ) ) {
+                                                $signup_action['blogname'] = $_POST['blogname'];
+                                        }
+
+                                        $signup_action['blog_title'] = '';
+                                        if ( isset( $_POST['blog_title'] ) ) {
+                                                $signup_action['blog_title'] = $_POST['blog_title'];
+                                        }
+
+                                        if ( 'validate-blog-signup' === $signup_stage ) {
+                                                $result = wpmu_validate_blog_signup( $signup_action['blogname'], $signup_action['blog_title'] );
+                                                if ( $result['errors']->get_error_code() ) {
+                                                        $signup_action['result'] = $result['errors'];
+                                                } else {
+                                                        $signup_action = array_merge( $signup_action, $result );
+
+                                                        $signup_action['action']      = 'validate';
+                                                        $signup_action['blog_public'] = 1;
+
+                                                        if ( isset( $_POST['blog_public'] ) ) {
+                                                                $signup_action['blog_public'] = (int) $_POST['blog_public'];
+                                                        }
+                                                }
+                                        }
+                                }
+                                break;
+
+                        case 'gimmeanotherblog' :
+                                $blogname = '';
+                                if ( isset( $_POST['blogname'] ) ) {
+                                        $blogname = $_POST['blogname'];
+                                }
+
+                                $blog_title = '';
+                                if ( isset( $_POST['blog_title'] ) ) {
+                                        $blog_title = $_POST['blog_title'];
+                                }
+
+                                $result = wpmu_validate_blog_signup( $blogname, $blog_title, wp_get_current_user() );
+
+                                $signup_action = array(
+                                        'type'       => 'blog',
+                                        'action'     => 'validate',
+                                        'result'     => $result['errors'],
+                                        'blogname'   => $result['blogname'],
+                                        'blog_title' => $result['blog_title'],
+                                );
+
+                                if ( $result['errors']->get_error_code() ) {
+                                        $signup_action['action'] = 'form';
+                                } else {
+                                        $signup_action = array_merge( $signup_action, $result );
+                                        $signup_action['blog_public'] = 1;
+
+                                        if ( isset( $_POST['blog_public'] ) ) {
+                                                $signup_action['blog_public'] = (int) $_POST['blog_public'];
+                                        }
+                                }
+                                break;
+
+                        case 'default':
+                        default :
+                                $user_email = '';
+
+                                if ( isset( $_POST[ 'user_email' ] ) ) {
+                                        $user_email = $_POST[ 'user_email' ];
+                                }
+
+                                // User exists and is registering a new site.
+                                if ( ( 'all' === $active_signup || 'blog' === $active_signup ) && is_user_logged_in() ) {
+                                        $signup_action = array(
+                                                'type'     => 'blog',
+                                                'action'   => 'form',
+                                                'result'   => null,
+                                                'blogname' => $newblogname,
+                                        );
+
+                                // It's a new user.
+                                } elseif ( ! is_user_logged_in() && ( $active_signup == 'all' || $active_signup == 'user' ) ) {
+                                        $signup_action = array(
+                                                'type'       => 'user',
+                                                'action'     => 'form',
+                                                'result'     => null,
+                                                'user_name'  => $newblogname,
+                                                'user_email' => $user_email,
+                                        );
+                                }
+                                break;
+                }
+        }
+
+        // Add the user notice if needed.
+        if ( $newblogname && 'default' === $signup_stage ) {
+                $newblog = get_blogaddress_by_name( $newblogname );
+
+                if ( 'blog' === $active_signup || 'all' === $active_signup ) {
+                        $signup_action['notice'] = sprintf(
+                                /* translators: %s: site address */
+                                '<p><em>' . __( 'The site you were looking for, %s, does not exist, but you can create it now!' ) . '</em></p>',
+                                '<strong>' . $newblog . '</strong>'
+                        );
+                } elseif ( 'none' !== $active_signup ) {
+                        $signup_action['notice'] = sprintf(
+                                /* translators: %s: site address */
+                                '<p><em>' . __( 'The site you were looking for, %s, does not exist.' ) . '</em></p>',
+                                '<strong>' . $newblog . '</strong>'
+                        );
+                }
+        }
+}
+
+/**
  * Sanitize and validate data required for a user sign-up.
  *
  * Verifies the validity and uniqueness of user names and user email addresses,
@@ -520 +790 @@
 }
 
 /**
+ * Validate the new user signup
+ *
+ * @since MU
+ *
+ * @return bool True if new user signup was validated, false if error
+ */
+function validate_user_signup() {
+        global $signup_action;
+
+        if ( ! isset( $signup_action['user_name'] ) || ! isset( $signup_action['user_email'] ) ) {
+                return false;
+        }
+
+        $user_name  = $signup_action['user_name'];
+        $user_email = $signup_action['user_email'];
+
+        /** This filter is documented in wp-signup.php */
+        wpmu_signup_user( $user_name, $user_email, apply_filters( 'add_signup_meta', array() ) );
+
+        // The user successfully signed up
+        confirm_user_signup( $user_name, $user_email );
+        return true;
+}
+
+/**
  * Processes new site registrations.
  *
  * Checks the data provided by the user during blog signup. Verifies
@@ -653 +948 @@
 }
 
 /**
+ * Validate new site signup
+ *
+ * @since MU
+ *
+ * @return bool True if the site signup was validated, false if error
+ */
+function validate_blog_signup() {
+        global $signup_action;
+
+        if ( ! isset( $signup_action['user_name'] ) || ! isset( $signup_action['blogname'] ) ) {
+                return false;
+        }
+
+        $user_name  = $signup_action['user_name'];
+        $user_email = $signup_action['user_email'];
+        $domain     = $signup_action['domain'];
+        $path       = $signup_action['path'];
+        $blogname   = $signup_action['blogname'];
+        $blog_title = $signup_action['blog_title'];
+        $public     = (int) $signup_action['blog_public'];
+
+        $signup_meta = array ('lang_id' => 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 );
+
+        wpmu_signup_blog( $domain, $path, $blog_title, $user_name, $user_email, $meta );
+
+        // Attention ça est dans le template
+        confirm_blog_signup( $domain, $path, $blog_title, $user_name, $user_email, $meta );
+        return true;
+}
+
+/**
+ * Validate a new site signup.
+ *
+ * @since MU
+ *
+ * @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, $signup_action;
+
+        $current_user = wp_get_current_user();
+
+        if ( ! is_user_logged_in() || ! isset( $signup_action['blogname'] ) ) {
+                die();
+        }
+
+        // Extracted values set/overwrite globals.
+        $domain     = $signup_action['domain'];
+        $path       = $signup_action['path'];
+        $blogname   = $signup_action['blogname'];
+        $blog_title = $signup_action['blog_title'];
+        $public     = (int) $signup_action['blog_public'];
+
+        $blog_meta_defaults = array(
+                'lang_id' => 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 ) {
+                                $blog_meta_defaults['WPLANG'] = $language;
+                        }
+                }
+        }
+
+        /**
+         * Filters the new site meta variables.
+         *
+         * Use the {@see 'add_signup_meta'} filter instead.
+         *
+         * @since MU
+         * @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_defaults = apply_filters( 'signup_create_blog_meta', $blog_meta_defaults );
+
+        /**
+         * Filters the new default site meta variables.
+         *
+         * @since 3.0.0
+         *
+         * @param array $meta {
+         *     An array of default site meta variables.
+         *
+         *     @type int $lang_id     The language ID.
+         *     @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_defaults );
+
+        $blog_id = wpmu_create_blog( $domain, $path, $blog_title, $current_user->ID, $meta, $wpdb->siteid );
+
+        if ( is_wp_error( $blog_id ) ) {
+                return false;
+        }
+
+        // Display the confirmation.
+        confirm_another_blog_signup( $domain, $path, $blog_title, $current_user->user_login, $current_user->user_email, $meta, $blog_id );
+        return true;
+}
+
+/**
  * Record site signup information for future activation.
  *
  * @since MU

src/wp-includes/ms-template.php

@@ +1 @@
+<?php
+/**
+ * Multisite specific Template functions
+ *
+ * @package WordPress
+ * @subpackage Multisite
+ */
+
+/**
+ * Prints signup_header via wp_head
+ *
+ * @since MU
+ */
+function do_signup_header() {
+        /**
+         * Fires within the head section of the site sign-up screen.
+         *
+         * @since 3.0.0
+         */
+        do_action( 'signup_header' );
+}
+
+/**
+ * Adds an action hook specific to this page.
+ *
+ * Fires on {@see 'wp_head'}.
+ *
+ * @since MU
+ */
+function do_activate_header() {
+        /**
+         * Fires before the Site Activation page is loaded.
+         *
+         * Fires on the {@see 'wp_head'} action.
+     *
+     * @since 3.0.0
+     */
+        do_action( 'activate_wp_head' );
+}
+
+/**
+ * Output the style rules to format the signup and the activate form.
+ *
+ * @since ?
+ */
+function wpmu_signup_stylesheet() {
+        ?>
+        <style type="text/css">
+        <?php
+                if ( SCRIPT_DEBUG ) {
+                        readfile( ABSPATH . WPINC . "/css/wp-signup.css" );
+                } else {
+                        /*
+                         * If you're looking at a src version of this file, you'll see an "include"
+                         * statement below. This is used by the `grunt build` process to directly
+                         * include a minified version of wp-signup.css, instead of using the
+                         * readfile() method from above.
+                         *
+                         * If you're looking at a build version of this file, you'll see a string of
+                         * minified CSS. If you need to debug it, please turn on SCRIPT_DEBUG
+                         * and edit wp-signup.css directly.
+                         */
+                        print( 'include "css/wp-signup.min.css"');
+                }
+        ?>
+        </style>
+        <?php
+}
+
+/**
+ * Loads styles specific to this page.
+ *
+ * The function is kept so that it's still possible
+ * to unhook 'wpmu_activate_stylesheet' from 'wp_head'
+ *
+ * @since MU
+ * @since ? Share the style rules of the signup page.
+ */
+function wpmu_activate_stylesheet() {
+        return wpmu_signup_stylesheet();
+}
+
+/**
+ * Output the classes for the signup and activate forms.
+ *
+ * @since  ?
+ */
+function signup_classes() {
+        global $active_signup;
+
+        if ( is_null( $active_signup ) ) {
+                $signup_classes = array( 'wp-activate-container' );
+        } else {
+                $signup_classes = array( 'mu_register', 'wp-signup-container' );
+        }
+
+        /**
+         * Filter here to edit signup/activate classes.
+         *
+         * @since ?
+         *
+         * @param  array $signup_classes An array of CSS classes.
+         */
+        $signup_classes = (array) apply_filters( 'signup_classes', $signup_classes );
+
+        echo join( ' ', array_map( 'sanitize_html_class', $signup_classes ) );
+}
+
+/**
+ * Displays Administrator's notices if any.
+ *
+ * @since ?
+ */
+function do_signup_admin_notice() {
+        global $active_signup;
+
+        if ( ! current_user_can( 'manage_network' ) || is_null( $active_signup ) ) {
+                return;
+        }
+
+        $notice = '';
+        switch ( $active_signup ) {
+                case 'none':
+                        $notice = __( 'The network currently disallows registrations.' );
+                        break;
+
+                case 'blog':
+                        $notice = __( 'The network currently allows site registrations.' );
+                        break;
+
+                case 'user':
+                        $notice = __( 'The network currently allows user registrations.' );
+                        break;
+
+                default:
+                        $notice =  __( 'The network currently allows both site and user registrations.' );
+                        break;
+        }
+
+        printf( '
+                <div class="mu_alert">
+                        %1$s %2$s %3$s
+                </div>
+                ',
+                esc_html__( 'Greetings Network Administrator!' ),
+                esc_html( $notice ),
+                /* translators: %s: network settings URL */
+                sprintf( __( 'To change or disable registration go to your <a href="%s">Options page</a>.' ), esc_url( network_admin_url( 'settings.php' ) ) )
+        );
+}
+
+/**
+ * Displays user notices if any.
+ *
+ * @since ?
+ */
+function do_signup_user_notice() {
+        global $signup_action;
+
+        if ( ! isset( $signup_action['notice'] ) ) {
+                return;
+        }
+
+        echo wp_kses( $signup_action['notice'], wp_kses_allowed_html() );
+}
+
+/**
+ * Checks if there are signup errors.
+ *
+ * @since ?
+ *
+ * @return  bool True if signup errors were found. False otherwise.
+ */
+function signup_has_errors() {
+        global $stage_errors;
+
+        return (bool) $stage_errors->get_error_code();
+}
+
+/**
+ * Displays signup errors.
+ *
+ * @since ?
+ */
+function print_signup_errors() {
+        global $stage_errors;
+
+        echo '<p>' . join( '</p><p>',  $stage_errors->get_error_messages() ) . '</p>';
+}
+
+/**
+ * Output the right signup form according to parameters.
+ *
+ * @since  ?
+ *
+ * @param  array  $args {
+ *     Form arguments. Optional.
+ *
+ *     @type string           $type       Whether it's a 'user' or a 'blog' to create. Default empty.
+ *     @type string           $action     Whether it's a 'validate' or a 'form' action. Default empty.
+ *     @type null|WP_Error    $echo       The result of the form validation. Default null.
+ *     @type string           $user_name  The user name to create. Default empty.
+ *     @type string           $blogname   The site name to create. Default empty.
+ *     @type string           $blog_title The site title to create. Default empty.
+ * }
+ */
+function do_signup_form( $args = array() ) {
+        global $signup_action;
+
+        if ( ! $args ) {
+                $args = (array) $signup_action;
+        }
+
+        $signup_args = wp_parse_args( $args, array(
+                'type'       => '',
+                'action'     => '',
+                'result'     => null,
+                'user_name'  => '',
+                'user_email' => '',
+                'blogname'   => '',
+                'blog_title' => '',
+        ) );
+
+        // Forms.
+        if ( 'form' === $signup_args['action'] ) {
+                /**
+                 * Fires when the site sign-up form is sent.
+                 *
+                 * @since 3.0.0
+                 */
+                do_action( 'preprocess_signup_form' );
+
+                // User form
+                if ( 'user' === $signup_args['type'] ) {
+                        signup_user( $signup_args['user_name'], $signup_args['user_email'], $signup_args['result'] );
+
+                // Site forms
+                } elseif ( 'blog' === $signup_args['type'] ) {
+
+                        // A new user is registering a site.
+                        if ( ! is_user_logged_in() ) {
+                                signup_blog( $signup_args['user_name'], $signup_args['user_email'], $signup_args['blogname'], $signup_args['blog_title'], $signup_args['result'] );
+
+                        // An existing user is registering a new site.
+                        } else {
+                                signup_another_blog( $signup_args['blogname'], $signup_args['blog_title'], $signup_args['result'] );
+                        }
+                }
+
+        // Confirmations.
+        } elseif ( 'validate' === $signup_args['action'] ) {
+                // User validation.
+                if ( 'user' === $signup_args['type'] ) {
+                        validate_user_signup();
+
+                // Site validation.
+                } elseif ( 'blog' === $signup_args['type'] ) {
+
+                        // Validate the site of the new user.
+                        if ( ! is_user_logged_in() ) {
+                                validate_blog_signup();
+
+                        // Validate the site of the existing user.
+                        } else {
+                                validate_another_blog_signup();
+                        }
+                }
+
+        // Account activation.
+        } elseif ( 'activate_form' === $signup_args['action'] ) {
+                activate_user_form();
+        } elseif ( 'process_activation' === $signup_args['action'] ) {
+                activate_user();
+        }
+}
+
+/**
+ * Generates and displays the Signup and Create Site forms
+ *
+ * @since MU
+ *
+ * @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 show_blog_form( $blogname = '', $blog_title = '', $errors = '' ) {
+        if ( ! is_wp_error( $errors ) ) {
+                $errors = new WP_Error();
+        }
+
+        $current_network = get_network();
+
+        // Blog name
+        if ( !is_subdomain_install() ) {
+                echo '<label for="blogname">' . __('Site Name:') . '</label>';
+        } else {
+                echo '<label for="blogname">' . __('Site Domain:') . '</label>';
+        }
+
+        if ( $errmsg = $errors->get_error_message('blogname') ) { ?>
+                <p class="error"><?php echo $errmsg ?></p>
+        <?php }
+
+        if ( !is_subdomain_install() ) {
+                echo '<span class="prefix_address">' . $current_network->domain . $current_network->path . '</span><input name="blogname" type="text" id="blogname" value="'. esc_attr($blogname) .'" maxlength="60" /><br />';
+        } else {
+                echo '<input name="blogname" type="text" id="blogname" value="'.esc_attr($blogname).'" maxlength="60" /><span class="suffix_address">.' . ( $site_domain = preg_replace( '|^www\.|', '', $current_network->domain ) ) . '</span><br />';
+        }
+
+        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 '<p>(<strong>' . sprintf( __( 'Your address will be %s.' ), $site ) . '</strong>) ' . __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed, so choose carefully!' ) . '</p>';
+        }
+
+        // Blog Title
+        ?>
+        <label for="blog_title"><?php _e('Site Title:') ?></label>
+        <?php if ( $errmsg = $errors->get_error_message('blog_title') ) { ?>
+                <p class="error"><?php echo $errmsg ?></p>
+        <?php }
+        echo '<input name="blog_title" type="text" id="blog_title" value="'.esc_attr($blog_title).'" />';
+
+        // Site Language.
+        $languages = signup_get_available_languages();
+
+        if ( ! empty( $languages ) ) :
+                ?>
+                <p>
+                        <label for="site-language"><?php _e( 'Site Language:' ); ?></label>
+                        <?php
+                        // Network default.
+                        $lang = get_site_option( 'WPLANG' );
+
+                        if ( isset( $_POST['WPLANG'] ) ) {
+                                $lang = $_POST['WPLANG'];
+                        }
+
+                        // Use US English if the default isn't available.
+                        if ( ! in_array( $lang, $languages ) ) {
+                                $lang = '';
+                        }
+
+                        wp_dropdown_languages( array(
+                                'name'                        => 'WPLANG',
+                                'id'                          => 'site-language',
+                                'selected'                    => $lang,
+                                'languages'                   => $languages,
+                                'show_available_translations' => false,
+                        ) );
+                        ?>
+                </p>
+        <?php endif; // Languages. ?>
+
+        <div id="privacy">
+        <p class="privacy-intro">
+            <label for="blog_public_on"><?php _e('Privacy:') ?></label>
+            <?php _e( 'Allow search engines to index this site.' ); ?>
+            <br style="clear:both" />
+            <label class="checkbox" for="blog_public_on">
+                <input type="radio" id="blog_public_on" name="blog_public" value="1" <?php if ( !isset( $_POST['blog_public'] ) || $_POST['blog_public'] == '1' ) { ?>checked="checked"<?php } ?> />
+                <strong><?php _e( 'Yes' ); ?></strong>
+            </label>
+            <label class="checkbox" for="blog_public_off">
+                <input type="radio" id="blog_public_off" name="blog_public" value="0" <?php if ( isset( $_POST['blog_public'] ) && $_POST['blog_public'] == '0' ) { ?>checked="checked"<?php } ?> />
+                <strong><?php _e( 'No' ); ?></strong>
+            </label>
+        </p>
+        </div>
+
+        <?php
+        /**
+         * Fires after the site sign-up form.
+         *
+         * @since 3.0.0
+         *
+         * @param WP_Error $errors A WP_Error object possibly containing 'blogname' or 'blog_title' errors.
+         */
+        do_action( 'signup_blogform', $errors );
+}
+
+/**
+ * Display user registration form
+ *
+ * @since MU
+ *
+ * @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 '<label for="user_name">' . __('Username:') . '</label>';
+        if ( $errmsg = $errors->get_error_message('user_name') ) {
+                echo '<p class="error">'.$errmsg.'</p>';
+        }
+        echo '<input name="user_name" type="text" id="user_name" value="'. esc_attr( $user_name ) .'" autocapitalize="none" autocorrect="off" maxlength="60" /><br />';
+        _e( '(Must be at least 4 characters, letters and numbers only.)' );
+        ?>
+
+        <label for="user_email"><?php _e( 'Email&nbsp;Address:' ) ?></label>
+        <?php if ( $errmsg = $errors->get_error_message('user_email') ) { ?>
+                <p class="error"><?php echo $errmsg ?></p>
+        <?php } ?>
+        <input name="user_email" type="email" id="user_email" value="<?php  echo esc_attr($user_email) ?>" maxlength="200" /><br /><?php _e('We send your registration email to this address. (Double-check your email address before continuing.)') ?>
+        <?php
+        if ( $errmsg = $errors->get_error_message('generic') ) {
+                echo '<p class="error">' . $errmsg . '</p>';
+        }
+        /**
+         * Fires at the end of the user registration form on the site sign-up form.
+         *
+         * @since 3.0.0
+         *
+         * @param WP_Error $errors A WP_Error object containing containing 'user_name' or 'user_email' errors.
+         */
+        do_action( 'signup_extra_fields', $errors );
+}
+
+/**
+ * Setup the new user signup process
+ *
+ * @since MU
+ *
+ * @param string          $user_name  The username.
+ * @param string          $user_email The user's email.
+ * @param WP_Error|string $errors     A WP_Error object containing existing errors. Defaults to empty string.
+ */
+function signup_user( $user_name = '', $user_email = '', $errors = '' ) {
+        global $active_signup;
+
+        if ( !is_wp_error($errors) )
+                $errors = new WP_Error();
+
+        $signup_for = isset( $_POST[ 'signup_for' ] ) ? esc_html( $_POST[ 'signup_for' ] ) : 'blog';
+
+        $signup_user_defaults = array(
+                'user_name'  => $user_name,
+                'user_email' => $user_email,
+                'errors'     => $errors,
+        );
+
+        /**
+         * Filters the default user variables used on the user sign-up form.
+         *
+         * @since 3.0.0
+         *
+         * @param array $signup_user_defaults {
+         *     An array of default user variables.
+         *
+         *     @type string   $user_name  The user username.
+         *     @type string   $user_email The user email address.
+         *     @type WP_Error $errors     A WP_Error object with possible errors relevant to the sign-up user.
+         * }
+         */
+        $filtered_results = apply_filters( 'signup_user_init', $signup_user_defaults );
+        $user_name = $filtered_results['user_name'];
+        $user_email = $filtered_results['user_email'];
+        $errors = $filtered_results['errors'];
+
+        ?>
+
+        <h2><?php
+                /* translators: %s: name of the network */
+                printf( __( 'Get your own %s account in seconds' ), get_network()->site_name );
+        ?></h2>
+        <form id="setupform" method="post" action="wp-signup.php" novalidate="novalidate">
+                <input type="hidden" name="stage" value="validate-user-signup" />
+                <?php
+                /** This action is documented in wp-signup.php */
+                do_action( 'signup_hidden_fields', 'validate-user' );
+                ?>
+                <?php show_user_form($user_name, $user_email, $errors); ?>
+
+                <p>
+                <?php if ( $active_signup == 'blog' ) { ?>
+                        <input id="signupblog" type="hidden" name="signup_for" value="blog" />
+                <?php } elseif ( $active_signup == 'user' ) { ?>
+                        <input id="signupblog" type="hidden" name="signup_for" value="user" />
+                <?php } else { ?>
+                        <input id="signupblog" type="radio" name="signup_for" value="blog" <?php checked( $signup_for, 'blog' ); ?> />
+                        <label class="checkbox" for="signupblog"><?php _e('Gimme a site!') ?></label>
+                        <br />
+                        <input id="signupuser" type="radio" name="signup_for" value="user" <?php checked( $signup_for, 'user' ); ?> />
+                        <label class="checkbox" for="signupuser"><?php _e('Just a username, please.') ?></label>
+                <?php } ?>
+                </p>
+
+                <p class="submit"><input type="submit" name="submit" class="submit" value="<?php esc_attr_e('Next') ?>" /></p>
+        </form>
+        <?php
+}
+
+/**
+ * New user signup confirmation
+ *
+ * @since MU
+ *
+ * @param string $user_name The username
+ * @param string $user_email The user's email address
+ */
+function confirm_user_signup($user_name, $user_email) {
+        ?>
+        <h2><?php /* translators: %s: username */
+        printf( __( '%s is your new username' ), $user_name) ?></h2>
+        <p><?php _e( 'But, before you can start using your new username, <strong>you must activate it</strong>.' ) ?></p>
+        <p><?php /* translators: %s: email address */
+        printf( __( 'Check your inbox at %s and click the link given.' ), '<strong>' . $user_email . '</strong>' ); ?></p>
+        <p><?php _e( 'If you do not activate your username within two days, you will have to sign up again.' ); ?></p>
+        <?php
+        /** This action is documented in wp-signup.php */
+        do_action( 'signup_finished' );
+}
+
+/**
+ * Setup the new site signup
+ *
+ * @since MU
+ *
+ * @param string          $user_name  The username.
+ * @param string          $user_email The user's email address.
+ * @param string          $blogname   The site name.
+ * @param string          $blog_title The site title.
+ * @param WP_Error|string $errors     A WP_Error object containing existing errors. Defaults to empty string.
+ */
+function signup_blog($user_name = '', $user_email = '', $blogname = '', $blog_title = '', $errors = '') {
+        if ( !is_wp_error($errors) )
+                $errors = new WP_Error();
+
+        $signup_blog_defaults = array(
+                'user_name'  => $user_name,
+                'user_email' => $user_email,
+                'blogname'   => $blogname,
+                'blog_title' => $blog_title,
+                'errors'     => $errors
+        );
+
+        /**
+         * Filters the default site creation variables for the site sign-up form.
+         *
+         * @since 3.0.0
+         *
+         * @param array $signup_blog_defaults {
+         *     An array of default site creation variables.
+         *
+         *     @type string   $user_name  The user username.
+         *     @type string   $user_email The user email address.
+         *     @type string   $blogname   The blogname.
+         *     @type string   $blog_title The title of the site.
+         *     @type WP_Error $errors     A WP_Error object with possible errors relevant to new site creation variables.
+         * }
+         */
+        $filtered_results = apply_filters( 'signup_blog_init', $signup_blog_defaults );
+
+        $user_name = $filtered_results['user_name'];
+        $user_email = $filtered_results['user_email'];
+        $blogname = $filtered_results['blogname'];
+        $blog_title = $filtered_results['blog_title'];
+        $errors = $filtered_results['errors'];
+
+        if ( empty($blogname) )
+                $blogname = $user_name;
+        ?>
+        <form id="setupform" method="post" action="wp-signup.php">
+                <input type="hidden" name="stage" value="validate-blog-signup" />
+                <input type="hidden" name="user_name" value="<?php echo esc_attr($user_name) ?>" />
+                <input type="hidden" name="user_email" value="<?php echo esc_attr($user_email) ?>" />
+                <?php
+                /** This action is documented in wp-signup.php */
+                do_action( 'signup_hidden_fields', 'validate-site' );
+                ?>
+                <?php show_blog_form($blogname, $blog_title, $errors); ?>
+                <p class="submit"><input type="submit" name="submit" class="submit" value="<?php esc_attr_e('Signup') ?>" /></p>
+        </form>
+        <?php
+}
+
+/**
+ * New site signup confirmation
+ *
+ * @since MU
+ *
+ * @param string $domain The domain URL
+ * @param string $path The site root path
+ * @param string $blog_title The new site title
+ * @param string $user_name The user's 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()
+ */
+function confirm_blog_signup( $domain, $path, $blog_title, $user_name = '', $user_email = '', $meta = array() ) {
+        ?>
+        <h2><?php /* translators: %s: site address */
+        printf( __( 'Congratulations! Your new site, %s, is almost ready.' ), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" ) ?></h2>
+
+        <p><?php _e( 'But, before you can start using your site, <strong>you must activate it</strong>.' ) ?></p>
+        <p><?php /* translators: %s: email address */
+        printf( __( 'Check your inbox at %s and click the link given.' ), '<strong>' . $user_email . '</strong>' ); ?></p>
+        <p><?php _e( 'If you do not activate your site within two days, you will have to sign up again.' ); ?></p>
+        <h2><?php _e( 'Still waiting for your email?' ); ?></h2>
+        <p>
+                <?php _e( 'If you haven&#8217;t received your email yet, there are a number of things you can do:' ) ?>
+                <ul id="noemail-tips">
+                        <li><p><strong><?php _e( 'Wait a little longer. Sometimes delivery of email can be delayed by processes outside of our control.' ) ?></strong></p></li>
+                        <li><p><?php _e( 'Check the junk or spam folder of your email client. Sometime emails wind up there by mistake.' ) ?></p></li>
+                        <li><?php
+                                /* translators: %s: email address */
+                                printf( __( 'Have you entered your email correctly? You have entered %s, if it&#8217;s incorrect, you will not receive your email.' ), $user_email );
+                        ?></li>
+                </ul>
+        </p>
+        <?php
+        /** This action is documented in wp-signup.php */
+        do_action( 'signup_finished' );
+}
+
+/**
+ * Allow returning users to sign up for another site
+ *
+ * @since MU
+ *
+ * @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 = '' ) {
+        $current_user = wp_get_current_user();
+
+        if ( ! is_wp_error($errors) ) {
+                $errors = new WP_Error();
+        }
+
+        $signup_defaults = array(
+                'blogname'   => $blogname,
+                'blog_title' => $blog_title,
+                'errors'     => $errors
+        );
+
+        /**
+         * 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 WP_Error $errors     A WP_Error object possibly containing 'blogname' or 'blog_title' errors.
+         * }
+         */
+        $filtered_results = apply_filters( 'signup_another_blog_init', $signup_defaults );
+
+        $blogname = $filtered_results['blogname'];
+        $blog_title = $filtered_results['blog_title'];
+        $errors = $filtered_results['errors'];
+
+        echo '<h2>' . sprintf( __( 'Get <em>another</em> %s site in seconds' ), get_network()->site_name ) . '</h2>';
+
+        if ( $errors->get_error_code() ) {
+                echo '<p>' . __( 'There was a problem, please correct the form below and try again.' ) . '</p>';
+        }
+        ?>
+        <p><?php printf( __( 'Welcome back, %s. By filling out the form below, you can <strong>add another site to your account</strong>. There is no limit to the number of sites you can have, so create to your heart&#8217;s content, but write responsibly!' ), $current_user->display_name ) ?></p>
+
+        <?php
+        $blogs = get_blogs_of_user($current_user->ID);
+        if ( !empty($blogs) ) { ?>
+
+                        <p><?php _e( 'Sites you are already a member of:' ) ?></p>
+                        <ul>
+                                <?php foreach ( $blogs as $blog ) {
+                                        $home_url = get_home_url( $blog->userblog_id );
+                                        echo '<li><a href="' . esc_url( $home_url ) . '">' . $home_url . '</a></li>';
+                                } ?>
+                        </ul>
+        <?php } ?>
+
+        <p><?php _e( 'If you&#8217;re not going to use a great site domain, leave it for a new user. Now have at it!' ) ?></p>
+        <form id="setupform" method="post" action="wp-signup.php">
+                <input type="hidden" name="stage" value="gimmeanotherblog" />
+                <?php
+                /**
+                 * Hidden sign-up form fields output when creating another site or user.
+                 *
+                 * @since MU
+                 *
+                 * @param string $context A string describing the steps of the sign-up process. The value can be
+                 *                        'create-another-site', 'validate-user', or 'validate-site'.
+                 */
+                do_action( 'signup_hidden_fields', 'create-another-site' );
+                ?>
+                <?php show_blog_form($blogname, $blog_title, $errors); ?>
+                <p class="submit"><input type="submit" name="submit" class="submit" value="<?php esc_attr_e( 'Create Site' ) ?>" /></p>
+        </form>
+        <?php
+}
+
+/**
+ * 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 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(), $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( '<a href="%1$s">%2$s</a>',
+                esc_url( $home_url ),
+                $blog_title
+        );
+
+        ?>
+        <h2><?php
+                /* translators: %s: site name */
+                printf( __( 'The site %s is yours.' ), $site );
+        ?></h2>
+        <p>
+                <?php printf(
+                        /* translators: 1: home URL, 2: site address, 3: login URL, 4: username */
+                        __( '<a href="%1$s">%2$s</a> is your new site. <a href="%3$s">Log in</a> as &#8220;%4$s&#8221; using your existing password.' ),
+                        esc_url( $home_url ),
+                        untrailingslashit( $domain . $path ),
+                        esc_url( $login_url ),
+                        $user_name
+                ); ?>
+        </p>
+        <?php
+        /**
+         * Fires when the site or user sign-up process is complete.
+         *
+         * @since 3.0.0
+         */
+        do_action( 'signup_finished' );
+}
+
+/**
+ * Displays the activate form.
+ *
+ * @since  ?
+ */
+function activate_user_form() {
+        ?>
+        <h2><?php esc_html_e('Activation Key Required') ?></h2>
+        <form name="activateform" id="activateform" method="post" action="<?php echo esc_url( network_site_url( 'wp-activate.php' ) ); ?>">
+                <p>
+                    <label for="key"><?php esc_html_e( 'Activation Key:' ) ?></label>
+                    <br /><input type="text" name="key" id="key" value="" size="50" />
+                </p>
+                <p class="submit">
+                    <input id="submit" type="submit" name="Submit" class="submit" value="<?php esc_attr_e( 'Activate' ) ?>" />
+                </p>
+        </form>
+
+        <script type="text/javascript">
+                var key_input = document.getElementById('key');
+                key_input && key_input.focus();
+        </script>
+        <?php
+}
+
+/**
+ * Displays the activation result.
+ *
+ * @since  ?
+ *
+ * @return bool|string False if the signup key is not set.
+ *                     The HTML output of the activation's result otherwise.
+ */
+function activate_user() {
+        global $signup_action;
+
+        if ( ! isset( $signup_action['key'] ) ) {
+                return false;
+        }
+
+        // Activate the signup.
+        $result = wpmu_activate_signup( $signup_action['key'] );
+
+        if ( is_wp_error( $result ) ) {
+                if ( 'already_active' == $result->get_error_code() || 'blog_taken' == $result->get_error_code() ) {
+                        $signup = $result->get_error_data();
+                        ?>
+                        <h2><?php esc_html_e( 'Your account is now active!' ); ?></h2>
+                        <?php
+                        echo '<p class="lead-in">';
+                        if ( $signup->domain . $signup->path == '' ) {
+                                printf(
+                                        /* translators: 1: login URL, 2: username, 3: user email, 4: lost password URL */
+                                        __( 'Your account has been activated. You may now <a href="%1$s">log in</a> to the site using your chosen username of &#8220;%2$s&#8221;. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.' ),
+                                        network_site_url( 'wp-login.php', 'login' ),
+                                        $signup->user_login,
+                                        $signup->user_email,
+                                        wp_lostpassword_url()
+                                );
+                        } else {
+                                printf(
+                                        /* translators: 1: site URL, 2: site domain, 3: username, 4: user email, 5: lost password URL */
+                                        __( 'Your site at <a href="%1$s">%2$s</a> is active. You may now log in to your site using your chosen username of &#8220;%3$s&#8221;. Please check your email inbox at %4$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%5$s">reset your password</a>.' ),
+                                        'http://' . $signup->domain,
+                                        $signup->domain,
+                                        $signup->user_login,
+                                        $signup->user_email,
+                                        wp_lostpassword_url()
+                                );
+                        }
+                        echo '</p>';
+                } else {
+                        ?>
+                        <h2><?php esc_html_e( 'An error occurred during the activation' ); ?></h2>
+                        <p><?php echo $result->get_error_message(); ?></p>
+                        <?php
+                }
+        } else {
+                $url = isset( $result['blog_id'] ) ? get_home_url( (int) $result['blog_id'] ) : '';
+                $user = get_userdata( (int) $result['user_id'] );
+                ?>
+                <h2><?php esc_html_e( 'Your account is now active!' ); ?></h2>
+
+                <div id="signup-welcome">
+                        <p><span class="h3"><?php esc_html_e( 'Username:' ); ?></span> <?php echo esc_html( $user->user_login ); ?></p>
+                        <p><span class="h3"><?php esc_html_e( 'Password:' ); ?></span> <?php echo esc_html( $result['password'] ); ?></p>
+                </div>
+
+                <?php if ( $url && $url != network_home_url( '', 'http' ) ) :
+                        switch_to_blog( (int) $result['blog_id'] );
+                        $login_url = wp_login_url();
+                        restore_current_blog();
+                        ?>
+                        <p class="view"><?php
+                                /* translators: 1: site URL, 2: login URL */
+                                printf( __( 'Your account is now activated. <a href="%1$s">View your site</a> or <a href="%2$s">Log in</a>' ), $url, esc_url( $login_url ) );
+                        ?></p>
+                <?php else: ?>
+                        <p class="view"><?php
+                                /* translators: 1: login URL, 2: network home URL */
+                                printf( __( 'Your account is now activated. <a href="%1$s">Log in</a> or go back to the <a href="%2$s">homepage</a>.' ), network_site_url( 'wp-login.php', 'login' ), network_home_url() );
+                        ?></p>
+                <?php endif;
+        }
+}

src/wp-includes/theme-compat/signup.php

@@ +1 @@
+<?php
+/**
+ * Contains the Multisite signup base template
+ *
+ * When user accounts/sites registration is open, this file is used to create the output
+ * if the active theme does not include an signup.php template.
+ *
+ * @package WordPress
+ * @subpackage Multisite
+ */
+?>
+
+<div id="signup-content" class="widecolumn">
+        <div class="<?php signup_classes(); ?>">
+
+                <?php do_signup_admin_notice() ;
+
+                if ( signup_has_errors() ) :
+
+                        print_signup_errors();
+
+                else :
+
+                        do_signup_form();
+
+                endif ;
+
+                do_signup_user_notice(); ?>
+
+        </div>
+</div>

src/wp-settings.php

@@ -246 +246 @@
 // Load multisite-specific files.
 if ( is_multisite() ) {
         require( ABSPATH . WPINC . '/ms-functions.php' );
+        require( ABSPATH . WPINC . '/ms-template.php' );
         require( ABSPATH . WPINC . '/ms-default-filters.php' );
         require( ABSPATH . WPINC . '/ms-deprecated.php' );
 }

src/wp-signup.php

@@ -3 +3 @@
 /** Sets up the WordPress Environment. */
 require( dirname(__FILE__) . '/wp-load.php' );
 
-add_action( 'wp_head', 'wp_no_robots' );
-
 require( dirname( __FILE__ ) . '/wp-blog-header.php' );
 
 if ( is_array( get_site_option( 'illegal_names' )) && isset( $_GET[ 'new' ] ) && in_array( $_GET[ 'new' ], get_site_option( 'illegal_names' ) ) ) {
@@ -12 +10 @@
         die();
 }
 
-/**
- * Prints signup_header via wp_head
- *
- * @since MU
- */
-function do_signup_header() {
-        /**
-         * Fires within the head section of the site sign-up screen.
-         *
-         * @since 3.0.0
-         */
-        do_action( 'signup_header' );
-}
-add_action( 'wp_head', 'do_signup_header' );
-
-if ( !is_multisite() ) {
+if ( ! is_multisite() ) {
         wp_redirect( wp_registration_url() );
         die();
 }
 
-if ( !is_main_site() ) {
+if ( ! is_main_site() ) {
         wp_redirect( network_site_url( 'wp-signup.php' ) );
         die();
 }
@@ -41 +24 @@
 $wp_query->is_404 = false;
 
 /**
- * Fires before the Site Signup page is loaded.
- *
- * @since 4.4.0
- */
-do_action( 'before_signup_header' );
-
-/**
- * Prints styles for front-end Multisite signup pages
- *
- * @since MU
- */
-function wpmu_signup_stylesheet() {
-        ?>
-        <style type="text/css">
-                .mu_register { width: 90%; margin:0 auto; }
-                .mu_register form { margin-top: 2em; }
-                .mu_register .error { font-weight:700; padding:10px; color:#333333; background:#FFEBE8; border:1px solid #CC0000; }
-                .mu_register input[type="submit"],
-                        .mu_register #blog_title,
-                        .mu_register #user_email,
-                        .mu_register #blogname,
-                        .mu_register #user_name { width:100%; font-size: 24px; margin:5px 0; }
-                .mu_register #site-language { display: block; }
-                .mu_register .prefix_address,
-                        .mu_register .suffix_address {font-size: 18px;display:inline; }
-                .mu_register label { font-weight:700; font-size:15px; display:block; margin:10px 0; }
-                .mu_register label.checkbox { display:inline; }
-                .mu_register .mu_alert { font-weight:700; padding:10px; color:#333333; background:#ffffe0; border:1px solid #e6db55; }
-        </style>
-        <?php
-}
-
-add_action( 'wp_head', 'wpmu_signup_stylesheet' );
-get_header( 'wp-signup' );
-
-/**
- * Fires before the site sign-up form.
+ * Filters the type of site sign-up.
  *
  * @since 3.0.0
- */
-do_action( 'before_signup_form' );
-?>
-<div id="signup-content" class="widecolumn">
-<div class="mu_register wp-signup-container">
-<?php
-/**
- * Generates and displays the Signup and Create Site forms
- *
- * @since MU
- *
- * @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 show_blog_form( $blogname = '', $blog_title = '', $errors = '' ) {
-        if ( ! is_wp_error( $errors ) ) {
-                $errors = new WP_Error();
-        }
-
-        $current_network = get_network();
-        // Blog name
-        if ( !is_subdomain_install() )
-                echo '<label for="blogname">' . __('Site Name:') . '</label>';
-        else
-                echo '<label for="blogname">' . __('Site Domain:') . '</label>';
-
-        if ( $errmsg = $errors->get_error_message('blogname') ) { ?>
-                <p class="error"><?php echo $errmsg ?></p>
-        <?php }
-
-        if ( !is_subdomain_install() )
-                echo '<span class="prefix_address">' . $current_network->domain . $current_network->path . '</span><input name="blogname" type="text" id="blogname" value="'. esc_attr($blogname) .'" maxlength="60" /><br />';
-        else
-                echo '<input name="blogname" type="text" id="blogname" value="'.esc_attr($blogname).'" maxlength="60" /><span class="suffix_address">.' . ( $site_domain = preg_replace( '|^www\.|', '', $current_network->domain ) ) . '</span><br />';
-
-        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 '<p>(<strong>' . sprintf( __( 'Your address will be %s.' ), $site ) . '</strong>) ' . __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed, so choose carefully!' ) . '</p>';
-        }
-
-        // Blog Title
-        ?>
-        <label for="blog_title"><?php _e('Site Title:') ?></label>
-        <?php if ( $errmsg = $errors->get_error_message('blog_title') ) { ?>
-                <p class="error"><?php echo $errmsg ?></p>
-        <?php }
-        echo '<input name="blog_title" type="text" id="blog_title" value="'.esc_attr($blog_title).'" />';
-        ?>
-
-        <?php
-        // Site Language.
-        $languages = signup_get_available_languages();
-
-        if ( ! empty( $languages ) ) :
-                ?>
-                <p>
-                        <label for="site-language"><?php _e( 'Site Language:' ); ?></label>
-                        <?php
-                        // Network default.
-                        $lang = get_site_option( 'WPLANG' );
-
-                        if ( isset( $_POST['WPLANG'] ) ) {
-                                $lang = $_POST['WPLANG'];
-                        }
-
-                        // Use US English if the default isn't available.
-                        if ( ! in_array( $lang, $languages ) ) {
-                                $lang = '';
-                        }
-
-                        wp_dropdown_languages( array(
-                                'name'                        => 'WPLANG',
-                                'id'                          => 'site-language',
-                                'selected'                    => $lang,
-                                'languages'                   => $languages,
-                                'show_available_translations' => false,
-                        ) );
-                        ?>
-                </p>
-        <?php endif; // Languages. ?>
-
-        <div id="privacy">
-        <p class="privacy-intro">
-            <label for="blog_public_on"><?php _e('Privacy:') ?></label>
-            <?php _e( 'Allow search engines to index this site.' ); ?>
-            <br style="clear:both" />
-            <label class="checkbox" for="blog_public_on">
-                <input type="radio" id="blog_public_on" name="blog_public" value="1" <?php if ( !isset( $_POST['blog_public'] ) || $_POST['blog_public'] == '1' ) { ?>checked="checked"<?php } ?> />
-                <strong><?php _e( 'Yes' ); ?></strong>
-            </label>
-            <label class="checkbox" for="blog_public_off">
-                <input type="radio" id="blog_public_off" name="blog_public" value="0" <?php if ( isset( $_POST['blog_public'] ) && $_POST['blog_public'] == '0' ) { ?>checked="checked"<?php } ?> />
-                <strong><?php _e( 'No' ); ?></strong>
-            </label>
-        </p>
-        </div>
-
-        <?php
-        /**
-         * Fires after the site sign-up form.
-         *
-         * @since 3.0.0
-         *
-         * @param WP_Error $errors A WP_Error object possibly containing 'blogname' or 'blog_title' errors.
-         */
-        do_action( 'signup_blogform', $errors );
-}
-
-/**
- * Validate the new site signup
- *
- * @since MU
  *
- * @return array Contains the new site data and error messages.
- */
-function validate_blog_form() {
-        $user = '';
-        if ( is_user_logged_in() )
-                $user = wp_get_current_user();
-
-        return wpmu_validate_blog_signup($_POST['blogname'], $_POST['blog_title'], $user);
-}
-
-/**
- * Display user registration form
- *
- * @since MU
- *
- * @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 '<label for="user_name">' . __('Username:') . '</label>';
-        if ( $errmsg = $errors->get_error_message('user_name') ) {
-                echo '<p class="error">'.$errmsg.'</p>';
-        }
-        echo '<input name="user_name" type="text" id="user_name" value="'. esc_attr( $user_name ) .'" autocapitalize="none" autocorrect="off" maxlength="60" /><br />';
-        _e( '(Must be at least 4 characters, letters and numbers only.)' );
-        ?>
-
-        <label for="user_email"><?php _e( 'Email&nbsp;Address:' ) ?></label>
-        <?php if ( $errmsg = $errors->get_error_message('user_email') ) { ?>
-                <p class="error"><?php echo $errmsg ?></p>
-        <?php } ?>
-        <input name="user_email" type="email" id="user_email" value="<?php  echo esc_attr($user_email) ?>" maxlength="200" /><br /><?php _e('We send your registration email to this address. (Double-check your email address before continuing.)') ?>
-        <?php
-        if ( $errmsg = $errors->get_error_message('generic') ) {
-                echo '<p class="error">' . $errmsg . '</p>';
-        }
-        /**
-         * Fires at the end of the user registration form on the site sign-up form.
-         *
-         * @since 3.0.0
-         *
-         * @param WP_Error $errors A WP_Error object containing containing 'user_name' or 'user_email' errors.
-         */
-        do_action( 'signup_extra_fields', $errors );
-}
-
-/**
- * Validate user signup name and email
- *
- * @since MU
- *
- * @return array Contains username, email, and error messages.
- */
-function validate_user_form() {
-        return wpmu_validate_user_signup($_POST['user_name'], $_POST['user_email']);
-}
-
-/**
- * Allow returning users to sign up for another site
- *
- * @since MU
- *
- * @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 = '' ) {
-        $current_user = wp_get_current_user();
-
-        if ( ! is_wp_error($errors) ) {
-                $errors = new WP_Error();
-        }
-
-        $signup_defaults = array(
-                'blogname'   => $blogname,
-                'blog_title' => $blog_title,
-                'errors'     => $errors
-        );
-
-        /**
-         * 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 WP_Error $errors     A WP_Error object possibly containing 'blogname' or 'blog_title' errors.
-         * }
-         */
-        $filtered_results = apply_filters( 'signup_another_blog_init', $signup_defaults );
-
-        $blogname = $filtered_results['blogname'];
-        $blog_title = $filtered_results['blog_title'];
-        $errors = $filtered_results['errors'];
-
-        echo '<h2>' . sprintf( __( 'Get <em>another</em> %s site in seconds' ), get_network()->site_name ) . '</h2>';
-
-        if ( $errors->get_error_code() ) {
-                echo '<p>' . __( 'There was a problem, please correct the form below and try again.' ) . '</p>';
-        }
-        ?>
-        <p><?php printf( __( 'Welcome back, %s. By filling out the form below, you can <strong>add another site to your account</strong>. There is no limit to the number of sites you can have, so create to your heart&#8217;s content, but write responsibly!' ), $current_user->display_name ) ?></p>
-
-        <?php
-        $blogs = get_blogs_of_user($current_user->ID);
-        if ( !empty($blogs) ) { ?>
-
-                        <p><?php _e( 'Sites you are already a member of:' ) ?></p>
-                        <ul>
-                                <?php foreach ( $blogs as $blog ) {
-                                        $home_url = get_home_url( $blog->userblog_id );
-                                        echo '<li><a href="' . esc_url( $home_url ) . '">' . $home_url . '</a></li>';
-                                } ?>
-                        </ul>
-        <?php } ?>
-
-        <p><?php _e( 'If you&#8217;re not going to use a great site domain, leave it for a new user. Now have at it!' ) ?></p>
-        <form id="setupform" method="post" action="wp-signup.php">
-                <input type="hidden" name="stage" value="gimmeanotherblog" />
-                <?php
-                /**
-                 * Hidden sign-up form fields output when creating another site or user.
-                 *
-                 * @since MU
-                 *
-                 * @param string $context A string describing the steps of the sign-up process. The value can be
-                 *                        'create-another-site', 'validate-user', or 'validate-site'.
-                 */
-                do_action( 'signup_hidden_fields', 'create-another-site' );
-                ?>
-                <?php show_blog_form($blogname, $blog_title, $errors); ?>
-                <p class="submit"><input type="submit" name="submit" class="submit" value="<?php esc_attr_e( 'Create Site' ) ?>" /></p>
-        </form>
-        <?php
-}
-
-/**
- * Validate a new site signup.
- *
- * @since MU
- *
- * @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() ) {
-                die();
-        }
-
-        $result = validate_blog_form();
-
-        // 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);
-                return false;
-        }
-
-        $public = (int) $_POST['blog_public'];
-
-        $blog_meta_defaults = array(
-                'lang_id' => 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 ) {
-                                $blog_meta_defaults['WPLANG'] = $language;
-                        }
-                }
-
-        }
-
-        /**
-         * Filters the new site meta variables.
-         *
-         * Use the {@see 'add_signup_meta'} filter instead.
-         *
-         * @since MU
-         * @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_defaults = apply_filters( 'signup_create_blog_meta', $blog_meta_defaults );
-
-        /**
-         * Filters the new default site meta variables.
-         *
-         * @since 3.0.0
-         *
-         * @param array $meta {
-         *     An array of default site meta variables.
-         *
-         *     @type int $lang_id     The language ID.
-         *     @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_defaults );
-
-        $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.
- *
- * @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 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(), $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( '<a href="%1$s">%2$s</a>',
-                esc_url( $home_url ),
-                $blog_title
-        );
-
-        ?>
-        <h2><?php
-                /* translators: %s: site name */
-                printf( __( 'The site %s is yours.' ), $site );
-        ?></h2>
-        <p>
-                <?php printf(
-                        /* translators: 1: home URL, 2: site address, 3: login URL, 4: username */
-                        __( '<a href="%1$s">%2$s</a> is your new site. <a href="%3$s">Log in</a> as &#8220;%4$s&#8221; using your existing password.' ),
-                        esc_url( $home_url ),
-                        untrailingslashit( $domain . $path ),
-                        esc_url( $login_url ),
-                        $user_name
-                ); ?>
-        </p>
-        <?php
-        /**
-         * Fires when the site or user sign-up process is complete.
-         *
-         * @since 3.0.0
-         */
-        do_action( 'signup_finished' );
-}
-
-/**
- * Setup the new user signup process
- *
- * @since MU
- *
- * @param string          $user_name  The username.
- * @param string          $user_email The user's email.
- * @param WP_Error|string $errors     A WP_Error object containing existing errors. Defaults to empty string.
- */
-function signup_user( $user_name = '', $user_email = '', $errors = '' ) {
-        global $active_signup;
-
-        if ( !is_wp_error($errors) )
-                $errors = new WP_Error();
-
-        $signup_for = isset( $_POST[ 'signup_for' ] ) ? esc_html( $_POST[ 'signup_for' ] ) : 'blog';
-
-        $signup_user_defaults = array(
-                'user_name'  => $user_name,
-                'user_email' => $user_email,
-                'errors'     => $errors,
-        );
-
-        /**
-         * Filters the default user variables used on the user sign-up form.
-         *
-         * @since 3.0.0
-         *
-         * @param array $signup_user_defaults {
-         *     An array of default user variables.
-         *
-         *     @type string   $user_name  The user username.
-         *     @type string   $user_email The user email address.
-         *     @type WP_Error $errors     A WP_Error object with possible errors relevant to the sign-up user.
-         * }
-         */
-        $filtered_results = apply_filters( 'signup_user_init', $signup_user_defaults );
-        $user_name = $filtered_results['user_name'];
-        $user_email = $filtered_results['user_email'];
-        $errors = $filtered_results['errors'];
-
-        ?>
-
-        <h2><?php
-                /* translators: %s: name of the network */
-                printf( __( 'Get your own %s account in seconds' ), get_network()->site_name );
-        ?></h2>
-        <form id="setupform" method="post" action="wp-signup.php" novalidate="novalidate">
-                <input type="hidden" name="stage" value="validate-user-signup" />
-                <?php
-                /** This action is documented in wp-signup.php */
-                do_action( 'signup_hidden_fields', 'validate-user' );
-                ?>
-                <?php show_user_form($user_name, $user_email, $errors); ?>
-
-                <p>
-                <?php if ( $active_signup == 'blog' ) { ?>
-                        <input id="signupblog" type="hidden" name="signup_for" value="blog" />
-                <?php } elseif ( $active_signup == 'user' ) { ?>
-                        <input id="signupblog" type="hidden" name="signup_for" value="user" />
-                <?php } else { ?>
-                        <input id="signupblog" type="radio" name="signup_for" value="blog" <?php checked( $signup_for, 'blog' ); ?> />
-                        <label class="checkbox" for="signupblog"><?php _e('Gimme a site!') ?></label>
-                        <br />
-                        <input id="signupuser" type="radio" name="signup_for" value="user" <?php checked( $signup_for, 'user' ); ?> />
-                        <label class="checkbox" for="signupuser"><?php _e('Just a username, please.') ?></label>
-                <?php } ?>
-                </p>
-
-                <p class="submit"><input type="submit" name="submit" class="submit" value="<?php esc_attr_e('Next') ?>" /></p>
-        </form>
-        <?php
-}
-
-/**
- * Validate the new user signup
- *
- * @since MU
- *
- * @return bool True if new user signup was validated, false if error
- */
-function validate_user_signup() {
-        $result = validate_user_form();
-        $user_name = $result['user_name'];
-        $user_email = $result['user_email'];
-        $errors = $result['errors'];
-
-        if ( $errors->get_error_code() ) {
-                signup_user($user_name, $user_email, $errors);
-                return false;
-        }
-
-        if ( 'blog' == $_POST['signup_for'] ) {
-                signup_blog($user_name, $user_email);
-                return false;
-        }
-
-        /** This filter is documented in wp-signup.php */
-        wpmu_signup_user( $user_name, $user_email, apply_filters( 'add_signup_meta', array() ) );
-
-        confirm_user_signup($user_name, $user_email);
-        return true;
-}
-
-/**
- * New user signup confirmation
- *
- * @since MU
- *
- * @param string $user_name The username
- * @param string $user_email The user's email address
- */
-function confirm_user_signup($user_name, $user_email) {
-        ?>
-        <h2><?php /* translators: %s: username */
-        printf( __( '%s is your new username' ), $user_name) ?></h2>
-        <p><?php _e( 'But, before you can start using your new username, <strong>you must activate it</strong>.' ) ?></p>
-        <p><?php /* translators: %s: email address */
-        printf( __( 'Check your inbox at %s and click the link given.' ), '<strong>' . $user_email . '</strong>' ); ?></p>
-        <p><?php _e( 'If you do not activate your username within two days, you will have to sign up again.' ); ?></p>
-        <?php
-        /** This action is documented in wp-signup.php */
-        do_action( 'signup_finished' );
-}
-
-/**
- * Setup the new site signup
- *
- * @since MU
- *
- * @param string          $user_name  The username.
- * @param string          $user_email The user's email address.
- * @param string          $blogname   The site name.
- * @param string          $blog_title The site title.
- * @param WP_Error|string $errors     A WP_Error object containing existing errors. Defaults to empty string.
- */
-function signup_blog($user_name = '', $user_email = '', $blogname = '', $blog_title = '', $errors = '') {
-        if ( !is_wp_error($errors) )
-                $errors = new WP_Error();
-
-        $signup_blog_defaults = array(
-                'user_name'  => $user_name,
-                'user_email' => $user_email,
-                'blogname'   => $blogname,
-                'blog_title' => $blog_title,
-                'errors'     => $errors
-        );
-
-        /**
-         * Filters the default site creation variables for the site sign-up form.
-         *
-         * @since 3.0.0
-         *
-         * @param array $signup_blog_defaults {
-         *     An array of default site creation variables.
-         *
-         *     @type string   $user_name  The user username.
-         *     @type string   $user_email The user email address.
-         *     @type string   $blogname   The blogname.
-         *     @type string   $blog_title The title of the site.
-         *     @type WP_Error $errors     A WP_Error object with possible errors relevant to new site creation variables.
-         * }
-         */
-        $filtered_results = apply_filters( 'signup_blog_init', $signup_blog_defaults );
-
-        $user_name = $filtered_results['user_name'];
-        $user_email = $filtered_results['user_email'];
-        $blogname = $filtered_results['blogname'];
-        $blog_title = $filtered_results['blog_title'];
-        $errors = $filtered_results['errors'];
-
-        if ( empty($blogname) )
-                $blogname = $user_name;
-        ?>
-        <form id="setupform" method="post" action="wp-signup.php">
-                <input type="hidden" name="stage" value="validate-blog-signup" />
-                <input type="hidden" name="user_name" value="<?php echo esc_attr($user_name) ?>" />
-                <input type="hidden" name="user_email" value="<?php echo esc_attr($user_email) ?>" />
-                <?php
-                /** This action is documented in wp-signup.php */
-                do_action( 'signup_hidden_fields', 'validate-site' );
-                ?>
-                <?php show_blog_form($blogname, $blog_title, $errors); ?>
-                <p class="submit"><input type="submit" name="submit" class="submit" value="<?php esc_attr_e('Signup') ?>" /></p>
-        </form>
-        <?php
-}
-
-/**
- * Validate new site signup
- *
- * @since MU
- *
- * @return bool True if the site signup was validated, false if error
- */
-function validate_blog_signup() {
-        // Re-validate user info.
-        $user_result = wpmu_validate_user_signup( $_POST['user_name'], $_POST['user_email'] );
-        $user_name = $user_result['user_name'];
-        $user_email = $user_result['user_email'];
-        $user_errors = $user_result['errors'];
-
-        if ( $user_errors->get_error_code() ) {
-                signup_user( $user_name, $user_email, $user_errors );
-                return false;
-        }
-
-        $result = wpmu_validate_blog_signup( $_POST['blogname'], $_POST['blog_title'] );
-        $domain = $result['domain'];
-        $path = $result['path'];
-        $blogname = $result['blogname'];
-        $blog_title = $result['blog_title'];
-        $errors = $result['errors'];
-
-        if ( $errors->get_error_code() ) {
-                signup_blog($user_name, $user_email, $blogname, $blog_title, $errors);
-                return false;
-        }
-
-        $public = (int) $_POST['blog_public'];
-        $signup_meta = array ('lang_id' => 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 );
-
-        wpmu_signup_blog($domain, $path, $blog_title, $user_name, $user_email, $meta);
-        confirm_blog_signup($domain, $path, $blog_title, $user_name, $user_email, $meta);
-        return true;
-}
-
-/**
- * New site signup confirmation
- *
- * @since MU
- *
- * @param string $domain The domain URL
- * @param string $path The site root path
- * @param string $blog_title The new site title
- * @param string $user_name The user's 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 string $active_signup String that returns registration type. The value can be
+ *                              'all', 'none', 'blog', or 'user'.
  */
-function confirm_blog_signup( $domain, $path, $blog_title, $user_name = '', $user_email = '', $meta = array() ) {
-        ?>
-        <h2><?php /* translators: %s: site address */
-        printf( __( 'Congratulations! Your new site, %s, is almost ready.' ), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" ) ?></h2>
+$active_signup = apply_filters( 'wpmu_active_signup', get_site_option( 'registration', 'none' ) );
 
-        <p><?php _e( 'But, before you can start using your site, <strong>you must activate it</strong>.' ) ?></p>
-        <p><?php /* translators: %s: email address */
-        printf( __( 'Check your inbox at %s and click the link given.' ), '<strong>' . $user_email . '</strong>' ); ?></p>
-        <p><?php _e( 'If you do not activate your site within two days, you will have to sign up again.' ); ?></p>
-        <h2><?php _e( 'Still waiting for your email?' ); ?></h2>
-        <p>
-                <?php _e( 'If you haven&#8217;t received your email yet, there are a number of things you can do:' ) ?>
-                <ul id="noemail-tips">
-                        <li><p><strong><?php _e( 'Wait a little longer. Sometimes delivery of email can be delayed by processes outside of our control.' ) ?></strong></p></li>
-                        <li><p><?php _e( 'Check the junk or spam folder of your email client. Sometime emails wind up there by mistake.' ) ?></p></li>
-                        <li><?php
-                                /* translators: %s: email address */
-                                printf( __( 'Have you entered your email correctly? You have entered %s, if it&#8217;s incorrect, you will not receive your email.' ), $user_email );
-                        ?></li>
-                </ul>
-        </p>
-        <?php
-        /** This action is documented in wp-signup.php */
-        do_action( 'signup_finished' );
-}
+// Handle signup stage
+signup_handle_stage();
 
 /**
- * Retrieves languages available during the site/user signup process.
+ * Fires before the Site Signup page is loaded.
  *
  * @since 4.4.0
- *
- * @see get_available_languages()
- *
- * @return array List of available languages.
  */
-function signup_get_available_languages() {
-        /**
-         * Filters 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() );
+do_action( 'before_signup_header' );
 
-        /*
-         * 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() );
-}
+// Add signup headers.
+signup_head_actions();
 
-// Main
-$active_signup = get_site_option( 'registration', 'none' );
+// Load the signup header
+get_header( 'wp-signup' );
 
 /**
- * Filters the type of site sign-up.
+ * Fires before the site sign-up form.
  *
  * @since 3.0.0
- *
- * @param string $active_signup String that returns registration type. The value can be
- *                              'all', 'none', 'blog', or 'user'.
  */
-$active_signup = apply_filters( 'wpmu_active_signup', $active_signup );
-
-if ( current_user_can( 'manage_network' ) ) {
-        echo '<div class="mu_alert">';
-        _e( 'Greetings Network Administrator!' );
-        echo ' ';
-
-        switch ( $active_signup ) {
-                case 'none':
-                        _e( 'The network currently disallows registrations.' );
-                        break;
-                case 'blog':
-                        _e( 'The network currently allows site registrations.' );
-                        break;
-                case 'user':
-                        _e( 'The network currently allows user registrations.' );
-                        break;
-                default:
-                        _e( 'The network currently allows both site and user registrations.' );
-                        break;
-        }
-
-        echo ' ';
-
-        /* translators: %s: network settings URL */
-        printf( __( 'To change or disable registration go to your <a href="%s">Options page</a>.' ), esc_url( network_admin_url( 'settings.php' ) ) );
-        echo '</div>';
-}
-
-$newblogname = isset($_GET['new']) ? strtolower(preg_replace('/^-|-$|[^-a-zA-Z0-9]/', '', $_GET['new'])) : null;
-
-$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 = wp_login_url( network_site_url( 'wp-signup.php' ) );
-        /* translators: %s: login URL */
-        printf( __( 'You must first <a href="%s">log in</a>, and then you can create a new site.' ), $login_url );
-} else {
-        $stage = isset( $_POST['stage'] ) ?  $_POST['stage'] : 'default';
-        switch ( $stage ) {
-                case 'validate-user-signup' :
-                        if ( $active_signup == 'all' || $_POST[ 'signup_for' ] == 'blog' && $active_signup == 'blog' || $_POST[ 'signup_for' ] == 'user' && $active_signup == 'user' )
-                                validate_user_signup();
-                        else
-                                _e( 'User registration has been disabled.' );
-                break;
-                case 'validate-blog-signup':
-                        if ( $active_signup == 'all' || $active_signup == 'blog' )
-                                validate_blog_signup();
-                        else
-                                _e( 'Site registration has been disabled.' );
-                        break;
-                case 'gimmeanotherblog':
-                        validate_another_blog_signup();
-                        break;
-                case 'default':
-                default :
-                        $user_email = isset( $_POST[ 'user_email' ] ) ? $_POST[ 'user_email' ] : '';
-                        /**
-                         * Fires when the site sign-up form is sent.
-                         *
-                         * @since 3.0.0
-                         */
-                        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() && ( $active_signup == 'all' || $active_signup == 'user' ) )
-                                signup_user( $newblogname, $user_email );
-                        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!' );
+do_action( 'before_signup_form' );
 
-                        if ( $newblogname ) {
-                                $newblog = get_blogaddress_by_name( $newblogname );
+// Display the signup template
+get_template_part( 'signup' );
 
-                                if ( $active_signup == 'blog' || $active_signup == 'all' )
-                                        /* translators: %s: site address */
-                                        printf( '<p><em>' . __( 'The site you were looking for, %s, does not exist, but you can create it now!' ) . '</em></p>',
-                                                '<strong>' . $newblog . '</strong>'
-                                        );
-                                else
-                                        /* translators: %s: site address */
-                                        printf( '<p><em>' . __( 'The site you were looking for, %s, does not exist.' ) . '</em></p>',
-                                                '<strong>' . $newblog . '</strong>'
-                                        );
-                        }
-                        break;
-        }
-}
-?>
-</div>
-</div>
-<?php
 /**
  * Fires after the sign-up forms, before wp_footer.
  *
  * @since 3.0.0
  */
-do_action( 'after_signup_form' ); ?>
+do_action( 'after_signup_form' );
 
-<?php get_footer( 'wp-signup' );
+// Load the signup footer
+get_footer( 'wp-signup' );