tableless signup form, props momo360modena, fixes #482

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1321 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 211 insertions, 234 deletions

diff --git a/wp-signup.php b/wp-signup.php
index 13446de..ee07827 100644
--- a/wp-signup.php
+++ b/wp-signup.php
@@ -24,47 +24,47 @@ if( $current_blog->domain . $current_blog->path != $current_site->domain . $curr
 }

 

 function wpmu_signup_stylesheet() {

-?>

-<style type="text/css">

-form { margin-top: 2em; }

-#submit, #blog_title, #user_email {

-	width: 90%;

-	font-size: 24px;

-}

-.error {

-	background-color: #f66;

-}

-</style>

-<?php

+	?>

+	<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 #submit,

+			.mu_register #blog_title,

+			.mu_register #user_email, 

+			.mu_register #blog_id,

+			.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; }

+	</style>

+	<?php

 }

 

 add_action( 'wp_head', 'wpmu_signup_stylesheet' );

 get_header();

 ?>

 <div id="content" class="widecolumn">

+<div class="mu_register">

 <?php

 function show_blog_form($blog_id = '', $blog_title = '', $errors = '') {

 	global $current_site;

-	$locale = get_locale();

-

-	// Blog name/Username

-	if ( $errors->get_error_message('blog_id') )

-		print '<tr class="error">';

-	else

-		print '<tr>';

-

+	// Blog name

 	if( constant( "VHOST" ) == 'no' )

-		echo '<th valign="top">' . __('Blog Name:') . '</th><td>';

+		echo '<label for="blog_id">' . __('Blog Name:') . '</label>';

 	else

-		echo '<th valign="top">' . __('Blog Domain:') . '</th><td>';

+		echo '<label for="blog_id">' . __('Blog Domain:') . '</label>';

+

+	if ( $errmsg = $errors->get_error_message('blog_id') ) { ?>

+		<p class="error"><?php echo $errmsg ?></p>

+	<?php }

 

-	if ( $errmsg = $errors->get_error_message('blog_id') ) {

-		?><p><strong><?php echo $errmsg ?></strong></p><?php

-	}

 	if( constant( "VHOST" ) == 'no' ) {

-		print '<span style="font-size: 20px">' . $current_site->domain . $current_site->path . '</span><input name="blog_id" type="text" id="blog_id" value="'.$blog_id.'" maxlength="50" style="width:40%; text-align: left; font-size: 20px;" /><br />';

+		echo '<span class="prefix_address">' . $current_site->domain . $current_site->path . '</span><input name="blog_id" type="text" id="blog_id" value="'.$blog_id.'" maxlength="50" /><br />';

 	} else {

-		print '<input name="blog_id" type="text" id="blog_id" value="'.$blog_id.'" maxlength="50" style="width:40%; text-align: right; font-size: 20px;" /><span style="font-size: 20px">.' . $current_site->domain . $current_site->path . '</span><br />';

+		echo '<input name="blog_id" type="text" id="blog_id" value="'.$blog_id.'" maxlength="50" /><span class="suffix_address">.' . $current_site->domain . $current_site->path . '</span><br />';

 	}

 	if ( !is_user_logged_in() ) {

 		print '(<strong>' . __( 'Your address will be ' );

@@ -73,91 +73,76 @@ function show_blog_form($blog_id = '', $blog_title = '', $errors = '') {
 		} else {

 			print __( 'domain.' ) . $current_site->domain . $current_site->path;

 		}

-		print '.</strong>' . __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed so choose carefully!)' ) . '</td> </tr>';

+		echo '.</strong> ' . __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed so choose carefully!)' ) . '</p>';

 	}

 

 	// Blog Title

-	if ( $errors->get_error_message('blog_title')) {

-		print '<tr class="error">';

-	} else {

-		print '<tr>';

-	}

-?><th valign="top" width="120"><?php _e('Blog Title:') ?></th><td><?php

