Index: wp-signup.php
===================================================================
--- wp-signup.php	(revision 22229)
+++ wp-signup.php	(working copy)
@@ -12,6 +12,11 @@
 	die();
 }
 
+/**
+ * Prints signup_header via wp_head
+ *
+ * @since 3.0.0
+ */
 function do_signup_header() {
 	do_action( 'signup_header' );
 }
@@ -30,6 +35,14 @@
 // Fix for page title
 $wp_query->is_404 = false;
 
+/**
+ * Prints styles for front-end Multisite signup pages.
+ *
+ * The default styles are printed via signup_header which is hooked to wp_head. 
+ * They can be overloaded by replacing the output on the signup_header action hook.
+ *
+ * @since 3.0.0
+ */
 function wpmu_signup_stylesheet() {
 	?>
 	<style type="text/css">
@@ -50,7 +63,6 @@
 	<?php
 }
 
-add_action( 'wp_head', 'wpmu_signup_stylesheet' );
 get_header();
 
 do_action( 'before_signup_form' );
@@ -58,43 +70,67 @@
 <div id="content" class="widecolumn">
 <div class="mu_register">
 <?php
-function show_blog_form($blogname = '', $blog_title = '', $errors = '') {
+/**
+ * Generates and displays the Signup and Create Site forms
+ *
+ * @since 3.0.0
+ *
+ * @param string $blogname
+ * @param string $blog_title
+ * @param array $errors
+ */
+function show_blog_form( $blogname = '', $blog_title = '', $errors = '' ) {
 	global $current_site;
 	// Blog name
-	if ( !is_subdomain_install() )
-		echo '<label for="blogname">' . __('Site Name:') . '</label>';
+	if ( ! is_subdomain_install() )
+		printf( '<label for="blogname">%s</label>', __('Site Name:') );
 	else
-		echo '<label for="blogname">' . __('Site Domain:') . '</label>';
+		printf( '<label for="blogname">%s</label>', __('Site Domain:') );
 
-	if ( $errmsg = $errors->get_error_message('blogname') ) { ?>
+	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_user_logged_in() ) {
-		if ( !is_subdomain_install() )
+	if ( ! is_subdomain_install() ) {
+		printf( '<span class="prefix_address">%1$s</span><input name="blogname" type="text" id="blogname" value="%2$s" maxlength="60" /><br />',
+			$current_site->domain . $current_site->path,
+			esc_attr( $blogname )
+		);
+	} else {
+		printf( '<input name="blogname" type="text" id="blogname" value="%1$s" maxlength="60" /><span class="suffix_address">( %2$s )</span><br />', 
+			esc_attr( $blogname ),
+			$site_domain = preg_replace( '|^www\.|', '', $current_site->domain )			
+		);
+	}
+	
+	if ( ! is_user_logged_in() ) {
+		if ( ! is_subdomain_install() ) {
 			$site = $current_site->domain . $current_site->path . __( 'sitename' );
-		else
+		} 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>';
+			$address = sprintf( __('Your address will be %s.'), $site )
+
+			printf( '<p>(<strong>%1$s</strong>)%2$s</p>',
+				$address,
+				__( 'Must be at least 4 characters, letters and numbers only. It cannot be changed, so choose carefully!' )
+			);
+		}
 	}
 
 	// 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).'" />';
+
+	printf( '<input name="blog_title" type="text" id="blog_title" value="%s" />', esc_attr( $blog_title ) );
 	?>
 
 	<div id="privacy">
         <p class="privacy-intro">
-            <label for="blog_public_on"><?php _e('Privacy:') ?></label>
+            <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">
@@ -109,9 +145,17 @@
 	</div>
 
 	<?php
-	do_action('signup_blogform', $errors);
+	do_action( 'signup_blogform', $errors );
 }
 
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since 3.0.0
+ *
+ * @uses wp_get_current_user()
+ * @return array
+ */
 function validate_blog_form() {
 	$user = '';
 	if ( is_user_logged_in() )
@@ -120,33 +164,64 @@
 	return wpmu_validate_blog_signup($_POST['blogname'], $_POST['blog_title'], $user);
 }
 
-function show_user_form($user_name = '', $user_email = '', $errors = '') {
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since 3.0.0
+ *
+ * @param string $user_name
+ * @param string $user_email
+ * @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.)' );
-	?>
+	printf( '<label for="user_name">%s</label>', __( 'Username:' ) );
 
+	if ( $errmsg = $errors->get_error_message( 'user_name' ) ) { ?>
+		<p class="error"><?php echo $errmsg; ?></p>
+	<?php } ?>
+
+	<input name="user_name" type="text" id="user_name" value="<?php echo $esc_attr( $user_name ); ?>" maxlength="60" /><br />
+	<?php _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="text" 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.)') ?>
+
+	<input name="user_email" type="text" 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>';
-	}
+	if ( $errmsg = $errors->get_error_message('generic') ) { ?>
+		<p class="error"><?php echo $errmsg; ?></p>
+	<?php }
+
 	do_action( 'signup_extra_fields', $errors );
 }
 
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since 3.0.0
+ *
+ * @return array
+ */
 function validate_user_form() {
 	return wpmu_validate_user_signup($_POST['user_name'], $_POST['user_email']);
 }
 
