Index: src/wp-signup.php
===================================================================
--- src/wp-signup.php	(revision 34820)
+++ src/wp-signup.php	(working copy)
@@ -1,13 +1,13 @@
 <?php
 
 /** Sets up the WordPress Environment. */
-require( dirname(__FILE__) . '/wp-load.php' );
+require( dirname( __FILE__ ) . '/wp-load.php' );
 
 add_action( 'wp_head', 'wp_no_robots' );
 
 require( dirname( __FILE__ ) . '/wp-blog-header.php' );
 
-if ( is_array( get_network_option( 'illegal_names' ) ) && isset( $_GET[ 'new' ] ) && in_array( $_GET[ 'new' ], get_network_option( 'illegal_names' ) ) ) {
+if ( is_array( get_network_option( 'illegal_names' ) ) && isset( $_GET['new'] ) && in_array( $_GET['new'], get_network_option( 'illegal_names' ) ) ) {
 	wp_redirect( network_home_url() );
 	die();
 }
@@ -25,18 +25,36 @@
 	 */
 	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();
 }
 
+$network_site_url = network_site_url( 'wp-signup.php' );
+/**
+ * Filter the signup location for this WordPress installation.
+ *
+ * @since 4.3.0
+ *
+ * @param string $network_site_url URL of the signup page for WordPress.
+ */
+$signup_location       = apply_filters( 'wp_signup_location', $network_site_url );
+$signup_location_parts = explode( '?', $signup_location );
+
+// Redirect to the true signup location if the URL differs from default.
+if ( $signup_location_parts[0] !== $network_site_url ) {
+	wp_redirect( $signup_location );
+	exit;
+}
+
 // Fix for page title
 $wp_query->is_404 = false;
 
@@ -48,24 +66,69 @@
 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 {
+			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 #blog_title,
+		.mu_register #user_email,
+		.mu_register #blogname,
+		.mu_register #user_name {
+			width: 100%;
+			font-size: 24px;
+			margin: 5px 0;
+		}
+
 		.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; }
+		.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' );
+
+/**
+ * Fires just before the site sign-up header.
+ *
+ * @since 4.4.0
+ */
+do_action( 'before_signup_header ' );
 get_header();
 
 /**
@@ -76,681 +139,717 @@
 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 array $errors
- */
-function show_blog_form( $blogname = '', $blog_title = '', $errors = '' ) {
-	$current_site = get_current_site();
-	// Blog name
-	if ( !is_subdomain_install() )
-		echo '<label for="blogname">' . __('Site Name:') . '</label>';
-	else
-		echo '<label for="blogname">' . __('Site Domain:') . '</label>';
+	<div class="mu_register wp-signup-container">
+		<?php
+		/**
+		 * Generates and displays the Signup and Create Site forms
+		 *
+		 * @since MU
+		 *
+		 * @param string $blogname
+		 * @param string $blog_title
+		 * @param WP_Error $errors
+		 */
+		function show_blog_form( $blogname = '', $blog_title = '', $errors = null ) {
+			$current_site = get_current_site();
+			// 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 ( $errmsg = $errors->get_error_message( 'blogname' ) ) { ?>
+				<p class="error"><?php echo $errmsg ?></p>
+			<?php }
 
-	if ( !is_subdomain_install() )
-		echo '<span class="prefix_address">' . $current_site->domain . $current_site->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_site->domain ) ) . '</span><br />';
+			if ( ! is_subdomain_install() ) {
+				echo '<span class="prefix_address">' . $current_site->domain . $current_site->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_site->domain ) ) . '</span><br />';
+			}
 
-	if ( !is_user_logged_in() ) {
-		if ( !is_subdomain_install() )
-			$site = $current_site->domain . $current_site->path . __( 'sitename' );
-		else
-			$site = __( 'domain' ) . '.' . $site_domain . $current_site->path;
-		echo '<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>';
-	}
+			if ( ! is_user_logged_in() ) {
+				if ( ! is_subdomain_install() ) {
+					$site = $current_site->domain . $current_site->path . __( 'sitename' );
+				} else {
+					$site = __( 'domain' ) . '.' . $site_domain . $current_site->path;
+				}
+				echo '<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).'" />';
-	?>
+			// 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 ) . '" />';
+			?>
 
-	<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>
+			<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'] ) || '1' == $_POST['blog_public'] ) { ?>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'] ) && '0' == $_POST['blog_public'] ) { ?>checked="checked"<?php } ?> />
+						<strong><?php _e( 'No' ); ?></strong>
+					</label>
+				</p>
+			</div>
 