+	?>

+	<label for="blog_title"><?php _e('Blog 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="'.wp_specialchars($blog_title, 1).'" /></p>';

+	?>

 

-	if ( $errmsg = $errors->get_error_message('blog_title') ) {

-?><p><strong><?php echo $errmsg ?></strong></p><?php

-	}

-	print '<input name="blog_title" type="text" id="blog_title" value="'.wp_specialchars($blog_title, 1).'" /></td>

-		</tr>';

-?>

-<tr>

-<th scope="row"  valign="top"><?php _e('Privacy:') ?></th>

-<td><?php _e('I would like my blog to appear in search engines like Google and Technorati, and in public listings around this site.'); ?> 

-<label><input type="radio" 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><input type="radio" name="blog_public" value="0" <?php if( isset( $_POST[ 'blog_public' ] ) && $_POST[ 'blog_public' ] == '0' ) { ?>checked="checked"<?php } ?> /><strong><?php _e( 'No' ); ?></strong> </label> <br />

-</tr>

-<?php

-do_action('signup_blogform', $errors);

+	<p>

+		<label for="blog_public_on"><?php _e('Privacy:') ?></label>

+		<?php _e('I would like my blog to appear in search engines like Google and Technorati, and in public listings around this site.'); ?> 

+		<div style="clear:both;"></div>

+		<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>

+	

+	<?php

+	do_action('signup_blogform', $errors);

 }

 

 function validate_blog_form() {

+	$user = '';

 	if ( is_user_logged_in() )

 		$user = wp_get_current_user();

-	else

-		$user = '';

-

-	$result = wpmu_validate_blog_signup($_POST['blog_id'], $_POST['blog_title'], $user);

 

-	return $result;

+	return wpmu_validate_blog_signup($_POST['blog_id'], $_POST['blog_title'], $user);

 }

 

 function show_user_form($user_name = '', $user_email = '', $errors = '') {

-	// Blog name/Username

-	if ( $errors->get_error_message('user_name') ) {

-		print '<tr class="error">';

-	} else {

-		print '<tr>';

-	}

-

-	echo '<th valign="top">' . __('Username:') . '</th><td>';

-

+	// User name

+	echo '<label for="user_name">' . __('Username:') . '</label>';

 	if ( $errmsg = $errors->get_error_message('user_name') ) {

-		?><p><strong><?php echo $errmsg ?></strong></p><?php

-	}

-

-	print '<input name="user_name" type="text" id="user_name" value="'.$user_name.'" maxlength="50" style="width:50%; font-size: 30px;" /><br />';

-	_e('(Must be at least 4 characters, letters and numbers only.)'); echo '</td> </tr>';

-

-	// User Email

-	if ( $errors->get_error_message('user_email') ) {

-		print '<tr class="error">';

-	} else {

-		print '<tr>';

-	}

-?><th valign="top"><?php _e('Email&nbsp;Address:') ?></th><td valign="top"><?php

-

-	if ( $errmsg = $errors->get_error_message('user_email') ) {

-?><p><strong><?php echo $errmsg ?></strong></p><?php

+		echo '<p class="error">'.$errmsg.'</p>';

 	}

+	echo '<input name="user_name" type="text" id="user_name" value="'.$user_name.'" maxlength="50" /><br />';

+	_e('(Must be at least 4 characters, letters and numbers only.)');

 	?>

-	<input name="user_email" type="text" id="user_email" value="<?php  echo wp_specialchars($user_email, 1) ?>" maxlength="200" /><br /><?php _e('(We&#8217;ll send your password to this address, so <strong>triple-check it</strong>.)') ?></td>

-	</tr>

+

+	<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 wp_specialchars($user_email, 1) ?>" maxlength="200" /><br /><?php _e('(We&#8217;ll send your password to this address, so <strong>triple-check it</strong>.)') ?>

 	<?php

-	if ( $errmsg = $errors->get_error_message('generic') )

-		print '<tr class="error"> <th colspan="2">'.$errmsg.'</th> </tr>';

+	if ( $errmsg = $errors->get_error_message('generic') ) {

+		echo '<p class="error">'.$errmsg.'</p>';

+	}

 	do_action( 'signup_extra_fields', $errors );

 }

 

 function validate_user_form() {

-	$result = wpmu_validate_user_signup($_POST['user_name'], $_POST['user_email']);

-

-	return $result;

+	return wpmu_validate_user_signup($_POST['user_name'], $_POST['user_email']);

 }

 

 function signup_another_blog($blog_id = '', $blog_title = '', $errors = '') {

-	global $current_user, $wpdb, $domain, $current_site;

-

-	if ( ! is_wp_error($errors) )

+	global $current_user, $current_site;

+	

+	if ( ! is_wp_error($errors) ) {

 		$errors = new WP_Error();

+	}

 

 	// allow definition of default variables

 	$filtered_results = apply_filters('signup_another_blog_init', array('blog_id' => $blog_id, 'blog_title' => $blog_title, 'errors' => $errors ));

@@ -170,34 +155,31 @@ function signup_another_blog($blog_id = '', $blog_title = '', $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 blog to your account</strong>. There is no limit to the number of blogs you can have, so create to your heart's content, but blog responsibly."), $current_user->display_name) ?></p>

-<?php

-	$blogs = get_blogs_of_user($current_user->ID);

-

-	if ( ! empty($blogs) ) {

-		?><p><?php _e('Here are the blogs you already have:') ?></p><ul><?php

-		foreach ( $blogs as $blog )

-			echo "<li><a href='http://" . $blog->domain . $blog->path . "'>" . $blog->domain . $blog->path . "</a></li>";

-		?></ul><?php

-	}

-?>

-<p><?php _e("If you&#8217;re not going to use a great blog domain, leave it for a new user. Now have at it!") ?></p>

-<form name="setupform" id="setupform" method="post" action="wp-signup.php">

-<input type="hidden" name="stage" value="gimmeanotherblog" />

-<?php do_action( "signup_hidden_fields" ); ?>

-<table border="0" width="100%" cellpadding="9">

-<?php

-	show_blog_form($blog_id, $blog_title, $errors);

-?>

-<tr>

-<th scope="row"  valign="top">&nbsp;</th>

-<td><input id="submit" type="submit" name="Submit" class="submit" value="<?php _e('Create Blog &raquo;') ?>" /></td>

-</tr>

-</table>

-</form>

-<?php

+	?>

+	<p><?php printf(__("Welcome back, %s. By filling out the form below, you can <strong>add another blog to your account</strong>. There is no limit to the number of blogs you can have, so create to your heart's content, but blog responsibly."), $current_user->display_name) ?></p>

+	

+	<?php

+	$blogs = get_blogs_of_user($current_user->ID);	

+	if ( !empty($blogs) ) { ?>

+		<p>

+			<?php _e('Blogs you are already a member of:') ?>

+			<ul>

+				<?php foreach ( $blogs as $blog ) {

+					echo "<li><a href='http://" . $blog->domain . $blog->path . "'>" . $blog->domain . $blog->path . "</a></li>";

+				} ?>

+			</ul>

+		</p>

+	<?php } ?>

+	

+	<p><?php _e("If you&#8217;re not going to use a great blog 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($blog_id, $blog_title, $errors); ?>

+		<p>

+			<input id="submit" type="submit" name="submit" class="submit" value="<?php _e('Create Blog &raquo;') ?>" /></p>

+	</form>

+	<?php

 }

 

 function validate_another_blog_signup() {

@@ -211,7 +193,7 @@ function validate_another_blog_signup() {
 

 	if ( $errors->get_error_code() ) {

 		signup_another_blog($blog_id, $blog_title, $errors);

-		return;

+		return false;

 	}

 

 	$public = (int) $_POST['blog_public'];

@@ -219,20 +201,23 @@ function validate_another_blog_signup() {
 

 	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);

+	return true;

 }

 

-function confirm_another_blog_signup($domain, $path, $blog_title, $user_name, $user_email, $meta) {

-?>

-<h2><?php printf(__('The blog, %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 blog.  <a href="%3$s">Login</a> as "%4$s" using your existing password.'), $domain.$path, $domain.$path, "http://" . $domain.$path . "wp-login.php", $user_name) ?></p>

-<?php

+function confirm_another_blog_signup($domain, $path, $blog_title, $user_name, $user_email = '', $meta = '') {

+	?>

+	<h2><?php printf(__('The blog %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 blog.  <a href="%3$s">Login</a> as "%4$s" 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 = '') {

 	global $current_site, $active_signup;

 

-	if ( ! is_wp_error($errors) )

+	if ( !is_wp_error($errors) )

 		$errors = new WP_Error();

 	if( isset( $_POST[ 'signup_for' ] ) ) {

 		$signup[ wp_specialchars( $_POST[ 'signup_for' ] ) ] = 'checked="checked"';

@@ -245,39 +230,32 @@ function signup_user($user_name = '', $user_email = '', $errors = '') {
 	$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'), $current_site->site_name ) ?></h2>

-<form name="setupform" id="setupform" method="post" action="wp-signup.php">

-<input type="hidden" name="stage" value="validate-user-signup" />

-<?php do_action( "signup_hidden_fields" ); ?>

-<table border="0" width="100%" cellpadding="9" cellspacing="4">

-<?php show_user_form($user_name, $user_email, $errors); ?>

-<tr>

-<th scope="row"  valign="top">&nbsp;</th>

-<td>

-<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 echo $signup[ 'blog' ] ?> />

-<label for="signupblog"><?php _e('Gimme a blog!') ?></label>

-<br />

-<input id="signupuser" type="radio" name="signup_for" value="user" <?php echo $signup[ 'user' ] ?> />

-<label for="signupuser"><?php _e('Just a username, please.') ?></label>

-<?php } ?>

-</p>

-</td>

-</tr>

-<tr>

-<th scope="row"  valign="top">&nbsp;</th>

-<td><input id="submit" type="submit" name="Submit" class="submit" value="<?php _e('Next &raquo;') ?>" /></td>

-</tr>

-</table>

-</form>

-<?php

 

+	?>

+	

+	<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>

+		<?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 echo $signup['blog'] ?> />

+			<label class="checkbox" for="signupblog"><?php _e('Gimme a blog!') ?></label>	

+			<br />			

+			<input id="signupuser" type="radio" name="signup_for" value="user" <?php echo $signup['user'] ?> />			

+			<label class="checkbox" for="signupuser"><?php _e('Just a username, please.') ?></label>

+		<?php } ?>

+		</p>

+		

+		<input id="submit" type="submit" name="submit" class="submit" value="<?php _e('Next &raquo;') ?>" />

+	</form>

+	<?php

 }

 

 function validate_user_signup() {

@@ -286,31 +264,32 @@ function validate_user_signup() {
 

 	if ( $errors->get_error_code() ) {

 		signup_user($user_name, $user_email, $errors);

-		return;

+		return false;

 	}

 

 	if ( 'blog' == $_POST['signup_for'] ) {

 		signup_blog($user_name, $user_email);

-		return;

+		return false;

 	}

 

 	wpmu_signup_user($user_name, $user_email, apply_filters( "add_signup_meta", array() ) );

 

 	confirm_user_signup($user_name, $user_email);

+	return true;

 }

 

 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>%1$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

+	?>

+	<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>%1$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

 	do_action('signup_finished');

 }

 

 function signup_blog($user_name = '', $user_email = '', $blog_id = '', $blog_title = '', $errors = '') {

-	if ( ! is_wp_error($errors) )

+	if ( !is_wp_error($errors) )

 		$errors = new WP_Error();

 

 	// allow definition of default variables

@@ -323,21 +302,17 @@ function signup_blog($user_name = '', $user_email = '', $blog_id = '', $blog_tit
 

 	if ( empty($blog_id) )

 		$blog_id = $user_name;

-?>

-<form name="setupform" 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 $user_name ?>" />

-<input type="hidden" name="user_email" value="<?php echo $user_email ?>" />

-<?php do_action( "signup_hidden_fields" ); ?>

-<table border="0" width="100%" cellpadding="9">

-<?php show_blog_form($blog_id, $blog_title, $errors); ?>

-<tr>

-<th scope="row"  valign="top">&nbsp;</th>

-<td><input id="submit" type="submit" name="Submit" class="submit" value="<?php _e('Signup &raquo;') ?>" /></td>

-</tr>

-</table>

-</form>

-<?php

+	?>

+	<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 $user_name ?>" />

+		<input type="hidden" name="user_email" value="<?php echo $user_email ?>" />

+		<?php do_action( "signup_hidden_fields" ); ?>

+		<?php show_blog_form($blog_id, $blog_title, $errors); ?>

+		<p>

+			<input id="submit" type="submit" name="submit" class="submit" value="<?php _e('Signup &raquo;') ?>" /></p>

+	</form>

+	<?php

 }

 

 function validate_blog_signup() {

@@ -347,7 +322,7 @@ function validate_blog_signup() {
 

 	if ( $errors->get_error_code() ) {

 		signup_user($user_name, $user_email, $errors);

-		return;

+		return false;

 	}

 

 	$result = wpmu_validate_blog_signup($_POST['blog_id'], $_POST['blog_title']);

@@ -355,7 +330,7 @@ function validate_blog_signup() {
 

 	if ( $errors->get_error_code() ) {

 		signup_blog($user_name, $user_email, $blog_id, $blog_title, $errors);

-		return;

+		return false;

 	}

 

 	$public = (int) $_POST['blog_public'];

@@ -363,24 +338,27 @@ function validate_blog_signup() {
 	$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);

+	return true;

 }

 

-function confirm_blog_signup($domain, $path, $blog_title, $user_name, $user_email, $meta) {

-?>

-<h2><?php printf(__('Congratulations! Your new blog, %s, is almost ready.'), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" ) ?></h2>

-<p><?php _e('But, before you can start using your blog, <strong>you must activate it</strong>.') ?></p>

-<p><?php printf(__('Check your inbox at <strong>%s</strong> and click the link given. It should arrive within 30 minutes.'),  $user_email) ?></p>

-<p><?php _e('If you do not activate your blog 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't received your email yet, there are a number of things you can do:") ?></p>

-<ul>

-<li><p><strong><?php _e('Wait a little longer.  Sometimes delivery of email can be delayed by precesses outside of our control.') ?></strong></p></li>

-<li><p><?php _e('Check the junk email 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?  We think it's %s but if you've entered it incorrectly, you won't receive it."), $user_email) ?></li>

-</ul>

-<?php

+function confirm_blog_signup($domain, $path, $blog_title, $user_name = '', $user_email = '', $meta) {

+	?>

+	<h2><?php printf(__('Congratulations! Your new blog, %s, is almost ready.'), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" ) ?></h2>

+	

+	<p><?php _e('But, before you can start using your blog, <strong>you must activate it</strong>.') ?></p>

+	<p><?php printf(__('Check your inbox at <strong>%s</strong> and click the link given. It should arrive within 30 minutes.'),  $user_email) ?></p>

+	<p><?php _e('If you do not activate your blog 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't received your email yet, there are a number of things you can do:") ?>

+		<ul>

+			<li><p><strong><?php _e('Wait a little longer.  Sometimes delivery of email can be delayed by precesses outside of our control.') ?></strong></p></li>

+			<li><p><?php _e('Check the junk email 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?  We think it's %s but if you've entered it incorrectly, you won't receive it."), $user_email) ?></li>

+		</ul>

+	</p>

+	<?php

 	do_action('signup_finished');

 }

 

@@ -391,9 +369,8 @@ if( !$active_signup )
 

 $active_signup = apply_filters( 'wpmu_active_signup', $active_signup ); // return "all", "none", "blog" or "user"

 

-if( is_site_admin() ) {

-	echo "<div style='background: #faf; font-weight: bold; border: 1px solid #333; margin: 2px; padding: 2px'>" . sprintf( __( "Greetings Site Administrator! You are currently allowing '%s' registrations. To change or disable registration go to your <a href='wp-admin/wpmu-options.php'>Options page</a>." ), $active_signup ) . "</div>";

-}

+if( is_site_admin() )

+	echo '<div class="mu_alert">' . sprintf( __( "Greetings Site Administrator! You are currently allowing '%s' registrations. To change or disable registration go to your <a href='wp-admin/wpmu-options.php'>Options page</a>." ), $active_signup ) . '</div>';

 

 $newblogname = isset($_GET['new']) ? strtolower(preg_replace('/^-|-$|[^-a-zA-Z0-9]/', '', $_GET['new'])) : null;

 

@@ -401,49 +378,49 @@ $current_user = wp_get_current_user();
 if( $active_signup == "none" ) {

 	_e( "Registration has been disabled." );

 } else {

-	if( $active_signup == 'blog' && !is_user_logged_in() ) {

+	if( $active_signup == 'blog' && !is_user_logged_in() )

 		wp_die( 'You must be logged in to register a blog.' );

-	}

-	switch ($_POST['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( "Blog registration has been disabled." );

-		break;

-	case 'gimmeanotherblog':

-		validate_another_blog_signup();

-		break;

-	default :

-		$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_user( $newblogname, $user_email );

-		} elseif( is_user_logged_in() == false && ( $active_signup == 'blog' ) ) {

-			_e( "I'm sorry. We're not accepting new registrations at this time." );

-		} else {

-			_e( "You're logged in already. No need to register again!" );

-		}

 

-		if ($newblogname) {

-			if( constant( "VHOST" ) == 'no' )

-				$newblog = 'http://' . $current_site->domain . $current_site->path . $newblogname . '/';

+	switch ($_POST['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

-				$newblog = 'http://' . $newblogname . '.' . $current_site->domain . $current_site->path;

-			printf(__("<p><em>The blog you were looking for, <strong>%s</strong> doesn't exist but you can create it now!</em></p>"), $newblog );

-		}

+				_e( "User registration has been disabled." );

 		break;

+		case 'validate-blog-signup':

+			if( $active_signup == 'all' || $active_signup == 'blog' )

+				validate_blog_signup();

+			else

+				_e( "Blog registration has been disabled." );

+			break;

+		case 'gimmeanotherblog':

+			validate_another_blog_signup();

+			break;

+		default :

+			$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_user( $newblogname, $user_email );

+			} elseif( is_user_logged_in() == false && ( $active_signup == 'blog' ) ) {

+				_e( "I'm sorry. We're not accepting new registrations at this time." );

+			} else {

+				_e( "You're logged in already. No need to register again!" );

+			}

+			if ($newblogname) {

+				if( constant( "VHOST" ) == 'no' )

+					$newblog = 'http://' . $current_site->domain . $current_site->path . $newblogname . '/';

+				else

+					$newblog = 'http://' . $newblogname . '.' . $current_site->domain . $current_site->path;

+				printf(__("<p><em>The blog you were looking for, <strong>%s</strong> doesn't exist but you can create it now!</em></p>"), $newblog );

+			}

+			break;

 	}

 }

 ?>

 </div>

+</div>

 

 <?php get_footer(); ?>