-function signup_another_blog($blogname = '', $blog_title = '', $errors = '') {
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since 3.0.0
+ *
+ * @uses wp_get_current_user()
+ * @param string $blogname
+ * @param string $blog_title
+ * @param array $errors
+ */
+function signup_another_blog( $blogname = '', $blog_title = '', $errors = '' ) {
 	global $current_site;
 	$current_user = wp_get_current_user();
 
@@ -155,53 +230,62 @@
 	}
 
 	// allow definition of default variables
-	$filtered_results = apply_filters('signup_another_blog_init', array('blogname' => $blogname, 'blog_title' => $blog_title, 'errors' => $errors ));
+	$filtered_results = apply_filters( 'signup_another_blog_init', array( 'blogname' => $blogname, 'blog_title' => $blog_title, 'errors' => $errors ) );
 	$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' ), $current_site->site_name ) . '</h2>';
+	printf( '<h2>%s</h2>', sprintf( __( 'Get <em>another</em> %s site in seconds' ), $current_site->site_name ) );
 
-	if ( $errors->get_error_code() ) {
-		echo '<p>' . __( 'There was a problem, please correct the form below and try again.' ) . '</p>';
-	}
+	if ( $errors->get_error_code() )
+		printf( '<p>%s</p>', __( 'There was a problem, please correct the form below and try again.' ) );
 	?>
-	<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 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) ) { ?>
+	$blogs = get_blogs_of_user( $current_user->ID );
+	if ( ! empty( $blogs ) ) { ?>
 
-			<p><?php _e( 'Sites you are already a member of:' ) ?></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>';
+					printf( '<li><a href="%1$s">%2$s</a></li>', esc_url( $home_url ), $home_url );
 				} ?>
 			</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>
+	<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 do_action( 'signup_hidden_fields' ); ?>
-		<?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>
+		<?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
 }
 
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since 3.0.0
+ *
+ * @uses validate_blog_form()
+ * @return bool
+ */
 function validate_another_blog_signup() {
 	global $wpdb, $blogname, $blog_title, $errors, $domain, $path;
 	$current_user = wp_get_current_user();
-	if ( !is_user_logged_in() )
+	if ( ! is_user_logged_in() )
 		die();
 
 	$result = validate_blog_form();
-	extract($result);
+	extract( $result );
 
 	if ( $errors->get_error_code() ) {
-		signup_another_blog($blogname, $blog_title, $errors);
+		signup_another_blog( $blogname, $blog_title, $errors );
 		return false;
 	}
 
@@ -210,30 +294,66 @@
 	$meta = apply_filters( 'add_signup_meta', $meta );
 
 	wpmu_create_blog( $domain, $path, $blog_title, $current_user->ID, $meta, $wpdb->siteid );
-	confirm_another_blog_signup($domain, $path, $blog_title, $current_user->user_login, $current_user->user_email, $meta);
+
+	confirm_another_blog_signup( $domain, $path, $blog_title, $current_user->user_login, $current_user->user_email, $meta );
+
 	return true;
 }
 
