Changeset 946

Show
Ignore:
Timestamp:
03/28/07 17:05:40 (2 years ago)
Author:
donncha
Message:

Some validation changes. mostly fixes #292

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wp-signup.php

    r926 r946  
    11<?php 
    2  
    32define( "WP_INSTALLING", true ); 
    4 require ('wp-config.php'); 
    5 require('./wp-blog-header.php'); 
    6  
    7 require_once( ABSPATH . WPINC . '/registration.php'); 
     3require( 'wp-config.php' ); 
     4require( 'wp-blog-header.php' ); 
     5require_once( ABSPATH . WPINC . '/registration.php' ); 
    86 
    97do_action("signup_header"); 
     8 
    109if( $current_blog->domain != $current_site->domain ) { 
    1110        header( "Location: http://" . $current_site->domain . $current_site->path . "wp-signup.php" ); 
    …… 
    1514get_header(); 
    1615?> 
    17 <div id="content" class="widecolumn"> 
    1816<style type="text/css"> 
    1917form { margin-top: 2em; } 
    …… 
    2624} 
    2725</style> 
     26<div id="content" class="widecolumn"> 
    2827<?php 
    2928function show_blog_form($blog_id = '', $blog_title = '', $errors = '') { 
    …… 
    168167<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> 
    169168<form name="setupform" id="setupform" method="post" action="wp-signup.php"> 
    170 <input type="hidden" name="stage" value="gimmeanotherblog"> 
     169<input type="hidden" name="stage" value="gimmeanotherblog" /> 
    171170<?php do_action( "signup_hidden_fields" ); ?> 
    172171<table border="0" width="100%" cellpadding="9"> 
    …… 
    215214                $errors = new WP_Error(); 
    216215        if( isset( $_POST[ 'signup_for' ] ) ) { 
    217                 $signup[ wp_specialchars( $_POST[ 'signup_for' ] ) ] = 'checked'; 
    218         } else { 
    219                 $signup[ 'blog' ] = 'checked'; 
     216                $signup[ wp_specialchars( $_POST[ 'signup_for' ] ) ] = 'checked="checked"'; 
     217        } else { 
     218                $signup[ 'blog' ] = 'checked="checked"'; 
    220219        } 
    221220 
    …… 
    229228<p><?php _e( "Fill out this one-step form and you'll be blogging seconds later!" ); ?></p> 
    230229<form name="setupform" id="setupform" method="post" action="wp-signup.php"> 
    231 <input type="hidden" name="stage" value="validate-user-signup"> 
     230<input type="hidden" name="stage" value="validate-user-signup" /> 
    232231<?php do_action( "signup_hidden_fields" ); ?> 
    233232<table border="0" width="100%" cellpadding="9" cellspacing="4"> 
    234233<?php show_user_form($user_name, $user_email, $errors); ?> 
     234<tr> 
    235235<th scope="row"  valign="top">&nbsp;</th> 
    236236<td> 
    …… 
    298298?> 
    299299<form name="setupform" id="setupform" method="post" action="wp-signup.php"> 
    300 <input type="hidden" name="stage" value="validate-blog-signup"> 
    301 <input type="hidden" name="user_name" value="<?php echo $user_name ?>"> 
    302 <input type="hidden" name="user_email" value="<?php echo $user_email ?>"> 
     300<input type="hidden" name="stage" value="validate-blog-signup" /> 
     301<input type="hidden" name="user_name" value="<?php echo $user_name ?>" /> 
     302<input type="hidden" name="user_email" value="<?php echo $user_email ?>" /> 
    303303<?php do_action( "signup_hidden_fields" ); ?> 
    304304<table border="0" width="100%" cellpadding="9">