-	<?php
-	/**
-	 * Fires after the site sign-up form.
-	 *
-	 * @since 3.0.0
-	 *
-	 * @param array $errors An array possibly containing 'blogname' or 'blog_title' errors.
-	 */
-	do_action( 'signup_blogform', $errors );
-}
+			<?php
+			/**
+			 * Fires after the site sign-up form.
+			 *
+			 * @since 3.0.0
+			 *
+			 * @param array $errors An array 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();
+		/**
+		 * 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);
-}
+			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 array $errors
- */
-function show_user_form($user_name = '', $user_email = '', $errors = '') {
-	// 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) .'" maxlength="60" /><br />';
-	_e( '(Must be at least 4 characters, letters and numbers only.)' );
-	?>
+		/**
+		 * Display user registration form
+		 *
+		 * @since MU
+		 *
+		 * @param string $user_name The entered username
+		 * @param string $user_email The entered email address
+		 * @param WP_Error $errors
+		 */
+		function show_user_form( $user_name = '', $user_email = '', $errors = null ) {
 
-	<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 array $errors An array possibly containing 'user_name' or 'user_email' errors.
-	 */
-	do_action( 'signup_extra_fields', $errors );
-}
+			// 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 ) . '" maxlength="60" /><br />';
+			_e( '(Must be at least 4 characters, letters and numbers only.)' );
+			?>
 
-/**
- * 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']);
-}
+			<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 array $errors An array possibly containing 'user_name' or 'user_email' errors.
+			 */
+			do_action( 'signup_extra_fields', $errors );
+		}
 
-/**
- * Allow returning users to sign up for another site
- *
- * @since MU
- *
- * @param string $blogname The new site name
- * @param string $blog_title The new blog title
- * @param array $errors
- */
-function signup_another_blog( $blogname = '', $blog_title = '', $errors = '' ) {
-	$current_user = wp_get_current_user();
+		/**
+		 * 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'] );
+		}
 
-	if ( ! is_wp_error($errors) ) {
-		$errors = new WP_Error();
-	}
+		/**
+		 * Allow returning users to sign up for another site
+		 *
+		 * since MU
+		 *
+		 * @param string $blogname The new site name
+		 * @param string $blog_title The new blog title
+		 * @param WP_Error $errors
+		 */
+		function signup_another_blog( $blogname = '', $blog_title = '', $errors = null ) {
+			$current_user = wp_get_current_user();
 
-	$signup_defaults = array(
-		'blogname'   => $blogname,
-		'blog_title' => $blog_title,
-		'errors'     => $errors
-	);
+			if ( ! is_wp_error( $errors ) ) {
+				$errors = new WP_Error();
+			}
 
-	/**
-	 * Filter the default site sign-up variables.
-	 *
-	 * @since 3.0.0
-	 *
-	 * @param array $signup_defaults {
-	 *     An array of default site sign-up variables.
-	 *
-	 *     @type string $blogname   The site blogname.
-	 *     @type string $blog_title The site title.
-	 *     @type array  $errors     An array possibly containing 'blogname' or 'blog_title' errors.
-	 * }
-	 */
-	$filtered_results = apply_filters( 'signup_another_blog_init', $signup_defaults );
+			$signup_defaults = array(
+				'blogname'   => $blogname,
+				'blog_title' => $blog_title,
+				'errors'     => $errors,
+			);
 
-	$blogname = $filtered_results['blogname'];
-	$blog_title = $filtered_results['blog_title'];
-	$errors = $filtered_results['errors'];
+			/**
+			 * Filter the default site sign-up variables.
+			 *
+			 * @since 3.0.0
+			 *
+			 * @param array $signup_defaults {
+			 *     An array of default site sign-up variables.
+			 *
+			 * @type string $blogname The site blogname.
+			 * @type string $blog_title The site title.
+			 * @type array $errors An array possibly containing 'blogname' or 'blog_title' errors.
+			 * }
+			 */
+			$filtered_results = apply_filters( 'signup_another_blog_init', $signup_defaults );
 
-	echo '<h2>' . sprintf( __( 'Get <em>another</em> %s site in seconds' ), get_current_site()->site_name ) . '</h2>';
+			$blogname   = $filtered_results['blogname'];
+			$blog_title = $filtered_results['blog_title'];
+			$errors     = $filtered_results['errors'];
 
-	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>
+			echo '<h2>' . sprintf( __( 'Get <em>another</em> %s site in seconds' ), get_current_site()->site_name ) . '</h2>';
 
-	<?php
-	$blogs = get_blogs_of_user($current_user->ID);
-	if ( !empty($blogs) ) { ?>
+			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>
 
-			<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 } ?>
+			<?php
+			$blogs = get_blogs_of_user( $current_user->ID );
+			if ( ! empty( $blogs ) ) { ?>
 
-	<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
+				<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
+		}
+
 		/**
-		 * Hidden sign-up form fields output when creating another site or user.
+		 * Validate a new blog signup
 		 *
 		 * @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'.
+		 * @return null|bool True if blog signup was validated, false if error.
+		 *                   The function halts all execution if the user is not logged in.
 		 */
-		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
-}
+		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();
+			}
 
