enmi-conf.org: comparison wp/wp-admin/install.php

equal deleted inserted replaced

-:3d4e9c994f10
+:a86126ab1dd4
 // Sanity check.
 if ( false ) {
 	?>
 <!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html>
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<title>Error: PHP is not running</title>
 </head>
 <body class="wp-core-ui">
 * @var bool
 */
 define( 'WP_INSTALLING', true );
 /** Load WordPress Bootstrap */
-require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
+require_once dirname( __DIR__ ) . '/wp-load.php';
 /** Load WordPress Administration Upgrade API */
-require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+require_once ABSPATH . 'wp-admin/includes/upgrade.php';
 /** Load WordPress Translation Install API */
-require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
+require_once ABSPATH . 'wp-admin/includes/translation-install.php';
 /** Load wpdb */
-require_once( ABSPATH . WPINC . '/wp-db.php' );
+require_once ABSPATH . WPINC . '/wp-db.php';
 nocache_headers();
 $step = isset( $_GET['step'] ) ? (int) $_GET['step'] : 0;
 	if ( $body_classes ) {
 		$body_classes = ' ' . $body_classes;
 	}
 	?>
 <!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
+<html <?php language_attributes(); ?>>
 <head>
 	<meta name="viewport" content="width=device-width" />
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<meta name="robots" content="noindex,nofollow" />
 	<title><?php _e( 'WordPress &rsaquo; Installation' ); ?></title>
 	<?php wp_admin_css( 'install', true ); ?>
 </head>
 <body class="wp-core-ui<?php echo $body_classes; ?>">
-<p id="logo"><a href="<?php echo esc_url( __( 'https://wordpress.org/' ) ); ?>"><?php _e( 'WordPress' ); ?></a></p>
+<p id="logo"><?php _e( 'WordPress' ); ?></p>
 	<?php
-} // end display_header()
+} // End display_header().
 /**
 * Display installer setup form.
 *
 * @since 2.8.0
 * @param string|null $error
 */
 function display_setup_form( $error = null ) {
 	global $wpdb;
-	$sql        = $wpdb->prepare( 'SHOW TABLES LIKE %s', $wpdb->esc_like( $wpdb->users ) );
+	$user_table = ( $wpdb->get_var( $wpdb->prepare( 'SHOW TABLES LIKE %s', $wpdb->esc_like( $wpdb->users ) ) ) !== null );
-	$user_table = ( $wpdb->get_var( $sql ) != null );
+	// Ensure that sites appear in search engines by default.
-	// Ensure that Blogs appear in search engines by default.
 	$blog_public = 1;
 	if ( isset( $_POST['weblog_title'] ) ) {
 		$blog_public = isset( $_POST['blog_public'] );
 	}
 			<th scope="row"><label for="admin_email"><?php _e( 'Your Email' ); ?></label></th>
 			<td><input name="admin_email" type="email" id="admin_email" size="25" value="<?php echo esc_attr( $admin_email ); ?>" />
 			<p><?php _e( 'Double-check your email address before continuing.' ); ?></p></td>
 		</tr>
 		<tr>
-			<th scope="row"><?php has_action( 'blog_privacy_selector' ) ? _e( 'Site Visibility' ) : _e( 'Search Engine Visibility' ); ?></th>
+			<th scope="row"><?php has_action( 'blog_privacy_selector' ) ? _e( 'Site visibility' ) : _e( 'Search engine visibility' ); ?></th>
 			<td>
 				<fieldset>
-					<legend class="screen-reader-text"><span><?php has_action( 'blog_privacy_selector' ) ? _e( 'Site Visibility' ) : _e( 'Search Engine Visibility' ); ?> </span></legend>
+					<legend class="screen-reader-text"><span><?php has_action( 'blog_privacy_selector' ) ? _e( 'Site visibility' ) : _e( 'Search engine visibility' ); ?> </span></legend>
 					<?php
 					if ( has_action( 'blog_privacy_selector' ) ) {
 						?>
 						<input id="blog-public" type="radio" name="blog_public" value="1" <?php checked( 1, $blog_public ); ?> />
 						<label for="blog-public"><?php _e( 'Allow search engines to index this site' ); ?></label><br/>
 	</table>
 	<p class="step"><?php submit_button( __( 'Install WordPress' ), 'large', 'Submit', false, array( 'id' => 'submit' ) ); ?></p>
 	<input type="hidden" name="language" value="<?php echo isset( $_REQUEST['language'] ) ? esc_attr( $_REQUEST['language'] ) : ''; ?>" />
 </form>
 	<?php
-} // end display_setup_form()
+} // End display_setup_form().
 // Let's check to make sure WP isn't already installed.
 if ( is_blog_installed() ) {
 	display_header();
 	die(
 		'</body></html>'
 	);
 }
 /**
-* @global string $wp_version
+* @global string $wp_version             The WordPress version string.
-* @global string $required_php_version
+* @global string $required_php_version   The required PHP version string.
-* @global string $required_mysql_version
+* @global string $required_mysql_version The required MySQL version string.
 */
 global $wp_version, $required_php_version, $required_mysql_version;
 $php_version   = phpversion();
 $mysql_version = $wpdb->db_version();
 $php_compat    = version_compare( $php_version, $required_php_version, '>=' );
 $mysql_compat  = version_compare( $mysql_version, $required_mysql_version, '>=' ) || file_exists( WP_CONTENT_DIR . '/db.php' );
 $version_url = sprintf(
-	/* translators: %s: WordPress version */
+	/* translators: %s: WordPress version. */
 	esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
 	sanitize_title( $wp_version )
 );
