Changeset 43571 for trunk/src/wp-admin/includes/network.php

Timestamp:

08/17/2018 01:50:26 AM (6 years ago)

Author:

pento

Message:

Coding Standards: Upgrade WPCS to 1.0.0

WPCS 1.0.0 includes a bunch of new auto-fixers, which drops the number of coding standards issues across WordPress significantly. Prior to running the auto-fixers, there were 15,312 issues detected. With this commit, we now drop to 4,769 issues.

This change includes three notable additions:

• Multiline function calls must now put each parameter on a new line.
• Auto-formatting files is now part of the grunt precommit script.
• Auto-fixable coding standards issues will now cause Travis failures.

Fixes #44600.

File:

• trunk/src/wp-admin/includes/network.php (modified) (12 diffs)

trunk/src/wp-admin/includes/network.php

@@ -218 +218 @@
 
     if ( allow_subdomain_install() && allow_subdirectory_install() ) :
-    ?>
+        ?>
         <h3><?php esc_html_e( 'Addresses of Sites in your Network' ); ?></h3>
         <p><?php _e( 'Please choose whether you would like sites in your WordPress network to use sub-domains or sub-directories.' ); ?>
@@ -251 +251 @@
         </table>
 
-<?php
+        <?php
     endif;
 
@@ -283 +283 @@
                         '<code>' . $hostname . '</code>'
                     );
-                    ?>
+                ?>
                 </td>
             </tr>
@@ -412 +412 @@
         if ( is_multisite() ) {
             $subdomain_install = is_subdomain_install();
-?>
+            ?>
     <p><?php _e( 'The original configuration steps are shown here for reference.' ); ?></p>
-<?php
+            <?php
         } else {
             $subdomain_install = (bool) $wpdb->get_var( "SELECT meta_value FROM $wpdb->sitemeta WHERE site_id = 1 AND meta_key = 'subdomain_install'" );
-?>
+            ?>
     <div class="error"><p><strong><?php _e( 'Warning:' ); ?></strong> <?php _e( 'An existing WordPress network was detected.' ); ?></p></div>
     <p><?php _e( 'Please complete the configuration steps. To create a new network, you will need to empty or remove the network database tables.' ); ?></p>
-<?php
+            <?php
         }
     }
@@ -429 +429 @@
 
     if ( $_POST || ! is_multisite() ) {
-?>
+        ?>
         <h3><?php esc_html_e( 'Enabling the Network' ); ?></h3>
         <p><?php _e( 'Complete the following steps to enable the features for creating a network of sites.' ); ?></p>
@@ -460 +460 @@
         ?>
         </p></div>
-<?php
-    }
-?>
+        <?php
+    }
+    ?>
         <ol>
             <li><p>
@@ -488 +488 @@
 define('BLOG_ID_CURRENT_SITE', 1);
 </textarea>
-<?php
+    <?php
     $keys_salts = array(
         'AUTH_KEY'         => '',
@@ -499 +499 @@
         'NONCE_SALT'       => '',
     );
-foreach ( $keys_salts as $c => $v ) {
-    if ( defined( $c ) ) {
-        unset( $keys_salts[ $c ] );
-    }
-}
-
-if ( ! empty( $keys_salts ) ) {
-    $keys_salts_str = '';
-    $from_api       = wp_remote_get( 'https://api.wordpress.org/secret-key/1.1/salt/' );
-    if ( is_wp_error( $from_api ) ) {
-        foreach ( $keys_salts as $c => $v ) {
-            $keys_salts_str .= "\ndefine( '$c', '" . wp_generate_password( 64, true, true ) . "' );";
-        }
-    } else {
-        $from_api = explode( "\n", wp_remote_retrieve_body( $from_api ) );
-        foreach ( $keys_salts as $c => $v ) {
-            $keys_salts_str .= "\ndefine( '$c', '" . substr( array_shift( $from_api ), 28, 64 ) . "' );";
-        }
-    }
-    $num_keys_salts = count( $keys_salts );
-?>
+    foreach ( $keys_salts as $c => $v ) {
+        if ( defined( $c ) ) {
+            unset( $keys_salts[ $c ] );
+        }
+    }
+
+    if ( ! empty( $keys_salts ) ) {
+        $keys_salts_str = '';
+        $from_api       = wp_remote_get( 'https://api.wordpress.org/secret-key/1.1/salt/' );
+        if ( is_wp_error( $from_api ) ) {
+            foreach ( $keys_salts as $c => $v ) {
+                $keys_salts_str .= "\ndefine( '$c', '" . wp_generate_password( 64, true, true ) . "' );";
+            }
+        } else {
+            $from_api = explode( "\n", wp_remote_retrieve_body( $from_api ) );
+            foreach ( $keys_salts as $c => $v ) {
+                $keys_salts_str .= "\ndefine( '$c', '" . substr( array_shift( $from_api ), 28, 64 ) . "' );";
+            }
+        }
+        $num_keys_salts = count( $keys_salts );
+        ?>
 <p>
-    <?php
-    if ( 1 == $num_keys_salts ) {
-        printf(
-            /* translators: %s: wp-config.php */
-            __( 'This unique authentication key is also missing from your %s file.' ),
-            '<code>wp-config.php</code>'
-        );
-    } else {
-        printf(
-            /* translators: %s: wp-config.php */
-            __( 'These unique authentication keys are also missing from your %s file.' ),
-            '<code>wp-config.php</code>'
-        );
-    }
+        <?php
+        if ( 1 == $num_keys_salts ) {
+            printf(
+                /* translators: %s: wp-config.php */
+                __( 'This unique authentication key is also missing from your %s file.' ),
+                '<code>wp-config.php</code>'
+            );
+        } else {
+            printf(
+                /* translators: %s: wp-config.php */
+                __( 'These unique authentication keys are also missing from your %s file.' ),
+                '<code>wp-config.php</code>'
+            );
+        }
         ?>
         <?php _e( 'To make your installation more secure, you should also add:' ); ?>
     </p>
     <textarea class="code" readonly="readonly" cols="100" rows="<?php echo $num_keys_salts; ?>"><?php echo esc_textarea( $keys_salts_str ); ?></textarea>
-<?php
-}
-?>
+        <?php
+    }
+    ?>
 </li>