-/**
- * Validate a new blog signup
- *
- * @since MU
- *
- * @return null|bool True if blog signup was validated, false if error.
- *                   The function halts all execution if the user is not logged in.
- */
-function validate_another_blog_signup() {
-	global $wpdb, $blogname, $blog_title, $errors, $domain, $path;
-	$current_user = wp_get_current_user();
-	if ( ! is_user_logged_in() ) {
-		die();
-	}
+			$result = validate_blog_form();
 
-	$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'];
 
-	// 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 );
 
-	if ( $errors->get_error_code() ) {
-		signup_another_blog($blogname, $blog_title, $errors);
-		return false;
-	}
+				return false;
+			}
 
-	$public = (int) $_POST['blog_public'];
+			$public = (int) $_POST['blog_public'];
 
-	$blog_meta_defaults = array(
-		'lang_id' => 1,
-		'public'  => $public
-	);
+			$blog_meta_defaults = array(
+				'lang_id' => 1,
+				'public'  => $public,
+			);
 
-	/**
-	 * Filter the new site meta variables.
-	 *
-	 * @since MU
-	 * @deprecated 3.0.0 Use the '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 );
-	/**
-	 * Filter 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 );
+			/**
+			 * Filter the new site meta variables.
+			 *
+			 * @since MU
+			 * @deprecated 3.0.0 Use the '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 );
+			/**
+			 * Filter 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 );
+			$blog_id = wpmu_create_blog( $domain, $path, $blog_title, $current_user->ID, $meta, $wpdb->siteid );
 
-	if ( is_wp_error( $blog_id ) ) {
-		return false;
-	}
+			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_another_blog_signup( $domain, $path, $blog_title, $current_user->user_login, $current_user->user_email, $meta, $blog_id );
 
-/**
- * Confirm a new site signup
- *
- * @since MU
- * @since 4.4.0 Added the `$blog_id` parameter.
- *
- * @param string $domain The domain URL
- * @param string $path The site root path
- * @param string $blog_title The blog title
- * @param string $user_name The username
- * @param string $user_email The user's email address
- * @param array  $meta Any additional meta from the 'add_signup_meta' filter in validate_blog_signup()
- * @param int    $blog_id The blog ID
- */
-function confirm_another_blog_signup( $domain, $path, $blog_title, $user_name, $user_email = '', $meta = array(), $blog_id = 0 ) {
+			return true;
+		}
 
-	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';
-	}
+		/**
+		 * Confirm a new site signup
+		 *
+		 * @since MU
+		 * @since 4.4.0 Added the `$blog_id` parameter.
+		 *
+		 * @param string $domain The domain URL
+		 * @param string $path The site root path
+		 * @param string $blog_title The blog title
+		 * @param string $user_name The username
+		 * @param string $user_email The user's email address
+		 * @param array $meta Any additional meta from the 'add_signup_meta' filter in validate_blog_signup()
+		 * @param int $blog_id The blog ID
+		 */
+		function confirm_another_blog_signup( $domain, $path, $blog_title, $user_name, $user_email = '', $meta = array(), $blog_id = 0 ) {
 
-	$site = sprintf( '<a href="%1$s">%2$s</a>',
-		esc_url( $home_url ),
-		$blog_title
-	);
+			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';
+			}
 