-function confirm_another_blog_signup($domain, $path, $blog_title, $user_name, $user_email = '', $meta = '') {
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since 3.0.0
+ *
+ * @todo Check for ssl
+ * @param string $domain
+ * @param string $path
+ * @param string $user_name
+ * @param string $user_email
+ * @param string $meta
+ */
+function confirm_another_blog_signup( $domain, $path, $blog_title, $user_name, $user_email = '', $meta = '' ) {
 	?>
 	<h2><?php printf( __( 'The site %s is yours.' ), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" ) ?></h2>
 	<p>
-		<?php printf( __( '<a href="http://%1$s">http://%2$s</a> is your new site. <a href="%3$s">Log in</a> as &#8220;%4$s&#8221; using your existing password.' ), $domain.$path, $domain.$path, "http://" . $domain.$path . "wp-login.php", $user_name ) ?>
+		<?php 
+		printf( __( '<a href="http://%1$s">http://%2$s</a> is your new site. <a href="%3$s">Log in</a> as &#8220;%4$s&#8221; using your existing password.' ),
+			$domain.$path,
+			$domain.$path,
+			"http://" . $domain.$path . "wp-login.php", $user_name
+			);
+		?>
 	</p>
 	<?php
 	do_action( 'signup_finished' );
 }
 
-function signup_user($user_name = '', $user_email = '', $errors = '') {
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since 3.0.0
+ *
+ * @todo Update button styles
+ * @uses apply_filters()
+ * @param string $user_name
+ * @param string $user_email
+ * @param array $errors
+ */
+function signup_user( $user_name = '', $user_email = '', $errors = '' ) {
 	global $current_site, $active_signup;
 
-	if ( !is_wp_error($errors) )
+	if ( ! is_wp_error( $errors ) )
 		$errors = new WP_Error();
 
 	$signup_for = isset( $_POST[ 'signup_for' ] ) ? esc_html( $_POST[ 'signup_for' ] ) : 'blog';
 
 	// allow definition of default variables
-	$filtered_results = apply_filters('signup_user_init', array('user_name' => $user_name, 'user_email' => $user_email, 'errors' => $errors ));
+	$filtered_results = apply_filters( 'signup_user_init', array(
+		'user_name' => $user_name,
+		'user_email' => $user_email,
+		'errors' => $errors
+	) );
+
 	$user_name = $filtered_results['user_name'];
 	$user_email = $filtered_results['user_email'];
 	$errors = $filtered_results['errors'];
@@ -241,9 +361,11 @@
 	?>
 
 	<h2><?php printf( __( 'Get your own %s account in seconds' ), $current_site->site_name ) ?></h2>
+
 	<form id="setupform" method="post" action="wp-signup.php">
 		<input type="hidden" name="stage" value="validate-user-signup" />
 		<?php do_action( 'signup_hidden_fields' ); ?>
+
 		<?php show_user_form($user_name, $user_email, $errors); ?>
 
 		<p>
@@ -260,32 +382,51 @@
 		<?php } ?>
 		</p>
 
-		<p class="submit"><input type="submit" name="submit" class="submit" value="<?php esc_attr_e('Next') ?>" /></p>
-	</form>
+		<p class="submit"><input type="submit" name="submit" class="submit" value="<?php esc_attr_e( 'Next' ) ?>" /></p>
+	</form><!-- #setupform -->
 	<?php
 }
 
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since 3.0.0
+ *
+ * @uses signup_user()
+ * @uses signup_blog()
+ * @uses wpmu_signup_user()
+ * @uses confirm_user_signup()
+ * @return bool
+ */
 function validate_user_signup() {
 	$result = validate_user_form();
-	extract($result);
+	extract( $result );
 
 	if ( $errors->get_error_code() ) {
-		signup_user($user_name, $user_email, $errors);
+		signup_user( $user_name, $user_email, $errors );
 		return false;
 	}
 
 	if ( 'blog' == $_POST['signup_for'] ) {
-		signup_blog($user_name, $user_email);
+		signup_blog( $user_name, $user_email );
 		return false;
 	}
 
-	wpmu_signup_user($user_name, $user_email, apply_filters( 'add_signup_meta', array() ) );
+	wpmu_signup_user( $user_name, $user_email, apply_filters( 'add_signup_meta', array() ) );
 
-	confirm_user_signup($user_name, $user_email);
+	confirm_user_signup( $user_name, $user_email );
 	return true;
 }
 
-function confirm_user_signup($user_name, $user_email) {
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since 3.0.0
+ *
+ * @param string $user_name
+ * @param string $user_email
+ */
+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>
@@ -295,19 +436,39 @@
 	do_action( 'signup_finished' );
 }
 
-function signup_blog($user_name = '', $user_email = '', $blogname = '', $blog_title = '', $errors = '') {
-	if ( !is_wp_error($errors) )
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since 3.0.0
+ *
+ * @uses apply_filters()
+ * @uses show_blog_form()
+ * @param string $user_name
+ * @param string $user_email
+ * @param string $blogname
+ * @param string $blog_title
+ * @param array $errors
+ */
+function signup_blog( $user_name = '', $user_email = '', $blogname = '', $blog_title = '', $errors = '' ) {
+	if ( ! is_wp_error( $errors ) )
 		$errors = new WP_Error();
 
 	// allow definition of default variables
-	$filtered_results = apply_filters('signup_blog_init', array('user_name' => $user_name, 'user_email' => $user_email, 'blogname' => $blogname, 'blog_title' => $blog_title, 'errors' => $errors ));
+	$filtered_results = apply_filters( 'signup_blog_init', array( 
+		'user_name' => $user_name,
+		'user_email' => $user_email,
+		'blogname' => $blogname,
+		'blog_title' => $blog_title,
+		'errors' => $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 ( empty($blogname) )
+	if ( empty( $blogname ) )
 		$blogname = $user_name;
 	?>
 	<form id="setupform" method="post" action="wp-signup.php">
@@ -315,27 +476,39 @@
 		<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 do_action( 'signup_hidden_fields' ); ?>
-		<?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 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><!-- #setupform -->
 	<?php
 }
 
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since 3.0.0
+ *
+ * @uses wpmu_validate_user_signup()
+ * @uses wpmu_validate_blog_signup()
+ * @uses signup_user()
+ * @uses signup_blog()
+ * @uses apply_filters()
+ * @return bool
+ */
 function validate_blog_signup() {
 	// Re-validate user info.
-	$result = wpmu_validate_user_signup($_POST['user_name'], $_POST['user_email']);
-	extract($result);
+	$result = wpmu_validate_user_signup( $_POST['user_name'], $_POST['user_email'] );
+	extract( $result );
 
 	if ( $errors->get_error_code() ) {
-		signup_user($user_name, $user_email, $errors);
+		signup_user( $user_name, $user_email, $errors );
 		return false;
 	}
 
-	$result = wpmu_validate_blog_signup($_POST['blogname'], $_POST['blog_title']);
-	extract($result);
+	$result = wpmu_validate_blog_signup( $_POST['blogname'], $_POST['blog_title'] );
+	extract( $result );
 
 	if ( $errors->get_error_code() ) {
-		signup_blog($user_name, $user_email, $blogname, $blog_title, $errors);
+		signup_blog( $user_name, $user_email, $blogname, $blog_title, $errors );
 		return false;
 	}
 
@@ -343,17 +516,29 @@
 	$meta = array ('lang_id' => 1, 'public' => $public);
 	$meta = apply_filters( 'add_signup_meta', $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);
+	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;
 }
 
-function confirm_blog_signup($domain, $path, $blog_title, $user_name = '', $user_email = '', $meta) {
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since 3.0.0
+ *
+ * @param string $domain
+ * @param string $path
+ * @param string $blog_title
+ * @param string $user_name
+ * @param string $user_email
+ * @param string $meta
+ */
+function confirm_blog_signup( $domain, $path, $blog_title, $user_name = '', $user_email = '', $meta ) {
 	?>
 	<h2><?php 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 printf( __( 'Check your inbox at <strong>%s</strong> and click the link given.' ),  $user_email) ?></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>
@@ -362,7 +547,7 @@
 			<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>
+		</ul><!-- .noemail-tips -->
 	</p>
 	<?php
 	do_action( 'signup_finished' );
@@ -370,33 +555,40 @@
 
 // Main
 $active_signup = get_site_option( 'registration' );
-if ( !$active_signup )
+if ( ! $active_signup )
 	$active_signup = 'all';
 
 $active_signup = apply_filters( 'wpmu_active_signup', $active_signup ); // return "all", "none", "blog" or "user"
 
 // 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');
+$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>';
+if ( is_super_admin() ) {
+	$allowed_registrations = 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' )
+	);
+	printf( '<div class="mu_alert">%s</div>', $allowed_registrations );
+}
 
 $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() ) {
+} elseif ( $active_signup == 'blog' && ! is_user_logged_in() ) {
 	$login_url = site_url( 'wp-login.php?redirect_to=' . urlencode( 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 );
+	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';
+	$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' )
+			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.' );
@@ -415,10 +607,10 @@
 			$user_email = isset( $_POST[ 'user_email' ] ) ? $_POST[ 'user_email' ] : '';
 			do_action( 'preprocess_signup_form' ); // populate the form from invites, elsewhere?
 			if ( is_user_logged_in() && ( $active_signup == 'all' || $active_signup == 'blog' ) )
-				signup_another_blog($newblogname);
-			elseif ( is_user_logged_in() == false && ( $active_signup == 'all' || $active_signup == 'user' ) )
+				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() == false && ( $active_signup == 'blog' ) )
+			elseif ( ! is_user_logged_in() && ( $active_signup == 'blog' ) )
 				_e( 'Sorry, new registrations are not allowed at this time.' );
 			else
 				_e( 'You are logged in already. No need to register again!' );
@@ -435,8 +627,8 @@
 	}
 }
 ?>
-</div>
-</div>
+</div><!-- .mu_register -->
+</div><!-- #content -->
 <?php do_action( 'after_signup_form' ); ?>
 
 <?php get_footer(); ?>
Index: wp-includes/default-filters.php
===================================================================
--- wp-includes/default-filters.php	(revision 22229)
+++ wp-includes/default-filters.php	(working copy)
@@ -213,6 +213,7 @@
 add_action( 'wp_print_footer_scripts', '_wp_footer_scripts'                 );
 add_action( 'init',                'check_theme_switched',            99    );
 add_action( 'after_switch_theme',  '_wp_sidebars_changed'                   );
+add_action( 'signup_header',       'wpmu_signup_stylesheet'                 );
 
 if ( isset( $_GET['replytocom'] ) )
     add_action( 'wp_head', 'wp_no_robots' );