Make WordPress Core


Ignore:
Timestamp:
11/30/2017 11:09:33 PM (8 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/settings.php

    r41617 r42343  
    1414require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
    1515
    16 if ( ! current_user_can( 'manage_network_options' ) )
     16if ( ! current_user_can( 'manage_network_options' ) ) {
    1717    wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
    18 
    19 $title = __( 'Network Settings' );
     18}
     19
     20$title       = __( 'Network Settings' );
    2021$parent_file = 'settings.php';
    2122
    2223// Handle network admin email change requests
    23 if ( ! empty( $_GET[ 'network_admin_hash' ] ) ) {
     24if ( ! empty( $_GET['network_admin_hash'] ) ) {
    2425    $new_admin_details = get_site_option( 'network_admin_hash' );
    25     $redirect = 'settings.php?updated=false';
    26     if ( is_array( $new_admin_details ) && hash_equals( $new_admin_details[ 'hash' ], $_GET[ 'network_admin_hash' ] ) && ! empty( $new_admin_details[ 'newemail' ] ) ) {
    27         update_site_option( 'admin_email', $new_admin_details[ 'newemail' ] );
     26    $redirect          = 'settings.php?updated=false';
     27    if ( is_array( $new_admin_details ) && hash_equals( $new_admin_details['hash'], $_GET['network_admin_hash'] ) && ! empty( $new_admin_details['newemail'] ) ) {
     28        update_site_option( 'admin_email', $new_admin_details['newemail'] );
    2829        delete_site_option( 'network_admin_hash' );
    2930        delete_site_option( 'new_admin_email' );
     
    4243add_action( 'admin_head', 'network_settings_add_js' );
    4344
    44 get_current_screen()->add_help_tab( array(
     45get_current_screen()->add_help_tab(
     46    array(
    4547        'id'      => 'overview',
    46         'title'   => __('Overview'),
     48        'title'   => __( 'Overview' ),
    4749        'content' =>
    48             '<p>' . __('This screen sets and changes options for the network as a whole. The first site is the main site in the network and network options are pulled from that original site&#8217;s options.') . '</p>' .
    49             '<p>' . __('Operational settings has fields for the network&#8217;s name and admin email.') . '</p>' .
    50             '<p>' . __('Registration settings can disable/enable public signups. If you let others sign up for a site, install spam plugins. Spaces, not commas, should separate names banned as sites for this network.') . '</p>' .
    51             '<p>' . __('New site settings are defaults applied when a new site is created in the network. These include welcome email for when a new site or user account is registered, and what&#8127;s put in the first post, page, comment, comment author, and comment URL.') . '</p>' .
    52             '<p>' . __('Upload settings control the size of the uploaded files and the amount of available upload space for each site. You can change the default value for specific sites when you edit a particular site. Allowed file types are also listed (space separated only).') . '</p>' .
     50            '<p>' . __( 'This screen sets and changes options for the network as a whole. The first site is the main site in the network and network options are pulled from that original site&#8217;s options.' ) . '</p>' .
     51            '<p>' . __( 'Operational settings has fields for the network&#8217;s name and admin email.' ) . '</p>' .
     52            '<p>' . __( 'Registration settings can disable/enable public signups. If you let others sign up for a site, install spam plugins. Spaces, not commas, should separate names banned as sites for this network.' ) . '</p>' .
     53            '<p>' . __( 'New site settings are defaults applied when a new site is created in the network. These include welcome email for when a new site or user account is registered, and what&#8127;s put in the first post, page, comment, comment author, and comment URL.' ) . '</p>' .
     54            '<p>' . __( 'Upload settings control the size of the uploaded files and the amount of available upload space for each site. You can change the default value for specific sites when you edit a particular site. Allowed file types are also listed (space separated only).' ) . '</p>' .
    5355            '<p>' . __( 'You can set the language, and the translation files will be automatically downloaded and installed (available if your filesystem is writable).' ) . '</p>' .
    54             '<p>' . __('Menu setting enables/disables the plugin menus from appearing for non super admins, so that only super admins, not site admins, have access to activate plugins.') . '</p>' .
    55             '<p>' . __('Super admins can no longer be added on the Options screen. You must now go to the list of existing users on Network Admin > Users and click on Username or the Edit action link below that name. This goes to an Edit User page where you can check a box to grant super admin privileges.') . '</p>'
    56 ) );
     56            '<p>' . __( 'Menu setting enables/disables the plugin menus from appearing for non super admins, so that only super admins, not site admins, have access to activate plugins.' ) . '</p>' .
     57            '<p>' . __( 'Super admins can no longer be added on the Options screen. You must now go to the list of existing users on Network Admin > Users and click on Username or the Edit action link below that name. This goes to an Edit User page where you can check a box to grant super admin privileges.' ) . '</p>',
     58    )
     59);
    5760
    5861get_current_screen()->set_help_sidebar(
    59     '<p><strong>' . __('For more information:') . '</strong></p>' .
    60     '<p>' . __('<a href="https://codex.wordpress.org/Network_Admin_Settings_Screen">Documentation on Network Settings</a>') . '</p>' .
    61     '<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>'
     62    '<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
     63    '<p>' . __( '<a href="https://codex.wordpress.org/Network_Admin_Settings_Screen">Documentation on Network Settings</a>' ) . '</p>' .
     64    '<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
    6265);
    6366
     
    6871    check_admin_referer( 'siteoptions' );
    6972
    70     $checked_options = array( 'menu_items' => array(), 'registrationnotification' => 'no', 'upload_space_check_disabled' => 1, 'add_new_users' => 0 );
     73    $checked_options = array(
     74        'menu_items'                  => array(),
     75        'registrationnotification'    => 'no',
     76        'upload_space_check_disabled' => 1,
     77        'add_new_users'               => 0,
     78    );
    7179    foreach ( $checked_options as $option_name => $option_unchecked_value ) {
    72         if ( ! isset( $_POST[$option_name] ) )
    73             $_POST[$option_name] = $option_unchecked_value;
     80        if ( ! isset( $_POST[ $option_name ] ) ) {
     81            $_POST[ $option_name ] = $option_unchecked_value;
     82        }
    7483    }
    7584
    7685    $options = array(
    77         'registrationnotification', 'registration', 'add_new_users', 'menu_items',
    78         'upload_space_check_disabled', 'blog_upload_space', 'upload_filetypes', 'site_name',
    79         'first_post', 'first_page', 'first_comment', 'first_comment_url', 'first_comment_author',
    80         'welcome_email', 'welcome_user_email', 'fileupload_maxk', 'global_terms_enabled',
    81         'illegal_names', 'limited_email_domains', 'banned_email_domains', 'WPLANG', 'new_admin_email',
     86        'registrationnotification',
     87        'registration',
     88        'add_new_users',
     89        'menu_items',
     90        'upload_space_check_disabled',
     91        'blog_upload_space',
     92        'upload_filetypes',
     93        'site_name',
     94        'first_post',
     95        'first_page',
     96        'first_comment',
     97        'first_comment_url',
     98        'first_comment_author',
     99        'welcome_email',
     100        'welcome_user_email',
     101        'fileupload_maxk',
     102        'global_terms_enabled',
     103        'illegal_names',
     104        'limited_email_domains',
     105        'banned_email_domains',
     106        'WPLANG',
     107        'new_admin_email',
    82108        'first_comment_email',
    83109    );
     
    92118
    93119    foreach ( $options as $option_name ) {
    94         if ( ! isset($_POST[$option_name]) )
     120        if ( ! isset( $_POST[ $option_name ] ) ) {
    95121            continue;
    96         $value = wp_unslash( $_POST[$option_name] );
     122        }
     123        $value = wp_unslash( $_POST[ $option_name ] );
    97124        update_site_option( $option_name, $value );
    98125    }
     
    112139
    113140if ( isset( $_GET['updated'] ) ) {
    114     ?><div id="message" class="updated notice is-dismissible"><p><?php _e( 'Settings saved.' ) ?></p></div><?php
     141    ?><div id="message" class="updated notice is-dismissible"><p><?php _e( 'Settings saved.' ); ?></p></div>
     142    <?php
    115143}
    116144?>
     
    123151        <table class="form-table">
    124152            <tr>
    125                 <th scope="row"><label for="site_name"><?php _e( 'Network Title' ) ?></label></th>
    126                 <td>
    127                     <input name="site_name" type="text" id="site_name" class="regular-text" value="<?php echo esc_attr( get_network()->site_name ) ?>" />
    128                 </td>
    129             </tr>
    130 
    131             <tr>
    132                 <th scope="row"><label for="admin_email"><?php _e( 'Network Admin Email' ) ?></label></th>
    133                 <td>
    134                     <input name="new_admin_email" type="email" id="admin_email" aria-describedby="admin-email-desc" class="regular-text" value="<?php echo esc_attr( get_site_option( 'admin_email' ) ) ?>" />
     153                <th scope="row"><label for="site_name"><?php _e( 'Network Title' ); ?></label></th>
     154                <td>
     155                    <input name="site_name" type="text" id="site_name" class="regular-text" value="<?php echo esc_attr( get_network()->site_name ); ?>" />
     156                </td>
     157            </tr>
     158
     159            <tr>
     160                <th scope="row"><label for="admin_email"><?php _e( 'Network Admin Email' ); ?></label></th>
     161                <td>
     162                    <input name="new_admin_email" type="email" id="admin_email" aria-describedby="admin-email-desc" class="regular-text" value="<?php echo esc_attr( get_site_option( 'admin_email' ) ); ?>" />
    135163                    <p class="description" id="admin-email-desc">
    136164                        <?php _e( 'This address is used for admin purposes. If you change this we will send you an email at your new address to confirm it. <strong>The new address will not become active until confirmed.</strong>' ); ?>
     
    138166                    <?php
    139167                    $new_admin_email = get_site_option( 'new_admin_email' );
    140                     if ( $new_admin_email && $new_admin_email != get_site_option( 'admin_email' ) ) : ?>
     168                    if ( $new_admin_email && $new_admin_email != get_site_option( 'admin_email' ) ) :
     169                    ?>
    141170                        <div class="updated inline">
    142                         <p><?php
     171                        <p>
     172                        <?php
    143173                            printf(
    144174                                /* translators: %s: new network admin email */
     
    151181                                __( 'Cancel' )
    152182                            );
    153                         ?></p>
     183                        ?>
     184                        </p>
    154185                        </div>
    155186                    <?php endif; ?>
     
    160191        <table class="form-table">
    161192            <tr>
    162                 <th scope="row"><?php _e( 'Allow new registrations' ) ?></th>
     193                <th scope="row"><?php _e( 'Allow new registrations' ); ?></th>
    163194                <?php
    164                 if ( !get_site_option( 'registration' ) )
     195                if ( ! get_site_option( 'registration' ) ) {
    165196                    update_site_option( 'registration', 'none' );
     197                }
    166198                $reg = get_site_option( 'registration' );
    167199                ?>
    168200                <td>
    169201                    <fieldset>
    170                     <legend class="screen-reader-text"><?php _e( 'New registrations settings' ) ?></legend>
    171                     <label><input name="registration" type="radio" id="registration1" value="none"<?php checked( $reg, 'none') ?> /> <?php _e( 'Registration is disabled' ); ?></label><br />
    172                     <label><input name="registration" type="radio" id="registration2" value="user"<?php checked( $reg, 'user') ?> /> <?php _e( 'User accounts may be registered' ); ?></label><br />
    173                     <label><input name="registration" type="radio" id="registration3" value="blog"<?php checked( $reg, 'blog') ?> /> <?php _e( 'Logged in users may register new sites' ); ?></label><br />
    174                     <label><input name="registration" type="radio" id="registration4" value="all"<?php checked( $reg, 'all') ?> /> <?php _e( 'Both sites and user accounts can be registered' ); ?></label>
    175                     <?php if ( is_subdomain_install() ) {
     202                    <legend class="screen-reader-text"><?php _e( 'New registrations settings' ); ?></legend>
     203                    <label><input name="registration" type="radio" id="registration1" value="none"<?php checked( $reg, 'none' ); ?> /> <?php _e( 'Registration is disabled' ); ?></label><br />
     204                    <label><input name="registration" type="radio" id="registration2" value="user"<?php checked( $reg, 'user' ); ?> /> <?php _e( 'User accounts may be registered' ); ?></label><br />
     205                    <label><input name="registration" type="radio" id="registration3" value="blog"<?php checked( $reg, 'blog' ); ?> /> <?php _e( 'Logged in users may register new sites' ); ?></label><br />
     206                    <label><input name="registration" type="radio" id="registration4" value="all"<?php checked( $reg, 'all' ); ?> /> <?php _e( 'Both sites and user accounts can be registered' ); ?></label>
     207                    <?php
     208                    if ( is_subdomain_install() ) {
    176209                        echo '<p class="description">';
    177210                        /* translators: 1: NOBLOGREDIRECT 2: wp-config.php */
    178                         printf( __( 'If registration is disabled, please set %1$s in %2$s to a URL you will redirect visitors to if they visit a non-existent site.' ),
     211                        printf(
     212                            __( 'If registration is disabled, please set %1$s in %2$s to a URL you will redirect visitors to if they visit a non-existent site.' ),
    179213                            '<code>NOBLOGREDIRECT</code>',
    180214                            '<code>wp-config.php</code>'
    181215                        );
    182216                        echo '</p>';
    183                     } ?>
     217                    }
     218                    ?>
    184219                    </fieldset>
    185220                </td>
     
    187222
    188223            <tr>
    189                 <th scope="row"><?php _e( 'Registration notification' ) ?></th>
     224                <th scope="row"><?php _e( 'Registration notification' ); ?></th>
    190225                <?php
    191                 if ( !get_site_option( 'registrationnotification' ) )
     226                if ( ! get_site_option( 'registrationnotification' ) ) {
    192227                    update_site_option( 'registrationnotification', 'yes' );
     228                }
    193229                ?>
    194230                <td>
    195                     <label><input name="registrationnotification" type="checkbox" id="registrationnotification" value="yes"<?php checked( get_site_option( 'registrationnotification' ), 'yes' ) ?> /> <?php _e( 'Send the network admin an email notification every time someone registers a site or user account' ) ?></label>
     231                    <label><input name="registrationnotification" type="checkbox" id="registrationnotification" value="yes"<?php checked( get_site_option( 'registrationnotification' ), 'yes' ); ?> /> <?php _e( 'Send the network admin an email notification every time someone registers a site or user account' ); ?></label>
    196232                </td>
    197233            </tr>
    198234
    199235            <tr id="addnewusers">
    200                 <th scope="row"><?php _e( 'Add New Users' ) ?></th>
    201                 <td>
    202                     <label><input name="add_new_users" type="checkbox" id="add_new_users" value="1"<?php checked( get_site_option( 'add_new_users' ) ) ?> /> <?php _e( 'Allow site administrators to add new users to their site via the "Users &rarr; Add New" page' ); ?></label>
    203                 </td>
    204             </tr>
    205 
    206             <tr>
    207                 <th scope="row"><label for="illegal_names"><?php _e( 'Banned Names' ) ?></label></th>
    208                 <td>
    209                     <input name="illegal_names" type="text" id="illegal_names" aria-describedby="illegal-names-desc" class="large-text" value="<?php echo esc_attr( implode( " ", (array) get_site_option( 'illegal_names' ) ) ); ?>" size="45" />
     236                <th scope="row"><?php _e( 'Add New Users' ); ?></th>
     237                <td>
     238                    <label><input name="add_new_users" type="checkbox" id="add_new_users" value="1"<?php checked( get_site_option( 'add_new_users' ) ); ?> /> <?php _e( 'Allow site administrators to add new users to their site via the "Users &rarr; Add New" page' ); ?></label>
     239                </td>
     240            </tr>
     241
     242            <tr>
     243                <th scope="row"><label for="illegal_names"><?php _e( 'Banned Names' ); ?></label></th>
     244                <td>
     245                    <input name="illegal_names" type="text" id="illegal_names" aria-describedby="illegal-names-desc" class="large-text" value="<?php echo esc_attr( implode( ' ', (array) get_site_option( 'illegal_names' ) ) ); ?>" size="45" />
    210246                    <p class="description" id="illegal-names-desc">
    211                         <?php _e( 'Users are not allowed to register these sites. Separate names by spaces.' ) ?>
    212                     </p>
    213                 </td>
    214             </tr>
    215 
    216             <tr>
    217                 <th scope="row"><label for="limited_email_domains"><?php _e( 'Limited Email Registrations' ) ?></label></th>
    218                 <td>
    219                     <?php $limited_email_domains = get_site_option( 'limited_email_domains' );
    220                     $limited_email_domains = str_replace( ' ', "\n", $limited_email_domains ); ?>
     247                        <?php _e( 'Users are not allowed to register these sites. Separate names by spaces.' ); ?>
     248                    </p>
     249                </td>
     250            </tr>
     251
     252            <tr>
     253                <th scope="row"><label for="limited_email_domains"><?php _e( 'Limited Email Registrations' ); ?></label></th>
     254                <td>
     255                    <?php
     256                    $limited_email_domains = get_site_option( 'limited_email_domains' );
     257                    $limited_email_domains = str_replace( ' ', "\n", $limited_email_domains );
     258                    ?>
    221259                    <textarea name="limited_email_domains" id="limited_email_domains" aria-describedby="limited-email-domains-desc" cols="45" rows="5">
    222260<?php echo esc_textarea( $limited_email_domains == '' ? '' : implode( "\n", (array) $limited_email_domains ) ); ?></textarea>
    223261                    <p class="description" id="limited-email-domains-desc">
    224                         <?php _e( 'If you want to limit site registrations to certain domains. One domain per line.' ) ?>
    225                     </p>
    226                 </td>
    227             </tr>
    228 
    229             <tr>
    230                 <th scope="row"><label for="banned_email_domains"><?php _e('Banned Email Domains') ?></label></th>
     262                        <?php _e( 'If you want to limit site registrations to certain domains. One domain per line.' ); ?>
     263                    </p>
     264                </td>
     265            </tr>
     266
     267            <tr>
     268                <th scope="row"><label for="banned_email_domains"><?php _e( 'Banned Email Domains' ); ?></label></th>
    231269                <td>
    232270                    <textarea name="banned_email_domains" id="banned_email_domains" aria-describedby="banned-email-domains-desc" cols="45" rows="5">
    233271<?php echo esc_textarea( get_site_option( 'banned_email_domains' ) == '' ? '' : implode( "\n", (array) get_site_option( 'banned_email_domains' ) ) ); ?></textarea>
    234272                    <p class="description" id="banned-email-domains-desc">
    235                         <?php _e( 'If you want to ban domains from site registrations. One domain per line.' ) ?>
     273                        <?php _e( 'If you want to ban domains from site registrations. One domain per line.' ); ?>
    236274                    </p>
    237275                </td>
     
    243281
    244282            <tr>
    245                 <th scope="row"><label for="welcome_email"><?php _e( 'Welcome Email' ) ?></label></th>
     283                <th scope="row"><label for="welcome_email"><?php _e( 'Welcome Email' ); ?></label></th>
    246284                <td>
    247285                    <textarea name="welcome_email" id="welcome_email" aria-describedby="welcome-email-desc" rows="5" cols="45" class="large-text">
    248 <?php echo esc_textarea( get_site_option( 'welcome_email' ) ) ?></textarea>
     286<?php echo esc_textarea( get_site_option( 'welcome_email' ) ); ?></textarea>
    249287                    <p class="description" id="welcome-email-desc">
    250                         <?php _e( 'The welcome email sent to new site owners.' ) ?>
    251                     </p>
    252                 </td>
    253             </tr>
    254             <tr>
    255                 <th scope="row"><label for="welcome_user_email"><?php _e( 'Welcome User Email' ) ?></label></th>
     288                        <?php _e( 'The welcome email sent to new site owners.' ); ?>
     289                    </p>
     290                </td>
     291            </tr>
     292            <tr>
     293                <th scope="row"><label for="welcome_user_email"><?php _e( 'Welcome User Email' ); ?></label></th>
    256294                <td>
    257295                    <textarea name="welcome_user_email" id="welcome_user_email" aria-describedby="welcome-user-email-desc" rows="5" cols="45" class="large-text">
    258 <?php echo esc_textarea( get_site_option( 'welcome_user_email' ) ) ?></textarea>
     296<?php echo esc_textarea( get_site_option( 'welcome_user_email' ) ); ?></textarea>
    259297                    <p class="description" id="welcome-user-email-desc">
    260                         <?php _e( 'The welcome email sent to new users.' ) ?>
    261                     </p>
    262                 </td>
    263             </tr>
    264             <tr>
    265                 <th scope="row"><label for="first_post"><?php _e( 'First Post' ) ?></label></th>
     298                        <?php _e( 'The welcome email sent to new users.' ); ?>
     299                    </p>
     300                </td>
     301            </tr>
     302            <tr>
     303                <th scope="row"><label for="first_post"><?php _e( 'First Post' ); ?></label></th>
    266304                <td>
    267305                    <textarea name="first_post" id="first_post" aria-describedby="first-post-desc" rows="5" cols="45" class="large-text">
    268 <?php echo esc_textarea( get_site_option( 'first_post' ) ) ?></textarea>
     306<?php echo esc_textarea( get_site_option( 'first_post' ) ); ?></textarea>
    269307                    <p class="description" id="first-post-desc">
    270                         <?php _e( 'The first post on a new site.' ) ?>
    271                     </p>
    272                 </td>
    273             </tr>
    274             <tr>
    275                 <th scope="row"><label for="first_page"><?php _e( 'First Page' ) ?></label></th>
     308                        <?php _e( 'The first post on a new site.' ); ?>
     309                    </p>
     310                </td>
     311            </tr>
     312            <tr>
     313                <th scope="row"><label for="first_page"><?php _e( 'First Page' ); ?></label></th>
    276314                <td>
    277315                    <textarea name="first_page" id="first_page" aria-describedby="first-page-desc" rows="5" cols="45" class="large-text">
    278 <?php echo esc_textarea( get_site_option( 'first_page' ) ) ?></textarea>
     316<?php echo esc_textarea( get_site_option( 'first_page' ) ); ?></textarea>
    279317                    <p class="description" id="first-page-desc">
    280                         <?php _e( 'The first page on a new site.' ) ?>
    281                     </p>
    282                 </td>
    283             </tr>
    284             <tr>
    285                 <th scope="row"><label for="first_comment"><?php _e( 'First Comment' ) ?></label></th>
     318                        <?php _e( 'The first page on a new site.' ); ?>
     319                    </p>
     320                </td>
     321            </tr>
     322            <tr>
     323                <th scope="row"><label for="first_comment"><?php _e( 'First Comment' ); ?></label></th>
    286324                <td>
    287325                    <textarea name="first_comment" id="first_comment" aria-describedby="first-comment-desc" rows="5" cols="45" class="large-text">
    288 <?php echo esc_textarea( get_site_option( 'first_comment' ) ) ?></textarea>
     326<?php echo esc_textarea( get_site_option( 'first_comment' ) ); ?></textarea>
    289327                    <p class="description" id="first-comment-desc">
    290                         <?php _e( 'The first comment on a new site.' ) ?>
    291                     </p>
    292                 </td>
    293             </tr>
    294             <tr>
    295                 <th scope="row"><label for="first_comment_author"><?php _e( 'First Comment Author' ) ?></label></th>
    296                 <td>
    297                     <input type="text" size="40" name="first_comment_author" id="first_comment_author" aria-describedby="first-comment-author-desc" value="<?php echo esc_attr( get_site_option('first_comment_author') ); ?>" />
     328                        <?php _e( 'The first comment on a new site.' ); ?>
     329                    </p>
     330                </td>
     331            </tr>
     332            <tr>
     333                <th scope="row"><label for="first_comment_author"><?php _e( 'First Comment Author' ); ?></label></th>
     334                <td>
     335                    <input type="text" size="40" name="first_comment_author" id="first_comment_author" aria-describedby="first-comment-author-desc" value="<?php echo esc_attr( get_site_option( 'first_comment_author' ) ); ?>" />
    298336                    <p class="description" id="first-comment-author-desc">
    299                         <?php _e( 'The author of the first comment on a new site.' ) ?>
    300                     </p>
    301                 </td>
    302             </tr>
    303             <tr>
    304                 <th scope="row"><label for="first_comment_email"><?php _e( 'First Comment Email' ) ?></label></th>
     337                        <?php _e( 'The author of the first comment on a new site.' ); ?>
     338                    </p>
     339                </td>
     340            </tr>
     341            <tr>
     342                <th scope="row"><label for="first_comment_email"><?php _e( 'First Comment Email' ); ?></label></th>
    305343                <td>
    306344                    <input type="text" size="40" name="first_comment_email" id="first_comment_email" aria-describedby="first-comment-email-desc" value="<?php echo esc_attr( get_site_option( 'first_comment_email' ) ); ?>" />
    307345                    <p class="description" id="first-comment-email-desc">
    308                         <?php _e( 'The email address of the first comment author on a new site.' ) ?>
    309                     </p>
    310                 </td>
    311             </tr>
    312             <tr>
    313                 <th scope="row"><label for="first_comment_url"><?php _e( 'First Comment URL' ) ?></label></th>
    314                 <td>
    315                     <input type="text" size="40" name="first_comment_url" id="first_comment_url" aria-describedby="first-comment-url-desc" value="<?php echo esc_attr( get_site_option( 'first_comment_url' ) ) ?>" />
     346                        <?php _e( 'The email address of the first comment author on a new site.' ); ?>
     347                    </p>
     348                </td>
     349            </tr>
     350            <tr>
     351                <th scope="row"><label for="first_comment_url"><?php _e( 'First Comment URL' ); ?></label></th>
     352                <td>
     353                    <input type="text" size="40" name="first_comment_url" id="first_comment_url" aria-describedby="first-comment-url-desc" value="<?php echo esc_attr( get_site_option( 'first_comment_url' ) ); ?>" />
    316354                    <p class="description" id="first-comment-url-desc">
    317                         <?php _e( 'The URL for the first comment on a new site.' ) ?>
     355                        <?php _e( 'The URL for the first comment on a new site.' ); ?>
    318356                    </p>
    319357                </td>
     
    323361        <table class="form-table">
    324362            <tr>
    325                 <th scope="row"><?php _e( 'Site upload space' ) ?></th>
    326                 <td>
    327                     <label><input type="checkbox" id="upload_space_check_disabled" name="upload_space_check_disabled" value="0"<?php checked( (bool) get_site_option( 'upload_space_check_disabled' ), false ) ?>/> <?php printf( __( 'Limit total size of files uploaded to %s MB' ), '</label><label><input name="blog_upload_space" type="number" min="0" style="width: 100px" id="blog_upload_space" aria-describedby="blog-upload-space-desc" value="' . esc_attr( get_site_option('blog_upload_space', 100) ) . '" />' ); ?></label><br />
     363                <th scope="row"><?php _e( 'Site upload space' ); ?></th>
     364                <td>
     365                    <label><input type="checkbox" id="upload_space_check_disabled" name="upload_space_check_disabled" value="0"<?php checked( (bool) get_site_option( 'upload_space_check_disabled' ), false ); ?>/> <?php printf( __( 'Limit total size of files uploaded to %s MB' ), '</label><label><input name="blog_upload_space" type="number" min="0" style="width: 100px" id="blog_upload_space" aria-describedby="blog-upload-space-desc" value="' . esc_attr( get_site_option( 'blog_upload_space', 100 ) ) . '" />' ); ?></label><br />
    328366                    <p class="screen-reader-text" id="blog-upload-space-desc">
    329                         <?php _e( 'Size in megabytes' ) ?>
    330                     </p>
    331                 </td>
    332             </tr>
    333 
    334             <tr>
    335                 <th scope="row"><label for="upload_filetypes"><?php _e( 'Upload file types' ) ?></label></th>
    336                 <td>
    337                     <input name="upload_filetypes" type="text" id="upload_filetypes" aria-describedby="upload-filetypes-desc" class="large-text" value="<?php echo esc_attr( get_site_option( 'upload_filetypes', 'jpg jpeg png gif' ) ) ?>" size="45" />
     367                        <?php _e( 'Size in megabytes' ); ?>
     368                    </p>
     369                </td>
     370            </tr>
     371
     372            <tr>
     373                <th scope="row"><label for="upload_filetypes"><?php _e( 'Upload file types' ); ?></label></th>
     374                <td>
     375                    <input name="upload_filetypes" type="text" id="upload_filetypes" aria-describedby="upload-filetypes-desc" class="large-text" value="<?php echo esc_attr( get_site_option( 'upload_filetypes', 'jpg jpeg png gif' ) ); ?>" size="45" />
    338376                    <p class="description" id="upload-filetypes-desc">
    339                         <?php _e( 'Allowed file types. Separate types by spaces.' ) ?>
    340                     </p>
    341                 </td>
    342             </tr>
    343 
    344             <tr>
    345                 <th scope="row"><label for="fileupload_maxk"><?php _e( 'Max upload file size' ) ?></label></th>
     377                        <?php _e( 'Allowed file types. Separate types by spaces.' ); ?>
     378                    </p>
     379                </td>
     380            </tr>
     381
     382            <tr>
     383                <th scope="row"><label for="fileupload_maxk"><?php _e( 'Max upload file size' ); ?></label></th>
    346384                <td>
    347385                    <?php
     
    353391                    ?>
    354392                    <p class="screen-reader-text" id="fileupload-maxk-desc">
    355                         <?php _e( 'Size in kilobytes' ) ?>
     393                        <?php _e( 'Size in kilobytes' ); ?>
    356394                    </p>
    357395                </td>
     
    360398
    361399        <?php
    362         $languages = get_available_languages();
     400        $languages    = get_available_languages();
    363401        $translations = wp_get_available_translations();
    364402        if ( ! empty( $languages ) || ! empty( $translations ) ) {
     
    375413                        }
    376414
    377                         wp_dropdown_languages( array(
    378                             'name'         => 'WPLANG',
    379                             'id'           => 'WPLANG',
    380                             'selected'     => $lang,
    381                             'languages'    => $languages,
    382                             'translations' => $translations,
    383                             'show_available_translations' => current_user_can( 'install_languages' ),
    384                         ) );
     415                        wp_dropdown_languages(
     416                            array(
     417                                'name'         => 'WPLANG',
     418                                'id'           => 'WPLANG',
     419                                'selected'     => $lang,
     420                                'languages'    => $languages,
     421                                'translations' => $translations,
     422                                'show_available_translations' => current_user_can( 'install_languages' ),
     423                            )
     424                        );
    385425                        ?>
    386426                    </td>
     
    413453             * @param array $admin_menus The menu items available.
    414454             */
    415             $menu_items = apply_filters( 'mu_menu_items', array( 'plugins' => __( 'Plugins' ) ) );
     455            $menu_items   = apply_filters( 'mu_menu_items', array( 'plugins' => __( 'Plugins' ) ) );
    416456            $fieldset_end = '';
    417457            if ( count( (array) $menu_items ) > 1 ) {
     
    420460            }
    421461            foreach ( (array) $menu_items as $key => $val ) {
    422                 echo "<label><input type='checkbox' name='menu_items[" . $key . "]' value='1'" . ( isset( $menu_perms[$key] ) ? checked( $menu_perms[$key], '1', false ) : '' ) . " /> " . esc_html( $val ) . "</label><br/>";
     462                echo "<label><input type='checkbox' name='menu_items[" . $key . "]' value='1'" . ( isset( $menu_perms[ $key ] ) ? checked( $menu_perms[ $key ], '1', false ) : '' ) . ' /> ' . esc_html( $val ) . '</label><br/>';
    423463            }
    424464            echo $fieldset_end;
     
    434474         * @since MU (3.0.0)
    435475         */
    436         do_action( 'wpmu_options' ); ?>
     476        do_action( 'wpmu_options' );
     477        ?>
    437478        <?php submit_button(); ?>
    438479    </form>
Note: See TracChangeset for help on using the changeset viewer.