-	?>
-	<h2><?php printf( __( 'The site %s is yours.' ), $site ); ?></h2>
-	<p>
-		<?php printf(
-			__( '<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' );
-}
+			$site = sprintf( '<a href="%1$s">%2$s</a>',
+				esc_url( $home_url ),
+				$blog_title
+			);
 
-/**
- * Setup the new user signup process
- *
- * @since MU
- *
- * @param string $user_name The username
- * @param string $user_email The user's email
- * @param array $errors
- */
-function signup_user( $user_name = '', $user_email = '', $errors = '' ) {
-	global $active_signup;
+			?>
+			<h2><?php printf( __( 'The site %s is yours.' ), $site ); ?></h2>
+			<p>
+				<?php
+				printf(
+					__(	'<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' );
+		}
 
-	if ( !is_wp_error($errors) )
-		$errors = new WP_Error();
+		/**
+		 * Setup the new user signup process
+		 *
+		 * @since MU
+		 *
+		 * @param string $user_name The username
+		 * @param string $user_email The user's email
+		 * @param array $errors
+		 */
+		function signup_user( $user_name = '', $user_email = '', $errors = array() ) {
+			global $active_signup;
 
-	$signup_for = isset( $_POST[ 'signup_for' ] ) ? esc_html( $_POST[ 'signup_for' ] ) : 'blog';
+			if ( ! is_wp_error( $errors ) ) {
+				$errors = new WP_Error();
+			}
 
-	$signup_user_defaults = array(
-		'user_name'  => $user_name,
-		'user_email' => $user_email,
-		'errors'     => $errors,
-	);
+			$signup_for = isset( $_POST['signup_for'] ) ? esc_html( $_POST['signup_for'] ) : 'blog';
 
-	/**
-	 * Filter 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 array  $errors     An array of 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'];
+			$signup_user_defaults = array(
+				'user_name'  => $user_name,
+				'user_email' => $user_email,
+				'errors'     => $errors,
+			);
 
-	?>
+			/**
+			 * Filter 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 array $errors An array of 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 printf( __( 'Get your own %s account in seconds' ), get_current_site()->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>
+			<h2><?php printf( __( 'Get your own %s account in seconds' ), get_current_site()->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 class="submit"><input type="submit" name="submit" class="submit" value="<?php esc_attr_e('Next') ?>" /></p>
-	</form>
-	<?php
-}
+				<p>
+					<?php if ( 'blog' === $active_signup  ) { ?>
+						<input id="signupblog" type="hidden" name="signup_for" value="blog"/>
+					<?php } elseif ( 'user' === $active_signup ) { ?>
+						<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>
 
-/**
- * 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'];
+				<p class="submit"><input type="submit" name="submit" class="submit"
+				                         value="<?php esc_attr_e( 'Next' ) ?>"/></p>
+			</form>
+			<?php
+		}
 
-	if ( $errors->get_error_code() ) {
-		signup_user($user_name, $user_email, $errors);
-		return false;
-	}
+		/**
+		 * 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 ( 'blog' == $_POST['signup_for'] ) {
-		signup_blog($user_name, $user_email);
-		return false;
-	}
+			if ( $errors->get_error_code() ) {
+				signup_user( $user_name, $user_email, $errors );
 
-	/** This filter is documented in wp-signup.php */
-	wpmu_signup_user( $user_name, $user_email, apply_filters( 'add_signup_meta', array() ) );
+				return false;
+			}
 
-	confirm_user_signup($user_name, $user_email);
-	return true;
-}
+			if ( 'blog' == $_POST['signup_for'] ) {
+				signup_blog( $user_name, $user_email );
 
-/**
- * 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 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 printf( __( 'Check your inbox at <strong>%s</strong> and click the link given.' ), $user_email ); ?></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' );
-}
+				return false;
+			}
 
-/**
- * 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 array $errors
- */
-function signup_blog($user_name = '', $user_email = '', $blogname = '', $blog_title = '', $errors = '') {
-	if ( !is_wp_error($errors) )
-		$errors = new WP_Error();
+			/** This filter is documented in wp-signup.php */
+			wpmu_signup_user( $user_name, $user_email, apply_filters( 'add_signup_meta', array() ) );
 
-	$signup_blog_defaults = array(
-		'user_name'  => $user_name,
-		'user_email' => $user_email,
-		'blogname'   => $blogname,
-		'blog_title' => $blog_title,
-		'errors'     => $errors
-	);
+			confirm_user_signup( $user_name, $user_email );
 
-	/**
-	 * Filter 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 array  $errors     An array of possible errors relevant to new site creation variables.
-	 * }
-	 */
-	$filtered_results = apply_filters( 'signup_blog_init', $signup_blog_defaults );
+			return true;
+		}
 
-	$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'];
+		/**
+		 * 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 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 printf( __( 'Check your inbox at <strong>%s</strong> and click the link given.' ), $user_email ); ?></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' );
+		}
 
-	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
-}
+		/**
+		 * 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 array $errors
+		 */
+		function signup_blog( $user_name = '', $user_email = '', $blogname = '', $blog_title = '', $errors = array() ) {
+			if ( ! is_wp_error( $errors ) ) {
+				$errors = new WP_Error();
+			}
 
-/**
- * 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'];
+			$signup_blog_defaults = array(
+				'user_name'  => $user_name,
+				'user_email' => $user_email,
+				'blogname'   => $blogname,
+				'blog_title' => $blog_title,
+				'errors'     => $errors,
+			);
 
-	if ( $user_errors->get_error_code() ) {
-		signup_user( $user_name, $user_email, $user_errors );
-		return false;
-	}
+			/**
+			 * Filter 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 array $errors An array of possible errors relevant to new site creation variables.
+			 * }
+			 */
+			$filtered_results = apply_filters( 'signup_blog_init', $signup_blog_defaults );
 
-	$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'];
+			$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 ( $errors->get_error_code() ) {
-		signup_blog($user_name, $user_email, $blogname, $blog_title, $errors);
-		return false;
-	}
+			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
+		}
 
-	$public = (int) $_POST['blog_public'];
-	$signup_meta = array ('lang_id' => 1, 'public' => $public);
+		/**
+		 * 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'];
 
-	/** This filter is documented in wp-signup.php */
-	$meta = apply_filters( 'add_signup_meta', $signup_meta );
+			if ( $user_errors->get_error_code() ) {
+				signup_user( $user_name, $user_email, $user_errors );
 
-	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;
-}
+				return false;
+			}
 
