Changeset 44626

Timestamp:

01/16/2019 04:50:15 PM (8 years ago)

Author:

desrosj

Message:

Coding Standards: Manually fix coding standards violations in wp-signup.php.

Props GaryJ, jrf, netweb, desrosj.
Fixes #43405.

File:

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

trunk/src/wp-signup.php

@@ -104 +104 @@
 
         $current_network = get_network();
-        // Blog name
+        // Blog name.
         if ( ! is_subdomain_install() ) {
                 echo '<label for="blogname">' . __( 'Site Name:' ) . '</label>';
@@ -111 +111 @@
         }
 
-        if ( $errmsg = $errors->get_error_message( 'blogname' ) ) {
+        $errmsg = $errors->get_error_message( 'blogname' );
+        if ( $errmsg ) {
                 ?>
                 <p class="error"><?php echo $errmsg; ?></p>
@@ -120 +121 @@
                 echo '<span class="prefix_address">' . $current_network->domain . $current_network->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_network->domain ) ) . '</span><br />';
+                $site_domain = preg_replace( '|^www\.|', '', $current_network->domain );
+                echo '<input name="blogname" type="text" id="blogname" value="' . esc_attr( $blogname ) . '" maxlength="60" /><span class="suffix_address">.' . esc_html( $site_domain ) . '</span><br />';
         }
 
@@ -137 +139 @@
         ?>
         <label for="blog_title"><?php _e( 'Site Title:' ); ?></label>
-        <?php if ( $errmsg = $errors->get_error_message( 'blog_title' ) ) { ?>
+        <?php
+        $errmsg = $errors->get_error_message( 'blog_title' );
+        if ( $errmsg ) {
+                ?>
                 <p class="error"><?php echo $errmsg; ?></p>
                 <?php
@@ -179 +184 @@
                 endif; // Languages.
 
-                $blog_public_on_checked = $blog_public_off_checked = '';
+                $blog_public_on_checked  = '';
+                $blog_public_off_checked = '';
         if ( isset( $_POST['blog_public'] ) && '0' == $_POST['blog_public'] ) {
                 $blog_public_off_checked = 'checked="checked"';
@@ -246 +252 @@
         // User name
         echo '<label for="user_name">' . __( 'Username:' ) . '</label>';
-        if ( $errmsg = $errors->get_error_message( 'user_name' ) ) {
+        $errmsg = $errors->get_error_message( 'user_name' );
+        if ( $errmsg ) {
                 echo '<p class="error">' . $errmsg . '</p>';
         }
@@ -254 +261 @@
 
         <label for="user_email"><?php _e( 'Email&nbsp;Address:' ); ?></label>
-        <?php if ( $errmsg = $errors->get_error_message( 'user_email' ) ) { ?>
+        <?php
+        $errmsg = $errors->get_error_message( 'user_email' );
+        if ( $errmsg ) {
+                ?>
                 <p class="error"><?php echo $errmsg; ?></p>
         <?php } ?>
         <input name="user_email" type="email" 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' ) ) {
+        $errmsg = $errors->get_error_message( 'generic' );
+        if ( $errmsg ) {
                 echo '<p class="error">' . $errmsg . '</p>';
         }
@@ -333 +344 @@
         <p>
                 <?php
-                /* translators: %s: Current user's display name. */
-                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 );
+                printf(
+                        /* translators: %s: Current user's display name. */
+                        __( '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>
@@ -588 +602 @@
 
                 <p>
-                <?php if ( $active_signup == 'blog' ) { ?>
+                <?php if ( 'blog' === $active_signup ) { ?>
                         <input id="signupblog" type="hidden" name="signup_for" value="blog" />
-                <?php } elseif ( $active_signup == 'user' ) { ?>
+                <?php } elseif ( 'user' === $active_signup ) { ?>
                         <input id="signupblog" type="hidden" name="signup_for" value="user" />
                 <?php } else { ?>
@@ -913 +927 @@
 
 $current_user = wp_get_current_user();
-if ( $active_signup == 'none' ) {
+if ( 'none' === $active_signup ) {
         _e( 'Registration has been disabled.' );
-} elseif ( $active_signup == 'blog' && ! is_user_logged_in() ) {
+} elseif ( 'blog' === $active_signup && ! is_user_logged_in() ) {
         $login_url = wp_login_url( network_site_url( 'wp-signup.php' ) );
         /* translators: %s: login URL */
@@ -923 +937 @@
         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 ( 'all' === $active_signup
+                                || ( 'blog' === $_POST['signup_for'] && 'blog' === $active_signup )
+                                || ( 'user' === $_POST['signup_for'] && 'user' === $active_signup )
+                        ) {
                                 validate_user_signup();
                         } else {
@@ -930 +947 @@
                         break;
                 case 'validate-blog-signup':
-                        if ( $active_signup == 'all' || $active_signup == 'blog' ) {
+                        if ( 'all' === $active_signup || 'blog' === $active_signup ) {
                                 validate_blog_signup();
                         } else {
@@ -948 +965 @@
                          */
                         do_action( 'preprocess_signup_form' );
-                        if ( is_user_logged_in() && ( $active_signup == 'all' || $active_signup == 'blog' ) ) {
+                        if ( is_user_logged_in() && ( 'all' === $active_signup || 'blog' === $active_signup ) ) {
                                 signup_another_blog( $newblogname );
-                        } elseif ( ! is_user_logged_in() && ( $active_signup == 'all' || $active_signup == 'user' ) ) {
+                        } elseif ( ! is_user_logged_in() && ( 'all' === $active_signup || 'user' === $active_signup ) ) {
                                 signup_user( $newblogname, $user_email );
-                        } elseif ( ! is_user_logged_in() && ( $active_signup == 'blog' ) ) {
+                        } elseif ( ! is_user_logged_in() && ( 'blog' === $active_signup ) ) {
                                 _e( 'Sorry, new registrations are not allowed at this time.' );
                         } else {
@@ -961 +978 @@
                                 $newblog = get_blogaddress_by_name( $newblogname );
 
-                                if ( $active_signup == 'blog' || $active_signup == 'all' ) {
+                                if ( 'blog' === $active_signup || 'all' === $active_signup ) {
                                         printf(
                                                 /* translators: %s: site address */