X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/256a3b381f63716209b3527d0a14442ae570c283..2329f698283944696a7076258cf816545970bb47:/wp-admin/network/settings.php

diff --git a/wp-admin/network/settings.php b/wp-admin/network/settings.php
index 8fe2ad90..6349e8cd 100644
--- a/wp-admin/network/settings.php
+++ b/wp-admin/network/settings.php
@@ -35,7 +35,7 @@ get_current_screen()->add_help_tab( array(
 get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __('For more information:') . '</strong></p>' .
 	'<p>' . __('<a href="http://codex.wordpress.org/Network_Admin_Settings_Screen" target="_blank">Documentation on Network Settings</a>') . '</p>' .
-	'<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+	'<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
 );
 
 if ( $_POST ) {
@@ -85,30 +85,30 @@ if ( isset( $_GET['updated'] ) ) {
 
 <div class="wrap">
 	<h2><?php echo esc_html( $title ); ?></h2>
-	<form method="post" action="settings.php">
+	<form method="post" action="settings.php" novalidate="novalidate">
 		<?php wp_nonce_field( 'siteoptions' ); ?>
 		<h3><?php _e( 'Operational Settings' ); ?></h3>
 		<table class="form-table">
-			<tr valign="top">
+			<tr>
 				<th scope="row"><label for="site_name"><?php _e( 'Network Title' ) ?></label></th>
 				<td>
 					<input name="site_name" type="text" id="site_name" class="regular-text" value="<?php echo esc_attr( $current_site->site_name ) ?>" />
 				</td>
 			</tr>
 
-			<tr valign="top">
+			<tr>
 				<th scope="row"><label for="admin_email"><?php _e( 'Network Admin Email' ) ?></label></th>
 				<td>
-					<input name="admin_email" type="text" id="admin_email" class="regular-text" value="<?php echo esc_attr( get_site_option('admin_email') ) ?>" />
+					<input name="admin_email" type="email" id="admin_email" class="regular-text" value="<?php echo esc_attr( get_site_option( 'admin_email' ) ) ?>" />
 					<p class="description">
 						<?php _e( 'This email address will receive notifications. Registration and support emails will also come from this address.' ); ?>
-					</p>	
+					</p>
 				</td>
 			</tr>
 		</table>
 		<h3><?php _e( 'Registration Settings' ); ?></h3>
 		<table class="form-table">
-			<tr valign="top">
+			<tr>
 				<th scope="row"><?php _e( 'Allow new registrations' ) ?></th>
 				<?php
 				if ( !get_site_option( 'registration' ) )
@@ -128,7 +128,7 @@ if ( isset( $_GET['updated'] ) ) {
 				</td>
 			</tr>
 
-			<tr valign="top">
+			<tr>
 				<th scope="row"><?php _e( 'Registration notification' ) ?></th>
 				<?php
 				if ( !get_site_option( 'registrationnotification' ) )
@@ -139,14 +139,14 @@ if ( isset( $_GET['updated'] ) ) {
 				</td>
 			</tr>
 
-			<tr valign="top" id="addnewusers">
+			<tr id="addnewusers">
 				<th scope="row"><?php _e( 'Add New Users' ) ?></th>
 				<td>
 					<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>
 				</td>
 			</tr>
 
-			<tr valign="top">
+			<tr>
 				<th scope="row"><label for="illegal_names"><?php _e( 'Banned Names' ) ?></label></th>
 				<td>
 					<input name="illegal_names" type="text" id="illegal_names" class="large-text" value="<?php echo esc_attr( implode( " ", (array) get_site_option( 'illegal_names' ) ) ); ?>" size="45" />
@@ -156,7 +156,7 @@ if ( isset( $_GET['updated'] ) ) {
 				</td>
 			</tr>
 
-			<tr valign="top">
+			<tr>
 				<th scope="row"><label for="limited_email_domains"><?php _e( 'Limited Email Registrations' ) ?></label></th>
 				<td>
 					<?php $limited_email_domains = get_site_option( 'limited_email_domains' );
@@ -165,11 +165,11 @@ if ( isset( $_GET['updated'] ) ) {
 <?php echo esc_textarea( $limited_email_domains == '' ? '' : implode( "\n", (array) $limited_email_domains ) ); ?></textarea>
 					<p class="description">
 						<?php _e( 'If you want to limit site registrations to certain domains. One domain per line.' ) ?>
-					</p>	
+					</p>
 				</td>
 			</tr>
 
-			<tr valign="top">
+			<tr>
 				<th scope="row"><label for="banned_email_domains"><?php _e('Banned Email Domains') ?></label></th>
 				<td>
 					<textarea name="banned_email_domains" id="banned_email_domains" cols="45" rows="5">
@@ -184,7 +184,7 @@ if ( isset( $_GET['updated'] ) ) {
 		<h3><?php _e('New Site Settings'); ?></h3>
 		<table class="form-table">
 
-			<tr valign="top">
+			<tr>
 				<th scope="row"><label for="welcome_email"><?php _e( 'Welcome Email' ) ?></label></th>
 				<td>
 					<textarea name="welcome_email" id="welcome_email" rows="5" cols="45" class="large-text">
@@ -194,7 +194,7 @@ if ( isset( $_GET['updated'] ) ) {
 					</p>
 				</td>
 			</tr>
-			<tr valign="top">
+			<tr>
 				<th scope="row"><label for="welcome_user_email"><?php _e( 'Welcome User Email' ) ?></label></th>
 				<td>
 					<textarea name="welcome_user_email" id="welcome_user_email" rows="5" cols="45" class="large-text">
@@ -204,7 +204,7 @@ if ( isset( $_GET['updated'] ) ) {
 					</p>
 				</td>
 			</tr>
-			<tr valign="top">
+			<tr>
 				<th scope="row"><label for="first_post"><?php _e( 'First Post' ) ?></label></th>
 				<td>
 					<textarea name="first_post" id="first_post" rows="5" cols="45" class="large-text">
@@ -214,7 +214,7 @@ if ( isset( $_GET['updated'] ) ) {
 					</p>
 				</td>
 			</tr>
-			<tr valign="top">
+			<tr>
 				<th scope="row"><label for="first_page"><?php _e( 'First Page' ) ?></label></th>
 				<td>
 					<textarea name="first_page" id="first_page" rows="5" cols="45" class="large-text">
@@ -224,17 +224,17 @@ if ( isset( $_GET['updated'] ) ) {
 					</p>
 				</td>
 			</tr>
-			<tr valign="top">
+			<tr>
 				<th scope="row"><label for="first_comment"><?php _e( 'First Comment' ) ?></label></th>
 				<td>
 					<textarea name="first_comment" id="first_comment" rows="5" cols="45" class="large-text">
 <?php echo esc_textarea( get_site_option( 'first_comment' ) ) ?></textarea>
 					<p class="description">
 						<?php _e( 'The first comment on a new site.' ) ?>
-					</p>	
+					</p>
 				</td>
 			</tr>
-			<tr valign="top">
+			<tr>
 				<th scope="row"><label for="first_comment_author"><?php _e( 'First Comment Author' ) ?></label></th>
 				<td>
 					<input type="text" size="40" name="first_comment_author" id="first_comment_author" value="<?php echo get_site_option('first_comment_author') ?>" />
@@ -243,7 +243,7 @@ if ( isset( $_GET['updated'] ) ) {
 					</p>
 				</td>
 			</tr>
-			<tr valign="top">
+			<tr>
 				<th scope="row"><label for="first_comment_url"><?php _e( 'First Comment URL' ) ?></label></th>
 				<td>
 					<input type="text" size="40" name="first_comment_url" id="first_comment_url" value="<?php echo esc_attr( get_site_option( 'first_comment_url' ) ) ?>" />
@@ -255,47 +255,56 @@ if ( isset( $_GET['updated'] ) ) {
 		</table>
 		<h3><?php _e( 'Upload Settings' ); ?></h3>
 		<table class="form-table">
-			<tr valign="top">
+			<tr>
 				<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="number" min="0" style="width: 100px" id="blog_upload_space" value="' . esc_attr( get_site_option('blog_upload_space', 100) ) . '" />' ); ?></label><br />
 				</td>
 			</tr>
 
-			<tr valign="top">
+			<tr>
 				<th scope="row"><label for="upload_filetypes"><?php _e( 'Upload file types' ) ?></label></th>
 				<td><input name="upload_filetypes" type="text" id="upload_filetypes" class="large-text" value="<?php echo esc_attr( get_site_option('upload_filetypes', 'jpg jpeg png gif') ) ?>" size="45" /></td>
 			</tr>
 
-			<tr valign="top">
+			<tr>
 				<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="number" min="0" style="width: 100px" id="fileupload_maxk" value="' . esc_attr( get_site_option( 'fileupload_maxk', 300 ) ) . '" />' ); ?></td>
 			</tr>
 		</table>
 
-<?php
+		<?php
 		$languages = get_available_languages();
 		if ( ! empty( $languages ) ) {
-			$lang = get_site_option( 'WPLANG' );
-?>
-		<h3><?php _e( 'Language Settings' ); ?></h3>
-		<table class="form-table">
-				<tr valign="top">
+			?>
+			<h3><?php _e( 'Language Settings' ); ?></h3>
+			<table class="form-table">
+				<tr>
 					<th><label for="WPLANG"><?php _e( 'Default Language' ); ?></label></th>
 					<td>
-						<select name="WPLANG" id="WPLANG">
-							<?php mu_dropdown_languages( $languages, get_site_option( 'WPLANG' ) ); ?>
-						</select>
+						<?php
+						$lang = get_site_option( 'WPLANG' );
+						if ( ! in_array( $lang, $languages ) ) {
+							$lang = '';
+						}
+
+						wp_dropdown_languages( array(
+							'name'      => 'WPLANG',
+							'id'        => 'WPLANG',
+							'selected'  => $lang,
+							'languages' => $languages,
+						) );
+						?>
 					</td>
 				</tr>
-		</table>
-<?php
-		} // languages
-?>
+			</table>
+			<?php
+		}
+		?>
 
 		<h3><?php _e( 'Menu Settings' ); ?></h3>
 		<table id="menu" class="form-table">
-			<tr valign="top">
+			<tr>
 				<th scope="row"><?php _e( 'Enable administration menus' ); ?></th>
 				<td>
 			<?php
@@ -324,7 +333,7 @@ if ( isset( $_GET['updated'] ) ) {
 			</tr>
 		</table>
 
-		<?php 
+		<?php
 		/**
 		 * Fires at the end of the Network Settings form, before the submit button.
 		 *