-/**
- * 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 'add_signup_meta' filter in validate_blog_signup()
- */
-function confirm_blog_signup( $domain, $path, $blog_title, $user_name = '', $user_email = '', $meta = array() ) {
-	?>
-	<h2><?php printf( __( 'Congratulations! Your new site, %s, is almost ready.' ), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" ) ?></h2>
+			$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'];
 
-	<p><?php _e( 'But, before you can start using your site, <strong>you must activate it</strong>.' ) ?></p>
-	<p><?php printf( __( 'Check your inbox at <strong>%s</strong> and click the link given.' ),  $user_email) ?></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 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' );
-}
+			if ( $errors->get_error_code() ) {
+				signup_blog( $user_name, $user_email, $blogname, $blog_title, $errors );
 
-// Main
-$active_signup = get_network_option( 'registration', 'none' );
-/**
- * Filter the type of site sign-up.
- *
- * @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 );
+				return false;
+			}
 
-// Make the signup type translatable.
-$i18n_signup['all'] = _x('all', 'Multisite active signup type');
-$i18n_signup['none'] = _x('none', 'Multisite active signup type');
-$i18n_signup['blog'] = _x('blog', 'Multisite active signup type');
-$i18n_signup['user'] = _x('user', 'Multisite active signup type');
+			$public      = (int) $_POST['blog_public'];
+			$signup_meta = array( 'lang_id' => 1, 'public' => $public );
 
-if ( is_super_admin() )
-	echo '<div class="mu_alert">' . sprintf( __( 'Greetings Site Administrator! You are currently allowing &#8220;%s&#8221; registrations. To change or disable registration go to your <a href="%s">Options page</a>.' ), $i18n_signup[$active_signup], esc_url( network_admin_url( 'settings.php' ) ) ) . '</div>';
+			/** This filter is documented in wp-signup.php */
+			$meta = apply_filters( 'add_signup_meta', $signup_meta );
 
-$newblogname = isset($_GET['new']) ? strtolower(preg_replace('/^-|-$|[^-a-zA-Z0-9]/', '', $_GET['new'])) : null;
+			wpmu_signup_blog( $domain, $path, $blog_title, $user_name, $user_email, $meta );
+			confirm_blog_signup( $domain, $path, $blog_title, $user_name, $user_email, $meta );
 
-$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' ) );
-	echo sprintf( __( '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!' );
+			return true;
+		}
 
-			if ( $newblogname ) {
-				$newblog = get_blogaddress_by_name( $newblogname );
+		/**
+		 * 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 'add_signup_meta' filter in validate_blog_signup()
+		 */
+		function confirm_blog_signup( $domain, $path, $blog_title, $user_name = '', $user_email = '', $meta = array() ) {
+			?>
+			<h2><?php printf( __( 'Congratulations! Your new site, %s, is almost ready.' ), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" ) ?></h2>
 
-				if ( $active_signup == 'blog' || $active_signup == 'all' )
-					printf( '<p><em>' . __( 'The site you were looking for, <strong>%s</strong>, does not exist, but you can create it now!' ) . '</em></p>', $newblog );
-				else
-					printf( '<p><em>' . __( 'The site you were looking for, <strong>%s</strong>, does not exist.' ) . '</em></p>', $newblog );
+			<p><?php _e( 'But, before you can start using your site, <strong>you must activate it</strong>.' ) ?></p>
+			<p><?php printf( __( 'Check your inbox at <strong>%s</strong> and click the link given.' ),  $user_email ) ?></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 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' );
+		}
+
+		// Main
+		$active_signup = get_network_option( 'registration', 'none' );
+		/**
+		 * Filter the type of site sign-up.
+		 *
+		 * @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 );
+
+		// Make the signup type translatable.
+		$i18n_signup['all']  = _x( 'all', 'Multisite active signup type' );
+		$i18n_signup['none'] = _x( 'none', 'Multisite active signup type' );
+		$i18n_signup['blog'] = _x( 'blog', 'Multisite active signup type' );
+		$i18n_signup['user'] = _x( 'user', 'Multisite active signup type' );
+
+		if ( is_super_admin() ) {
+			echo '<div class="mu_alert">' . sprintf( __( 'Greetings Site Administrator! You are currently allowing &#8220;%s&#8221; registrations. To change or disable registration go to your <a href="%s">Options page</a>.' ), $i18n_signup[ $active_signup ], esc_url( network_admin_url( 'settings.php' ) ) ) . '</div>';
+		}
+
+		$newblogname = isset( $_GET['new'] ) ? strtolower( preg_replace( '/^-|-$|[^-a-zA-Z0-9]/', '', $_GET['new'] ) ) : null;
+
+		$current_user = wp_get_current_user();
+		if ( 'none' === $active_signup  ) {
+			_e( 'Registration has been disabled.' );
+		} elseif ( 'blog' === $active_signup && ! is_user_logged_in() ) {
+			$login_url = wp_login_url( network_site_url( 'wp-signup.php' ) );
+			echo sprintf( __( '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 ( 'all' === $active_signup  ||
+					     'blog' === $_POST['signup_for'] && 'blog' === $active_signup ||
+					     'user' === $_POST['signup_for'] && 'user' === $active_signup ) {
+						validate_user_signup();
+					} else {
+						_e( 'User registration has been disabled.' );
+					}
+					break;
+				case 'validate-blog-signup':
+					if ( 'all' === $active_signup || 'blog' === $active_signup ) {
+						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() && ( 'all' === $active_signup  || 'blog' === $active_signup  ) ) {
+						signup_another_blog( $newblogname );
+					} elseif ( ! is_user_logged_in() && ( 'all' === $active_signup || 'user' === $active_signup ) ) {
+						signup_user( $newblogname, $user_email );
+					} elseif ( ! is_user_logged_in() && ( 'blog' === $active_signup ) ) {
+						_e( 'Sorry, new registrations are not allowed at this time.' );
+					} else {
+						_e( 'You are logged in already. No need to register again!' );
+					}
+
+					if ( $newblogname ) {
+						$newblog = get_blogaddress_by_name( $newblogname );
+
+						if ( 'blog' === $active_signup || 'all' === $active_signup  ) {
+							printf( '<p><em>' . __( 'The site you were looking for, <strong>%s</strong>, does not exist, but you can create it now!' ) . '</em></p>', $newblog );
+						} else {
+							printf( '<p><em>' . __( 'The site you were looking for, <strong>%s</strong>, does not exist.' ) . '</em></p>', $newblog );
+						}
+					}
+					break;
 			}
-			break;
-	}
-}
-?>
+		}
+		?>
+	</div>
 </div>
-</div>
 <?php
 /**
  * Fires after the sign-up forms, before wp_footer.