Changeset 12735 for trunk/wp-signup.php

Timestamp:

01/15/2010 11:40:29 PM (11 years ago)

Author:

ryan

Message:

Coding style

File:

• trunk/wp-signup.php (modified) (12 diffs)

trunk/wp-signup.php

@@ -9 +9 @@
 require_once( ABSPATH . WPINC . '/registration.php' );
 
-if( is_array( get_site_option( 'illegal_names' )) && $_GET[ 'new' ] != '' && in_array( $_GET[ 'new' ], get_site_option( 'illegal_names' ) ) == true ) {
+if ( is_array( get_site_option( 'illegal_names' )) && $_GET[ 'new' ] != '' && in_array( $_GET[ 'new' ], get_site_option( 'illegal_names' ) ) == true ) {
     wp_redirect( "http://{$current_site->domain}{$current_site->path}" );
     die();
@@ -23 +23 @@
 }
 
-if( $current_blog->domain . $current_blog->path != $current_site->domain . $current_site->path ) {
+if ( $current_blog->domain . $current_blog->path != $current_site->domain . $current_site->path ) {
     wp_redirect( "http://" . $current_site->domain . $current_site->path . "wp-signup.php" );
     die();
@@ -57 +57 @@
     global $current_site;
     // Blog name
-    if( !is_subdomain_install() )
+    if ( !is_subdomain_install() )
         echo '<label for="blogname">' . __('Blog Name:') . '</label>';
     else
@@ -66 +66 @@
     <?php }
 
-    if( !is_subdomain_install() ) {
+    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="50" /><br />';
-    } else {
+    else
         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 />';
-    }
+
     if ( !is_user_logged_in() ) {
         print '(<strong>' . __( 'Your address will be ' );
-        if( !is_subdomain_install() ) {
+        if ( !is_subdomain_install() )
             print $current_site->domain . $current_site->path . __( 'blogname' );
-        } else {
+        else
             print __( 'domain.' ) . $current_site->domain . $current_site->path;
-        }
         echo '.</strong> ' . __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed so choose carefully!)' ) . '</p>';
     }
@@ -96 +95 @@
             <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 } ?> />
+                <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 } ?> />
+                <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>
@@ -191 +190 @@
     global $wpdb, $current_user, $blogname, $blog_title, $errors, $domain, $path;
     $current_user = wp_get_current_user();
-    if( !is_user_logged_in() )
+    if ( !is_user_logged_in() )
         die();
 
@@ -226 +225 @@
     if ( !is_wp_error($errors) )
         $errors = new WP_Error();
-    if( isset( $_POST[ 'signup_for' ] ) ) {
+    if ( isset( $_POST[ 'signup_for' ] ) )
         $signup[ wp_specialchars( $_POST[ 'signup_for' ] ) ] = 'checked="checked"';
-    } else {
+    else
         $signup[ 'blog' ] = 'checked="checked"';
-    }
 
     // allow definition of default variables
@@ -247 +245 @@
 
         <p>
-        <?php if( $active_signup == 'blog' ) { ?>
+        <?php if ( $active_signup == 'blog' ) { ?>
             <input id="signupblog" type="hidden" name="signup_for" value="blog" />
-        <?php } elseif( $active_signup == 'user' ) { ?>
+        <?php } elseif ( $active_signup == 'user' ) { ?>
             <input id="signupblog" type="hidden" name="signup_for" value="user" />
         <?php } else { ?>
@@ -370 +368 @@
 // 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"
 
-if( is_super_admin() )
+if ( is_super_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/ms-options.php'>Options page</a>." ), $active_signup ) . '</div>';
 
@@ -381 +379 @@
 
 $current_user = wp_get_current_user();
-if( $active_signup == "none" ) {
+if ( $active_signup == "none" ) {
     _e( "Registration has been disabled." );
-} elseif( $active_signup == 'blog' && !is_user_logged_in() ){
-    if( is_ssl() ) {
+} elseif ( $active_signup == 'blog' && !is_user_logged_in() ) {
+    if ( is_ssl() )
         $proto = 'https://';
-    } else {
+    else
         $proto = 'http://';
-    }
     $login_url = site_url( 'wp-login.php?redirect_to=' . urlencode($proto . $_SERVER['HTTP_HOST'] . '/wp-signup.php' ));
     echo sprintf( __( "You must first <a href=\"%s\">login</a>, and then you can create a new blog."), $login_url );
@@ -400 +397 @@
         break;
         case 'validate-blog-signup':
-            if( $active_signup == 'all' || $active_signup == 'blog' )
+            if ( $active_signup == 'all' || $active_signup == 'blog' )
                 validate_blog_signup();
             else
@@ -411 +408 @@
             $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' ) ) {
+            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' ) ) {
+            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' ) ) {
+            elseif( is_user_logged_in() == false && ( $active_signup == 'blog' ) )
                 _e( "I'm sorry. We're not accepting new registrations at this time." );
-            } else {
+            else
                 _e( "You're logged in already. No need to register again!" );
-            }
+
             if ($newblogname) {
-                if( !is_subdomain_install() )
+                if ( !is_subdomain_install() )
                     $newblog = 'http://' . $current_site->domain . $current_site->path . $newblogname . '/';
                 else
                     $newblog = 'http://' . $newblogname . '.' . $current_site->domain . $current_site->path;
-                if ($active_signup == 'blog' || $active_signup == 'all')
+                if ( $active_signup == 'blog' || $active_signup == 'all' )
                     printf(__("<p><em>The blog you were looking for, <strong>%s</strong> doesn't exist but you can create it now!</em></p>"), $newblog );
                 else