X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/bf5c68485ef07868ad0a91168ecd0092af7661ae..8f374b7233bc2815ccc387e448d208c5434eb961:/wp-admin/network/settings.php

diff --git a/wp-admin/network/settings.php b/wp-admin/network/settings.php
index 7f04e1a5..e75d95fc 100644
--- a/wp-admin/network/settings.php
+++ b/wp-admin/network/settings.php
@@ -29,7 +29,6 @@ get_current_screen()->add_help_tab( array(
 			'<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>' .
 			'<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>' .
 			'<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>' .
-			'<p>' . __('Checkboxes for media upload buttons set which are shown in the visual editor. If unchecked, a generic upload button is still visible; other media types can still be uploaded if on the allowed file types list.') . '</p>' .
 			'<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>' .
 			'<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>'
 ) );
@@ -51,17 +50,17 @@ if ( $_POST ) {
 	if ( is_email( $_POST['admin_email'] ) )
 		update_site_option( 'admin_email', $_POST['admin_email'] );
 
-	$illegal_names = split( ' ', $_POST['illegal_names'] );
+	$illegal_names = explode( ' ', $_POST['illegal_names'] );
 	foreach ( (array) $illegal_names as $name ) {
 		$name = trim( $name );
 		if ( $name != '' )
 			$names[] = trim( $name );
-		}
+	}
 	update_site_option( 'illegal_names', $names );
 
 	if ( $_POST['limited_email_domains'] != '' ) {
 		$limited_email_domains = str_replace( ' ', "\n", $_POST['limited_email_domains'] );
-		$limited_email_domains = split( "\n", stripslashes( $limited_email_domains ) );
+		$limited_email_domains = explode( "\n", stripslashes( $limited_email_domains ) );
 		$limited_email = array();
 		foreach ( (array) $limited_email_domains as $domain ) {
 			$domain = trim( $domain );
@@ -70,11 +69,11 @@ if ( $_POST ) {
 		}
 		update_site_option( 'limited_email_domains', $limited_email );
 	} else {
-			update_site_option( 'limited_email_domains', '' );
+		update_site_option( 'limited_email_domains', '' );
 	}
 
 	if ( $_POST['banned_email_domains'] != '' ) {
-		$banned_email_domains = split( "\n", stripslashes( $_POST['banned_email_domains'] ) );
+		$banned_email_domains = explode( "\n", stripslashes( $_POST['banned_email_domains'] ) );
 		$banned = array();
 		foreach ( (array) $banned_email_domains as $domain ) {
 			$domain = trim( $domain );
@@ -125,7 +124,7 @@ if ( isset( $_GET['updated'] ) ) {
 				<td>
 					<input name="site_name" type="text" id="site_name" class="regular-text" value="<?php echo esc_attr( $current_site->site_name ) ?>" />
 					<br />
-					<?php _e( 'What you would like to call this website.' ) ?>
+					<?php _e( 'What you would like to call this network.' ) ?>
 				</td>
 			</tr>
 
@@ -278,7 +277,7 @@ if ( isset( $_GET['updated'] ) ) {
 			<tr valign="top">
 				<th scope="row"><?php _e( 'Site upload space' ) ?></th>
 				<td>
-				<label><input type="checkbox" id="upload_space_check_disabled" name="upload_space_check_disabled" value="0"<?php checked( get_site_option( 'upload_space_check_disabled' ), 0 ) ?>/> <?php printf( __( 'Limit total size of files uploaded to %s MB' ), '</label><label><input name="blog_upload_space" type="text" id="blog_upload_space" value="' . esc_attr( get_site_option('blog_upload_space', 10) ) . '" size="3" />' ); ?></label><br />
+				<label><input type="checkbox" id="upload_space_check_disabled" name="upload_space_check_disabled" value="0"<?php checked( get_site_option( 'upload_space_check_disabled' ), 0 ) ?>/> <?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" value="' . esc_attr( get_site_option('blog_upload_space', 100) ) . '" />' ); ?></label><br />
 				</td>
 			</tr>
 
@@ -289,7 +288,7 @@ if ( isset( $_GET['updated'] ) ) {
 
 			<tr valign="top">
 				<th scope="row"><label for="fileupload_maxk"><?php _e( 'Max upload file size' ) ?></label></th>
-				<td><?php printf( _x( '%s KB', 'File size in kilobytes' ), '<input name="fileupload_maxk" type="text" id="fileupload_maxk" value="' . esc_attr( get_site_option( 'fileupload_maxk', 300 ) ) . '" size="5" />' ); ?></td>
+				<td><?php printf( _x( '%s KB', 'File size in kilobytes' ), '<input name="fileupload_maxk" type="number" min="0" style="width: 100px" id="fileupload_maxk" value="' . esc_attr( get_site_option( 'fileupload_maxk', 300 ) ) . '" />' ); ?></td>
 			</tr>
 		</table>
 
@@ -322,7 +321,7 @@ if ( isset( $_GET['updated'] ) ) {
 			$menu_perms = get_site_option( 'menu_items' );
 			$menu_items = apply_filters( 'mu_menu_items', array( 'plugins' => __( 'Plugins' ) ) );
 			foreach ( (array) $menu_items as $key => $val ) {
-				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/>";
+				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/>";
 			}
 			?>
 				</td>