-/* translators: %s: Update PHP page URL */
+/* translators: %s: URL to Update PHP page. */
-$php_update_message = '</p><p>' . sprintf( __( '<a href="%s">Learn more about updating PHP</a>.' ), esc_url( wp_get_update_php_url() ) );
+$php_update_message = '</p><p>' . sprintf(
+	__( '<a href="%s">Learn more about updating PHP</a>.' ),
+	esc_url( wp_get_update_php_url() )
+);
 $annotation = wp_get_update_php_annotation();
 if ( $annotation ) {
 	$php_update_message .= '</p><p><em>' . $annotation . '</em>';
 }
 if ( ! $mysql_compat && ! $php_compat ) {
-	/* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required PHP version number, 4: Minimum required MySQL version number, 5: Current PHP version number, 6: Current MySQL version number */
+	$compat = sprintf(
-	$compat = sprintf( __( 'You cannot install because <a href="%1$s">WordPress %2$s</a> requires PHP version %3$s or higher and MySQL version %4$s or higher. You are running PHP version %5$s and MySQL version %6$s.' ), $version_url, $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version ) . $php_update_message;
+		/* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required PHP version number, 4: Minimum required MySQL version number, 5: Current PHP version number, 6: Current MySQL version number. */
+		__( 'You cannot install because <a href="%1$s">WordPress %2$s</a> requires PHP version %3$s or higher and MySQL version %4$s or higher. You are running PHP version %5$s and MySQL version %6$s.' ),
+		$version_url,
+		$wp_version,
+		$required_php_version,
+		$required_mysql_version,
+		$php_version,
+		$mysql_version
+	) . $php_update_message;
 } elseif ( ! $php_compat ) {
-	/* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required PHP version number, 4: Current PHP version number */
+	$compat = sprintf(
-	$compat = sprintf( __( 'You cannot install because <a href="%1$s">WordPress %2$s</a> requires PHP version %3$s or higher. You are running version %4$s.' ), $version_url, $wp_version, $required_php_version, $php_version ) . $php_update_message;
+		/* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required PHP version number, 4: Current PHP version number. */
+		__( 'You cannot install because <a href="%1$s">WordPress %2$s</a> requires PHP version %3$s or higher. You are running version %4$s.' ),
+		$version_url,
+		$wp_version,
+		$required_php_version,
+		$php_version
+	) . $php_update_message;
 } elseif ( ! $mysql_compat ) {
-	/* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required MySQL version number, 4: Current MySQL version number */
+	$compat = sprintf(
-	$compat = sprintf( __( 'You cannot install because <a href="%1$s">WordPress %2$s</a> requires MySQL version %3$s or higher. You are running version %4$s.' ), $version_url, $wp_version, $required_mysql_version, $mysql_version );
+		/* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required MySQL version number, 4: Current MySQL version number. */
+		__( 'You cannot install because <a href="%1$s">WordPress %2$s</a> requires MySQL version %3$s or higher. You are running version %4$s.' ),
+		$version_url,
+		$wp_version,
+		$required_mysql_version,
+		$mysql_version
+	);
 }
 if ( ! $mysql_compat || ! $php_compat ) {
 	display_header();
-	die( '<h1>' . __( 'Insufficient Requirements' ) . '</h1><p>' . $compat . '</p></body></html>' );
+	die( '<h1>' . __( 'Requirements Not Met' ) . '</h1><p>' . $compat . '</p></body></html>' );
 }
 if ( ! is_string( $wpdb->base_prefix ) || '' === $wpdb->base_prefix ) {
 	display_header();
 	die(
 		) . '</p></body></html>'
 	);
 }
 /**
-* @global string    $wp_local_package
+* @global string    $wp_local_package Locale code of the package.
-* @global WP_Locale $wp_locale
+* @global WP_Locale $wp_locale        WordPress date and time locale object.
 */
 $language = '';
 if ( ! empty( $_REQUEST['language'] ) ) {
 	$language = preg_replace( '/[^a-zA-Z0-9_]/', '', $_REQUEST['language'] );
 } elseif ( isset( $GLOBALS['wp_local_package'] ) ) {
 }
 $scripts_to_print = array( 'jquery' );
 switch ( $step ) {
-	case 0: // Step 0
+	case 0: // Step 0.
-		if ( wp_can_install_language_pack() && empty( $language ) && ( $languages = wp_get_available_translations() ) ) {
+		if ( wp_can_install_language_pack() && empty( $language ) ) {
-			$scripts_to_print[] = 'language-chooser';
+			$languages = wp_get_available_translations();
-			display_header( 'language-chooser' );
+			if ( $languages ) {
-			echo '<form id="setup" method="post" action="?step=1">';
+				$scripts_to_print[] = 'language-chooser';
-			wp_install_language_form( $languages );
+				display_header( 'language-chooser' );
-			echo '</form>';
+				echo '<form id="setup" method="post" action="?step=1">';
-			break;
+				wp_install_language_form( $languages );
+				echo '</form>';
+				break;
+			}
 		}
 		// Deliberately fall through if we can't reach the translations API.
 	case 1: // Step 1, direct link or from language chooser.
 		}
 		$scripts_to_print[] = 'user-profile';
 		display_header();
-		// Fill in the data we gathered
+		// Fill in the data we gathered.
 		$weblog_title         = isset( $_POST['weblog_title'] ) ? trim( wp_unslash( $_POST['weblog_title'] ) ) : '';
 		$user_name            = isset( $_POST['user_name'] ) ? trim( wp_unslash( $_POST['user_name'] ) ) : '';
 		$admin_password       = isset( $_POST['admin_password'] ) ? wp_unslash( $_POST['admin_password'] ) : '';
 		$admin_password_check = isset( $_POST['admin_password2'] ) ? wp_unslash( $_POST['admin_password2'] ) : '';
 		$admin_email          = isset( $_POST['admin_email'] ) ? trim( wp_unslash( $_POST['admin_email'] ) ) : '';
 		$public               = isset( $_POST['blog_public'] ) ? (int) $_POST['blog_public'] : 1;
 		// Check email address.
 		$error = false;
 		if ( empty( $user_name ) ) {
-			// TODO: poka-yoke
+			// TODO: Poka-yoke.
 			display_setup_form( __( 'Please provide a valid username.' ) );
 			$error = true;
-		} elseif ( $user_name != sanitize_user( $user_name, true ) ) {
+		} elseif ( sanitize_user( $user_name, true ) !== $user_name ) {
 			display_setup_form( __( 'The username you provided has invalid characters.' ) );
 			$error = true;
-		} elseif ( $admin_password != $admin_password_check ) {
+		} elseif ( $admin_password !== $admin_password_check ) {
-			// TODO: poka-yoke
+			// TODO: Poka-yoke.
 			display_setup_form( __( 'Your passwords do not match. Please try again.' ) );
 			$error = true;
 		} elseif ( empty( $admin_email ) ) {
-			// TODO: poka-yoke
+			// TODO: Poka-yoke.
 			display_setup_form( __( 'You must provide an email address.' ) );
 			$error = true;
 		} elseif ( ! is_email( $admin_email ) ) {
-			// TODO: poka-yoke
+			// TODO: Poka-yoke.
 			display_setup_form( __( 'Sorry, that isn&#8217;t a valid email address. Email addresses look like <code>username@example.com</code>.' ) );
 			$error = true;
 		}
-		if ( $error === false ) {
+		if ( false === $error ) {
 			$wpdb->show_errors();
 			$result = wp_install( $weblog_title, $user_name, $admin_email, $public, '', wp_slash( $admin_password ), $loaded_language );
 			?>
 <h1><?php _e( 'Success!' ); ?></h1>

changeset 16	a86126ab1dd4
parent 9	177826044cd9
child 18	be944660c56a