WordPress.org
Get WordPress

Make WordPress Core

Changeset 14575


Ignore:
Timestamp:
05/12/2010 12:45:01 AM (14 years ago)
Author:
wpmuguru
Message:

signup cleanup, props ocean90, fixes #13087

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/wp-signup.php

    r14139 r14575  
    1010
    1111if ( is_array( get_site_option( 'illegal_names' )) && isset( $_GET[ 'new' ] ) && in_array( $_GET[ 'new' ], get_site_option( 'illegal_names' ) ) == true ) {
    12     wp_redirect( "http://{$current_site->domain}{$current_site->path}" );
     12    wp_redirect( network_home_url() );
    1313    die();
    1414}
    … …  
    2929
    3030if ( !is_main_site() ) {
    31     wp_redirect( "http://" . $current_site->domain . $current_site->path . "wp-signup.php" );
     31    wp_redirect( network_home_url( 'wp-signup.php' ) );
    3232    die();
    3333}
     34
     35// Fix for page title
     36$wp_query->is_404 = false;
    3437
    3538function wpmu_signup_stylesheet() {
    … …  
    7679        echo '<span class="prefix_address">' . $current_site->domain . $current_site->path . '</span><input name="blogname" type="text" id="blogname" value="'. esc_attr($blogname) .'" maxlength="50" /><br />';
    7780    else
    78         echo '<input name="blogname" type="text" id="blogname" value="'.esc_attr($blogname).'" maxlength="50" /><span class="suffix_address">.' . $current_site->domain . $current_site->path . '</span><br />';
     81        echo '<input name="blogname" type="text" id="blogname" value="'.esc_attr($blogname).'" maxlength="50" /><span class="suffix_address">.' . $current_site->domain . '</span><br />';
    7982
    8083    if ( !is_user_logged_in() ) {
    … …  
    8487        else
    8588            print __( 'domain.' ) . $current_site->domain . $current_site->path;
    86         echo '.</strong> ' . __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed, so choose carefully!' ) . '</p>';
     89        echo '.)</strong> ' . __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed, so choose carefully!' ) . '</p>';
    8790    }
    8891
    … …  
    99102        <p class="privacy-intro">
    100103            <label for="blog_public_on"><?php _e('Privacy:') ?></label>
    101             <?php _e('I would like my site to appear in search engines like Google and Technorati, and in public listings around this network.'); ?>
     104            <?php _e('Allow my site to appear in search engines like Google, Technorati, and in public listings around this network.'); ?>
    102105            <div style="clear:both;"></div>
    103106            <label class="checkbox" for="blog_public_on">
    … …  
    138141        <p class="error"><?php echo $errmsg ?></p>
    139142    <?php } ?>
    140     <input name="user_email" type="text" id="user_email" value="<?php  echo esc_attr($user_email) ?>" maxlength="200" /><br /><?php _e('(We&#8217;ll send your password to this address, so <strong>triple-check it</strong>.)') ?>
     143    <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.)') ?>
    141144    <?php
    142145    if ( $errmsg = $errors->get_error_message('generic') ) {
    … …  
    178181            <ul>
    179182                <?php foreach ( $blogs as $blog ) {
    180                     echo "<li><a href='http://" . $blog->domain . $blog->path . "'>" . $blog->domain . $blog->path . "</a></li>";
     183                    $home_url = get_home_url( $blog->userblog_id );
     184                    echo '<li><a href="' . esc_url( $home_url ) . '">' . $home_url . '</a></li>';
    181185                } ?>
    182186            </ul>
    … …  
    361365
    362366    <p><?php _e( 'But, before you can start using your site, <strong>you must activate it</strong>.' ) ?></p>
    363     <p><?php printf( __( 'Check your inbox at <strong>%s</strong> and click the link given. It should arrive within 30 minutes.' ),  $user_email) ?></p>
     367    <p><?php printf( __( 'Check your inbox at <strong>%s</strong> and click the link given.' ),  $user_email) ?></p>
    364368    <p><?php _e( 'If you do not activate your site within two days, you will have to sign up again.' ); ?></p>
    365369    <h2><?php _e( 'Still waiting for your email?' ); ?></h2>
    … …  
    367371        <?php _e( 'If you haven&#8217;t received your email yet, there are a number of things you can do:' ) ?>
    368372        <ul id="noemail-tips">
    369             <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>
    370             <li><p><?php _e( 'Check the junk or spam folder of your email client.  Sometime emails wind up there by mistake.' ) ?></p></li>
    371             <li><?php printf( __( 'Have you entered your email correctly?  We think it&#8217;s %s but if you have entered it incorrectly, you will not receive it.' ), $user_email ) ?></li>
     373            <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>
     374            <li><p><?php _e( 'Check the junk or spam folder of your email client. Sometime emails wind up there by mistake.' ) ?></p></li>
     375            <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>
    372376        </ul>
    373377    </p>
    … …  
    384388
    385389if ( is_super_admin() )
    386     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="wp-admin/ms-options.php">Options page</a>.' ), $active_signup ) . '</div>';
     390    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>.' ), $active_signup, esc_url( network_admin_url( 'ms-options.php' ) ) ) . '</div>';
    387391
    388392$newblogname = isset($_GET['new']) ? strtolower(preg_replace('/^-|-$|[^-a-zA-Z0-9]/', '', $_GET['new'])) : null;
    … …  
    425429                signup_user( $newblogname, $user_email );
    426430            elseif ( is_user_logged_in() == false && ( $active_signup == 'blog' ) )
    427                 _e( 'We are sorry. We are not accepting new registrations at this time.' );
     431                _e( 'Sorry, new registrations are not allowed at this time.' );
    428432            else
    429433                _e( 'You are logged in already. No need to register again!' );
Note: See TracChangeset for help on using the changeset viewer.