-<?php
-if ( iis7_supports_permalinks() ) :
-    // IIS doesn't support RewriteBase, all your RewriteBase are belong to us
-    $iis_subdir_match       = ltrim( $base, '/' ) . $subdir_match;
-    $iis_rewrite_base       = ltrim( $base, '/' ) . $rewrite_base;
-    $iis_subdir_replacement = $subdomain_install ? '' : '{R:1}';
-
-    $web_config_file = '<?xml version="1.0" encoding="UTF-8"?>
+    <?php
+    if ( iis7_supports_permalinks() ) :
+        // IIS doesn't support RewriteBase, all your RewriteBase are belong to us
+        $iis_subdir_match       = ltrim( $base, '/' ) . $subdir_match;
+        $iis_rewrite_base       = ltrim( $base, '/' ) . $rewrite_base;
+        $iis_subdir_replacement = $subdomain_install ? '' : '{R:1}';
+
+        $web_config_file = '<?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <system.webServer>
@@ -559 +559 @@
                     <action type="None" />
                 </rule>';
-    if ( is_multisite() && get_site_option( 'ms_files_rewriting' ) ) {
-        $web_config_file .= '
+        if ( is_multisite() && get_site_option( 'ms_files_rewriting' ) ) {
+            $web_config_file .= '
                 <rule name="WordPress Rule for Files" stopProcessing="true">
                     <match url="^' . $iis_subdir_match . 'files/(.+)" ignoreCase="false" />
                     <action type="Rewrite" url="' . $iis_rewrite_base . WPINC . '/ms-files.php?file={R:1}" appendQueryString="false" />
                 </rule>';
-    }
+        }
             $web_config_file .= '
                 <rule name="WordPress Rule 2" stopProcessing="true">
@@ -604 +604 @@
                 '<code>' . $home_path . '</code>'
             );
-    echo '</p>';
-    if ( ! $subdomain_install && WP_CONTENT_DIR != ABSPATH . 'wp-content' ) {
-        echo '<p><strong>' . __( 'Warning:' ) . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</strong></p>';
-    }
-    ?>
+        echo '</p>';
+        if ( ! $subdomain_install && WP_CONTENT_DIR != ABSPATH . 'wp-content' ) {
+            echo '<p><strong>' . __( 'Warning:' ) . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</strong></p>';
+        }
+        ?>
     <textarea class="code" readonly="readonly" cols="100" rows="20"><?php echo esc_textarea( $web_config_file ); ?>
         </textarea></li>
         </ol>
 
-    <?php
+        <?php
     else : // end iis7_supports_permalinks(). construct an htaccess file instead:
 
@@ -652 +652 @@
         ?>
         <textarea class="code" readonly="readonly" cols="100" rows="<?php echo substr_count( $htaccess_file, "\n" ) + 1; ?>">
-<?php echo esc_textarea( $htaccess_file ); ?></textarea></li>
+        <?php echo esc_textarea( $htaccess_file ); ?></textarea></li>
         </ol>
 
-    <?php
+        <?php
     endif; // end IIS/Apache code branches.
 
@@ -661 +661 @@
         ?>
         <p><?php _e( 'Once you complete these steps, your network is enabled and configured. You will have to log in again.' ); ?> <a href="<?php echo esc_url( wp_login_url() ); ?>"><?php _e( 'Log In' ); ?></a></p>
-    <?php
+        <?php
     }
 }