Changeset 43571 for trunk/src/wp-admin/includes/user.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/user.php (modified) (11 diffs)

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

@@ -538 +538 @@
 });
 </script>
-<?php
+    <?php
 }
 
@@ -551 +551 @@
  */
 function use_ssl_preference( $user ) {
-?>
+    ?>
     <tr class="user-use-ssl-wrap">
         <th scope="row"><?php _e( 'Use https' ); ?></th>
         <td><label for="use_ssl"><input name="use_ssl" type="checkbox" id="use_ssl" value="1" <?php checked( '1', $user->use_ssl ); ?> /> <?php _e( 'Always use https when visiting the admin' ); ?></label></td>
     </tr>
-<?php
+    <?php
 }
 
@@ -577 +577 @@
 Please click the following link to activate your user account:
 %%s'
-        ), wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES ), home_url(), wp_specialchars_decode( translate_user_role( $role['name'] ) )
+        ),
+        wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES ),
+        home_url(),
+        wp_specialchars_decode( translate_user_role( $role['name'] ) )
     );
 }
@@ -628 +631 @@
     update_post_meta( $request_id, '_wp_user_request_completed_timestamp', time() );
 
-    $request = wp_update_post( array(
-        'ID'          => $request_id,
-        'post_status' => 'request-completed',
-    ) );
+    $request = wp_update_post(
+        array(
+            'ID'          => $request_id,
+            'post_status' => 'request-completed',
+        )
+    );
 
     return $request;
@@ -754 +759 @@
 function _wp_personal_data_cleanup_requests() {
     /** This filter is documented in wp-includes/user.php */
-    $expires        = (int) apply_filters( 'user_request_key_expiration', DAY_IN_SECONDS );
-
-    $requests_query = new WP_Query( array(
-        'post_type'      => 'user_request',
-        'posts_per_page' => -1,
-        'post_status'    => 'request-pending',
-        'fields'         => 'ids',
-        'date_query'     => array(
+    $expires = (int) apply_filters( 'user_request_key_expiration', DAY_IN_SECONDS );
+
+    $requests_query = new WP_Query(
+        array(
+            'post_type'      => 'user_request',
+            'posts_per_page' => -1,
+            'post_status'    => 'request-pending',
+            'fields'         => 'ids',
+            'date_query'     => array(
+                array(
+                    'column' => 'post_modified_gmt',
+                    'before' => $expires . ' seconds ago',
+                ),
+            ),
+        )
+    );
+
+    $request_ids = $requests_query->posts;
+
+    foreach ( $request_ids as $request_id ) {
+        wp_update_post(
             array(
-                'column' => 'post_modified_gmt',
-                'before' => $expires . ' seconds ago',
-            ),
-        ),
-    ) );
-
-    $request_ids = $requests_query->posts;
-
-    foreach ( $request_ids as $request_id ) {
-        wp_update_post( array(
-            'ID'            => $request_id,
-            'post_status'   => 'request-failed',
-            'post_password' => '',
-        ) );
+                'ID'            => $request_id,
+                'post_status'   => 'request-failed',
+                'post_password' => '',
+            )
+        );
     }
 }
@@ -797 +806 @@
     wp_enqueue_script( 'xfn' );
 
-    $requests_table = new WP_Privacy_Data_Export_Requests_Table( array(
-        'plural'   => 'privacy_requests',
-        'singular' => 'privacy_request',
-    ) );
+    $requests_table = new WP_Privacy_Data_Export_Requests_Table(
+        array(
+            'plural'   => 'privacy_requests',
+            'singular' => 'privacy_request',
+        )
+    );
     $requests_table->process_bulk_action();
     $requests_table->prepare_items();
@@ -868 +879 @@
     wp_enqueue_script( 'xfn' );
 
-    $requests_table = new WP_Privacy_Data_Removal_Requests_Table( array(
-        'plural'   => 'privacy_requests',
-        'singular' => 'privacy_request',
-    ) );
+    $requests_table = new WP_Privacy_Data_Removal_Requests_Table(
+        array(
+            'plural'   => 'privacy_requests',
+            'singular' => 'privacy_request',
+        )
+    );
 
     $requests_table->process_bulk_action();
@@ -1014 +1027 @@
 function _wp_privacy_requests_screen_options() {
     $args = array(
-        'option'  => str_replace( 'tools_page_', '', get_current_screen()->id ) . '_requests_per_page',
+        'option' => str_replace( 'tools_page_', '', get_current_screen()->id ) . '_requests_per_page',
     );
     add_screen_option( 'per_page', $args );
@@ -1176 +1189 @@
         $action      = $this->current_action();
         $request_ids = isset( $_REQUEST['request_id'] ) ? wp_parse_id_list( wp_unslash( $_REQUEST['request_id'] ) ) : array();
-        
-        $count       = 0;
+
+        $count = 0;
 
         if ( $request_ids ) {
@@ -1503 +1516 @@
                 break;
             case 'request-completed':
-                echo '<a href="' . esc_url( wp_nonce_url( add_query_arg( array(
-                    'action'     => 'delete',
-                    'request_id' => array( $item->ID ),
-                ), admin_url( 'tools.php?page=export_personal_data' ) ), 'bulk-privacy_requests' ) ) . '" class="button">' . esc_html__( 'Remove request' ) . '</a>';
+                echo '<a href="' . esc_url(
+                    wp_nonce_url(
+                        add_query_arg(
+                            array(
+                                'action'     => 'delete',
+                                'request_id' => array( $item->ID ),
+                            ),
+                            admin_url( 'tools.php?page=export_personal_data' )
+                        ),
+                        'bulk-privacy_requests'
+                    )
+                ) . '" class="button">' . esc_html__( 'Remove request' ) . '</a>';
                 break;
         }
@@ -1617 +1638 @@
                 break;
             case 'request-completed':
-                echo '<a href="' . esc_url( wp_nonce_url( add_query_arg( array(
-                    'action'     => 'delete',
-                    'request_id' => array( $item->ID ),
-                ), admin_url( 'tools.php?page=remove_personal_data' ) ), 'bulk-privacy_requests' ) ) . '" class="button">' . esc_html__( 'Remove request' ) . '</a>';
+                echo '<a href="' . esc_url(
+                    wp_nonce_url(
+                        add_query_arg(
+                            array(
+                                'action'     => 'delete',
+                                'request_id' => array( $item->ID ),
+                            ),
+                            admin_url( 'tools.php?page=remove_personal_data' )
+                        ),
+                        'bulk-privacy_requests'
+                    )
+                ) . '" class="button">' . esc_html__( 'Remove request' ) . '</a>';
                 break;
         }