WordPress.org
Get WordPress

Make WordPress Core


Ignore:
Timestamp:
11/30/2017 11:09:33 PM (7 years ago)
Author:
pento
Message:

Code is Poetry.
WordPress' code just... wasn't.
This is now dealt with.

Props jrf, pento, netweb, GaryJ, jdgrimes, westonruter, Greg Sherwood from PHPCS, and everyone who's ever contributed to WPCS and PHPCS.
Fixes #41057.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/wp-admin/network/site-users.php

    r42228 r42343  
    1111require_once( dirname( __FILE__ ) . '/admin.php' );
    1212
    13 if ( ! current_user_can('manage_sites') )
     13if ( ! current_user_can( 'manage_sites' ) ) {
    1414    wp_die( __( 'Sorry, you are not allowed to edit this site.' ), 403 );
    15 
    16 $wp_list_table = _get_list_table('WP_Users_List_Table');
     15}
     16
     17$wp_list_table = _get_list_table( 'WP_Users_List_Table' );
    1718$wp_list_table->prepare_items();
    1819
    … …  
    2021get_current_screen()->set_help_sidebar( get_site_screen_help_sidebar_content() );
    2122
    22 get_current_screen()->set_screen_reader_content( array(
    23     'heading_views'      => __( 'Filter site users list' ),
    24     'heading_pagination' => __( 'Site users list navigation' ),
    25     'heading_list'       => __( 'Site users list' ),
    26 ) );
     23get_current_screen()->set_screen_reader_content(
     24    array(
     25        'heading_views'      => __( 'Filter site users list' ),
     26        'heading_pagination' => __( 'Site users list navigation' ),
     27        'heading_list'       => __( 'Site users list' ),
     28    )
     29);
    2730
    2831$_SERVER['REQUEST_URI'] = remove_query_arg( 'update', $_SERVER['REQUEST_URI'] );
    29 $referer = remove_query_arg( 'update', wp_get_referer() );
     32$referer                = remove_query_arg( 'update', wp_get_referer() );
    3033
    3134if ( ! empty( $_REQUEST['paged'] ) ) {
    … …  
    3538$id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
    3639
    37 if ( ! $id )
    38     wp_die( __('Invalid site ID.') );
     40if ( ! $id ) {
     41    wp_die( __( 'Invalid site ID.' ) );
     42}
    3943
    4044$details = get_site( $id );
    … …  
    4347}
    4448
    45 if ( ! can_edit_network( $details->site_id ) )
     49if ( ! can_edit_network( $details->site_id ) ) {
    4650    wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
     51}
    4752
    4853$is_main_site = is_main_site( $id );
    … …  
    6166                $update = 'err_new';
    6267            } else {
    63                 $password = wp_generate_password( 12, false);
    64                 $user_id = wpmu_create_user( esc_html( strtolower( $user['username'] ) ), $password, esc_html( $user['email'] ) );
     68                $password = wp_generate_password( 12, false );
     69                $user_id  = wpmu_create_user( esc_html( strtolower( $user['username'] ) ), $password, esc_html( $user['email'] ) );
    6570
    6671                if ( false === $user_id ) {
    67                     $update = 'err_new_dup';
     72                    $update = 'err_new_dup';
    6873                } else {
    6974                    $result = add_user_to_blog( $id, $user_id, $_POST['new_role'] );
    … …  
    8893        case 'adduser':
    8994            check_admin_referer( 'add-user', '_wpnonce_add-user' );
    90             if ( !empty( $_POST['newuser'] ) ) {
    91                 $update = 'adduser';
     95            if ( ! empty( $_POST['newuser'] ) ) {
     96                $update  = 'adduser';
    9297                $newuser = $_POST['newuser'];
    93                 $user = get_user_by( 'login', $newuser );
     98                $user    = get_user_by( 'login', $newuser );
    9499                if ( $user && $user->exists() ) {
    95100                    if ( ! is_user_member_of_blog( $user->ID, $id ) ) {
    … …  
    135140            check_admin_referer( 'bulk-users' );
    136141            $editable_roles = get_editable_roles();
    137             $role = false;
     142            $role           = false;
    138143            if ( ! empty( $_REQUEST['new_role2'] ) ) {
    139144                $role = $_REQUEST['new_role2'];
    … …  
    148153            if ( isset( $_REQUEST['users'] ) ) {
    149154                $userids = $_REQUEST['users'];
    150                 $update = 'promote';
     155                $update  = 'promote';
    151156                foreach ( $userids as $user_id ) {
    152157                    $user_id = (int) $user_id;
    … …  
    176181            /** This action is documented in wp-admin/network/site-themes.php */
    177182            $referer = apply_filters( 'handle_network_bulk_actions-' . get_current_screen()->id, $referer, $action, $userids, $id );
    178             $update = $action;
     183            $update  = $action;
    179184            break;
    180185    }
    … …  
    196201$title = sprintf( __( 'Edit Site: %s' ), esc_html( $details->blogname ) );
    197202
    198 $parent_file = 'sites.php';
     203$parent_file  = 'sites.php';
    199204$submenu_file = 'sites.php';
    200205
    … …  
    206211 * @param bool $bool Whether to show the Add Existing User form. Default true.
    207212 */
    208 if ( ! wp_is_large_network( 'users' ) && apply_filters( 'show_network_site_users_add_existing_form', true ) )
     213if ( ! wp_is_large_network( 'users' ) && apply_filters( 'show_network_site_users_add_existing_form', true ) ) {
    209214    wp_enqueue_script( 'user-suggest' );
     215}
    210216
    211217require( ABSPATH . 'wp-admin/admin-header.php' ); ?>
    … …  
    221227<?php
    222228
    223 network_edit_site_nav( array(
    224     'blog_id'  => $id,
    225     'selected' => 'site-users'
    226 ) );
    227 
    228 if ( isset($_GET['update']) ) :
    229     switch($_GET['update']) {
    230     case 'adduser':
    231         echo '<div id="message" class="updated notice is-dismissible"><p>' . __( 'User added.' ) . '</p></div>';
    232         break;
    233     case 'err_add_member':
    234         echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'User is already a member of this site.' ) . '</p></div>';
    235         break;
    236     case 'err_add_fail':
    237         echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'User could not be added to this site.' ) . '</p></div>';
    238         break;
    239     case 'err_add_notfound':
    240         echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Enter the username of an existing user.' ) . '</p></div>';
    241         break;
    242     case 'promote':
    243         echo '<div id="message" class="updated notice is-dismissible"><p>' . __( 'Changed roles.' ) . '</p></div>';
    244         break;
    245     case 'err_promote':
    246         echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Select a user to change role.' ) . '</p></div>';
    247         break;
    248     case 'remove':
    249         echo '<div id="message" class="updated notice is-dismissible"><p>' . __( 'User removed from this site.' ) . '</p></div>';
    250         break;
    251     case 'err_remove':
    252         echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Select a user to remove.' ) . '</p></div>';
    253         break;
    254     case 'newuser':
    255         echo '<div id="message" class="updated notice is-dismissible"><p>' . __( 'User created.' ) . '</p></div>';
    256         break;
    257     case 'err_new':
    258         echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Enter the username and email.' ) . '</p></div>';
    259         break;
    260     case 'err_new_dup':
    261         echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Duplicated username or email address.' ) . '</p></div>';
    262         break;
     229network_edit_site_nav(
     230    array(
     231        'blog_id'  => $id,
     232        'selected' => 'site-users',
     233    )
     234);
     235
     236if ( isset( $_GET['update'] ) ) :
     237    switch ( $_GET['update'] ) {
     238        case 'adduser':
     239            echo '<div id="message" class="updated notice is-dismissible"><p>' . __( 'User added.' ) . '</p></div>';
     240            break;
     241        case 'err_add_member':
     242            echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'User is already a member of this site.' ) . '</p></div>';
     243            break;
     244        case 'err_add_fail':
     245            echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'User could not be added to this site.' ) . '</p></div>';
     246            break;
     247        case 'err_add_notfound':
     248            echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Enter the username of an existing user.' ) . '</p></div>';
     249            break;
     250        case 'promote':
     251            echo '<div id="message" class="updated notice is-dismissible"><p>' . __( 'Changed roles.' ) . '</p></div>';
     252            break;
     253        case 'err_promote':
     254            echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Select a user to change role.' ) . '</p></div>';
     255            break;
     256        case 'remove':
     257            echo '<div id="message" class="updated notice is-dismissible"><p>' . __( 'User removed from this site.' ) . '</p></div>';
     258            break;
     259        case 'err_remove':
     260            echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Select a user to remove.' ) . '</p></div>';
     261            break;
     262        case 'newuser':
     263            echo '<div id="message" class="updated notice is-dismissible"><p>' . __( 'User created.' ) . '</p></div>';
     264            break;
     265        case 'err_new':
     266            echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Enter the username and email.' ) . '</p></div>';
     267            break;
     268        case 'err_new_dup':
     269            echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Duplicated username or email address.' ) . '</p></div>';
     270            break;
    263271    }
    264 endif; ?>
     272endif;
     273?>
    265274
    266275<form class="search-form" method="get">
    267276<?php $wp_list_table->search_box( __( 'Search Users' ), 'user' ); ?>
    268 <input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
     277<input type="hidden" name="id" value="<?php echo esc_attr( $id ); ?>" />
    269278</form>
    270279
    … …  
    272281
    273282<form method="post" action="site-users.php?action=update-site">
    274     <input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
     283    <input type="hidden" name="id" value="<?php echo esc_attr( $id ); ?>" />
    275284
    276285<?php $wp_list_table->display(); ?>
    … …  
    287296
    288297/** This filter is documented in wp-admin/network/site-users.php */
    289 if ( current_user_can( 'promote_users' ) && apply_filters( 'show_network_site_users_add_existing_form', true ) ) : ?>
     298if ( current_user_can( 'promote_users' ) && apply_filters( 'show_network_site_users_add_existing_form', true ) ) :
     299?>
    290300<h2 id="add-existing-user"><?php _e( 'Add Existing User' ); ?></h2>
    291301<form action="site-users.php?action=adduser" id="adduser" method="post">
    292     <input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
     302    <input type="hidden" name="id" value="<?php echo esc_attr( $id ); ?>" />
    293303    <table class="form-table">
    294304        <tr>
    … …  
    307317        </tr>
    308318    </table>
    309     <?php wp_nonce_field( 'add-user', '_wpnonce_add-user' ) ?>
     319    <?php wp_nonce_field( 'add-user', '_wpnonce_add-user' ); ?>
    310320    <?php submit_button( __( 'Add User' ), 'primary', 'add-user', true, array( 'id' => 'submit-add-existing-user' ) ); ?>
    311321</form>
    … …  
    320330 * @param bool $bool Whether to show the Add New User form. Default true.
    321331 */
    322 if ( current_user_can( 'create_users' ) && apply_filters( 'show_network_site_users_add_new_form', true ) ) : ?>
     332if ( current_user_can( 'create_users' ) && apply_filters( 'show_network_site_users_add_new_form', true ) ) :
     333?>
    323334<h2 id="add-new-user"><?php _e( 'Add New User' ); ?></h2>
    324 <form action="<?php echo network_admin_url('site-users.php?action=newuser'); ?>" id="newuser" method="post">
    325     <input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
     335<form action="<?php echo network_admin_url( 'site-users.php?action=newuser' ); ?>" id="newuser" method="post">
     336    <input type="hidden" name="id" value="<?php echo esc_attr( $id ); ?>" />
    326337    <table class="form-table">
    327338        <tr>
    328             <th scope="row"><label for="user_username"><?php _e( 'Username' ) ?></label></th>
     339            <th scope="row"><label for="user_username"><?php _e( 'Username' ); ?></label></th>
    329340            <td><input type="text" class="regular-text" name="user[username]" id="user_username" /></td>
    330341        </tr>
    331342        <tr>
    332             <th scope="row"><label for="user_email"><?php _e( 'Email' ) ?></label></th>
     343            <th scope="row"><label for="user_email"><?php _e( 'Email' ); ?></label></th>
    333344            <td><input type="text" class="regular-text" name="user[email]" id="user_email" /></td>
    334345        </tr>
    … …  
    344355        </tr>
    345356        <tr class="form-field">
    346             <td colspan="2"><?php _e( 'A password reset link will be sent to the user via email.' ) ?></td>
     357            <td colspan="2"><?php _e( 'A password reset link will be sent to the user via email.' ); ?></td>
    347358        </tr>
    348359    </table>
    349     <?php wp_nonce_field( 'add-user', '_wpnonce_add-new-user' ) ?>
     360    <?php wp_nonce_field( 'add-user', '_wpnonce_add-new-user' ); ?>
    350361    <?php submit_button( __( 'Add New User' ), 'primary', 'add-user', true, array( 'id' => 'submit-add-user' ) ); ?>
    351362</form>
Note: See TracChangeset for help on using the changeset viewer.