enmi-conf.org: comparison wp/wp-admin/includes/file.php

equal deleted inserted replaced

-:34716fd837a4
+:be944660c56a
 * @since 4.9.0 Added the `$exclusions` parameter.
 *
 * @param string   $folder     Optional. Full path to folder. Default empty.
 * @param int      $levels     Optional. Levels of folders to follow, Default 100 (PHP Loop limit).
 * @param string[] $exclusions Optional. List of folders and files to skip.
-* @return bool|string[] False on failure, else array of files.
+* @return string[]|false Array of files on success, false on failure.
 */
 function list_files( $folder = '', $levels = 100, $exclusions = array() ) {
 	if ( empty( $folder ) ) {
 		return false;
 	}
 	}
 	$files = array();
 	$dir = @opendir( $folder );
 	if ( $dir ) {
 		while ( ( $file = readdir( $dir ) ) !== false ) {
 			// Skip current and parent folder links.
 			if ( in_array( $file, array( '.', '..' ), true ) ) {
 				continue;
 */
 function wp_edit_theme_plugin_file( $args ) {
 	if ( empty( $args['file'] ) ) {
 		return new WP_Error( 'missing_file' );
 	}
-	$file = $args['file'];
-	if ( 0 !== validate_file( $file ) ) {
+	if ( 0 !== validate_file( $args['file'] ) ) {
 		return new WP_Error( 'bad_file' );
 	}
 	if ( ! isset( $args['newcontent'] ) ) {
 		return new WP_Error( 'missing_content' );
 	}
-	$content = $args['newcontent'];
 	if ( ! isset( $args['nonce'] ) ) {
 		return new WP_Error( 'missing_nonce' );
 	}
+	$file    = $args['file'];
+	$content = $args['newcontent'];
 	$plugin    = null;
 	$theme     = null;
 	$real_file = null;
 	if ( ! empty( $args['plugin'] ) ) {
 		$plugin = $args['plugin'];
 		if ( ! current_user_can( 'edit_plugins' ) ) {
 			return new WP_Error( 'unauthorized', __( 'Sorry, you are not allowed to edit plugins for this site.' ) );
 			true
 		);
 	} elseif ( ! empty( $args['theme'] ) ) {
 		$stylesheet = $args['theme'];
 		if ( 0 !== validate_file( $stylesheet ) ) {
 			return new WP_Error( 'bad_theme_path' );
 		}
 		if ( ! current_user_can( 'edit_themes' ) ) {
 		}
 	}
 	$previous_content = file_get_contents( $real_file );
-	if ( ! is_writeable( $real_file ) ) {
+	if ( ! is_writable( $real_file ) ) {
 		return new WP_Error( 'file_not_writable' );
 	}
 	$f = fopen( $real_file, 'w+' );
 	if ( false === $f ) {
 		return new WP_Error( 'file_not_writable' );
 	}
 	$written = fwrite( $f, $content );
 	fclose( $f );
 	if ( false === $written ) {
 		return new WP_Error( 'unable_to_write', __( 'Unable to write to file.' ) );
 	}
 	wp_opcache_invalidate( $real_file, true );
 	if ( $is_active && 'php' === $extension ) {
 		$scrape_key   = md5( rand() );
 		$transient    = 'scrape_key_' . $scrape_key;
-		$scrape_nonce = strval( rand() );
+		$scrape_nonce = (string) rand();
 		// It shouldn't take more than 60 seconds to make the two loopback requests.
 		set_transient( $transient, $scrape_nonce, 60 );
 		$cookies       = wp_unslash( $_COOKIE );
 		$scrape_params = array(
 		$json_parse_failure       = array(
 			'code' => 'json_parse_error',
 		);
 		$result = null;
 		if ( false === $scrape_result_position ) {
 			$result = $loopback_request_failure;
 		} else {
 			$error_output = substr( $body, $scrape_result_position + strlen( $needle_start ) );
 			$error_output = substr( $error_output, 0, strpos( $error_output, $needle_end ) );
 		}
 		delete_transient( $transient );
 		if ( true !== $result ) {
 			// Roll-back file change.
 			file_put_contents( $real_file, $previous_content );
 			wp_opcache_invalidate( $real_file, true );
 			if ( ! isset( $result['message'] ) ) {
 				$message = __( 'Something went wrong.' );
 			} else {
 				$message = $result['message'];
 				unset( $result['message'] );
 			}
 			return new WP_Error( 'php_error', $message, $result );
 		}
 	}
 	if ( $theme instanceof WP_Theme ) {
 	$temp_filename .= '-' . wp_generate_password( 6, false );
 	$temp_filename .= '.tmp';
 	$temp_filename  = $dir . wp_unique_filename( $dir, $temp_filename );
 	$fp = @fopen( $temp_filename, 'x' );
 	if ( ! $fp && is_writable( $dir ) && file_exists( $temp_filename ) ) {
 		return wp_tempnam( $filename, $dir );
 	}
 	if ( $fp ) {
 		fclose( $fp );
 	}
 	return $temp_filename;
 *
 * @see wp_handle_upload_error
 *
 * @param string[]       $file      Reference to a single element of `$_FILES`.
 *                                  Call the function once for each uploaded file.
-* @param string[]|false $overrides An associative array of names => values
+* @param array|false    $overrides {
-*                                  to override default variables. Default false.
+*     An array of override parameters for this file, or boolean false if none are provided.
+*
+*     @type callable $upload_error_handler     Function to call when there is an error during the upload process.
+*                                              @see wp_handle_upload_error().
+*     @type callable $unique_filename_callback Function to call when determining a unique file name for the file.
+*                                              @see wp_unique_filename().
+*     @type string[] $upload_error_strings     The strings that describe the error indicated in
+*                                              `$_FILES[{form field}]['error']`.
+*     @type bool     $test_form                Whether to test that the `$_POST['action']` parameter is as expected.
+*     @type bool     $test_size                Whether to test that the file size is greater than zero bytes.
+*     @type bool     $test_type                Whether to test that the mime type of the file is as expected.
+*     @type string[] $mimes                    Array of allowed mime types keyed by their file extension regex.
+* }
 * @param string         $time      Time formatted in 'yyyy/mm'.
 * @param string         $action    Expected value for `$_POST['action']`.
 * @return string[] On success, returns an associative array of file attributes.
 *                  On failure, returns `$overrides['upload_error_handler']( &$file, $message )`
 *                  or `array( 'error' => $message )`.
 	/**
 	 * Filters the data for a file before it is uploaded to WordPress.
 	 *
 	 * The dynamic portion of the hook name, `$action`, refers to the post action.
 	 *
+	 * Possible hook names include:
+	 *
+	 *  - `wp_handle_sideload_prefilter`
+	 *  - `wp_handle_upload_prefilter`
+	 *
 	 * @since 2.9.0 as 'wp_handle_upload_prefilter'.
 	 * @since 4.0.0 Converted to a dynamic hook with `$action`.
 	 *
-	 * @param string[] $file An array of data for a single file.
+	 * @param string[] $file An array of data for the file. Reference to a single element of `$_FILES`.
 	 */
 	$file = apply_filters( "{$action}_prefilter", $file );
+	/**
+	 * Filters the override parameters for a file before it is uploaded to WordPress.
+	 *
+	 * The dynamic portion of the hook name, `$action`, refers to the post action.
+	 *
+	 * Possible hook names include:
+	 *
+	 *  - `wp_handle_sideload_overrides`
+	 *  - `wp_handle_upload_overrides`
+	 *
+	 * @since 5.7.0
+	 *
+	 * @param array|false $overrides An array of override parameters for this file. Boolean false if none are
+	 *                               provided. @see _wp_handle_upload().
+	 * @param string[]    $file      An array of data for the file. Reference to a single element of `$_FILES`.
+	 */
+	$overrides = apply_filters( "{$action}_overrides", $overrides, $file );
 	// You may define your own function and pass the name in $overrides['upload_error_handler'].
 	$upload_error_handler = 'wp_handle_upload_error';
 	if ( isset( $overrides['upload_error_handler'] ) ) {
 		$upload_error_handler = $overrides['upload_error_handler'];
 	// If you override this, you must provide $ext and $type!!
 	$test_type = isset( $overrides['test_type'] ) ? $overrides['test_type'] : true;
 	$mimes     = isset( $overrides['mimes'] ) ? $overrides['mimes'] : false;
 	// A correct form post will pass this test.
-	if ( $test_form && ( ! isset( $_POST['action'] ) || ( $_POST['action'] != $action ) ) ) {
+	if ( $test_form && ( ! isset( $_POST['action'] ) || $_POST['action'] !== $action ) ) {
 		return call_user_func_array( $upload_error_handler, array( &$file, __( 'Invalid form submission.' ) ) );
 	}
 	// A successful upload will pass this test. It makes no sense to override this one.
 	if ( isset( $file['error'] ) && $file['error'] > 0 ) {
 		return call_user_func_array( $upload_error_handler, array( &$file, $upload_error_strings[ $file['error'] ] ) );
 	}
 				'php.ini',
 				'post_max_size',
 				'upload_max_filesize'
 			);
 		}
 		return call_user_func_array( $upload_error_handler, array( &$file, $error_msg ) );
 	}
 	// A correct MIME type will pass this test. Override $mimes or use the upload_mimes filter.
 	if ( $test_type ) {
 		// Check to see if wp_check_filetype_and_ext() determined the filename was incorrect.
 		if ( $proper_filename ) {
 			$file['name'] = $proper_filename;
 		}
 		if ( ( ! $type || ! $ext ) && ! current_user_can( 'unfiltered_upload' ) ) {
 			return call_user_func_array( $upload_error_handler, array( &$file, __( 'Sorry, this file type is not permitted for security reasons.' ) ) );
 		}
 		if ( ! $type ) {
 			$type = $file['type'];
 		}
 	} else {
 		$type = '';
 			if ( 0 === strpos( $uploads['basedir'], ABSPATH ) ) {
 				$error_path = str_replace( ABSPATH, '', $uploads['basedir'] ) . $uploads['subdir'];
 			} else {
 				$error_path = basename( $uploads['basedir'] ) . $uploads['subdir'];
 			}
 			return $upload_error_handler(
 				$file,
 				sprintf(
 					/* translators: %s: Destination file path. */
 					__( 'The uploaded file could not be moved to %s.' ),
 	// Compute the URL.
 	$url = $uploads['url'] . "/$filename";
 	if ( is_multisite() ) {
-		delete_transient( 'dirsize_cache' );
+		clean_dirsize_cache( $new_file );
 	}
 	/**
 	 * Filters the data array for the uploaded file.
 	 *
 *
 * @since 2.0.0
 *
 * @see _wp_handle_upload()
 *
-* @param array      $file      Reference to a single element of `$_FILES`.
+* @param array       $file      Reference to a single element of `$_FILES`.
-*                              Call the function once for each uploaded file.
+*                               Call the function once for each uploaded file.
-* @param array|bool $overrides Optional. An associative array of names => values
+* @param array|false $overrides Optional. An associative array of names => values
-*                              to override default variables. Default false.
+*                               to override default variables. Default false.
-* @param string     $time      Optional. Time formatted in 'yyyy/mm'. Default null.
+* @param string      $time      Optional. Time formatted in 'yyyy/mm'. Default null.
 * @return array On success, returns an associative array of file attributes.
 *               On failure, returns `$overrides['upload_error_handler']( &$file, $message )`
 *               or `array( 'error' => $message )`.
 */
 function wp_handle_upload( &$file, $overrides = false, $time = null ) {
 *
 * @since 2.6.0
 *
 * @see _wp_handle_upload()
 *
-* @param array      $file      Reference to a single element of `$_FILES`.
+* @param array       $file      Reference to a single element of `$_FILES`.
-*                              Call the function once for each uploaded file.
+*                               Call the function once for each uploaded file.
-* @param array|bool $overrides Optional. An associative array of names => values
+* @param array|false $overrides Optional. An associative array of names => values
-*                              to override default variables. Default false.
+*                               to override default variables. Default false.
-* @param string     $time      Optional. Time formatted in 'yyyy/mm'. Default null.
+* @param string      $time      Optional. Time formatted in 'yyyy/mm'. Default null.
 * @return array On success, returns an associative array of file attributes.
 *               On failure, returns `$overrides['upload_error_handler']( &$file, $message )`
 *               or `array( 'error' => $message )`.
 */
 function wp_handle_sideload( &$file, $overrides = false, $time = null ) {
 	$url_filename = basename( parse_url( $url, PHP_URL_PATH ) );
 	$tmpfname = wp_tempnam( $url_filename );
 	if ( ! $tmpfname ) {
-		return new WP_Error( 'http_no_file', __( 'Could not create Temporary file.' ) );
+		return new WP_Error( 'http_no_file', __( 'Could not create temporary file.' ) );
 	}
 	$response = wp_safe_remote_get(
 		$url,
 		array(
 		return $response;
 	}
 	$response_code = wp_remote_retrieve_response_code( $response );
-	if ( 200 != $response_code ) {
+	if ( 200 !== $response_code ) {
 		$data = array(
 			'code' => $response_code,
 		);
 		// Retrieve a sample of the response body for debugging purposes.
 		$tmpf = fopen( $tmpfname, 'rb' );
 		if ( $tmpf ) {
 			/**
 			 * Filters the maximum error response body size in `download_url()`.
 			 *
 			 * @since 5.1.0
 			 * @see download_url()
 			 *
 			 * @param int $size The maximum error response body size. Default 1 KB.
 			 */
 			$response_size = apply_filters( 'download_url_error_max_body_size', KB_IN_BYTES );
-			$data['body']  = fread( $tmpf, $response_size );
+			$data['body'] = fread( $tmpf, $response_size );
 			fclose( $tmpf );
 		}
 		unlink( $tmpfname );
 		return new WP_Error( 'http_404', trim( wp_remote_retrieve_response_message( $response ) ), $data );
 	}
 	$content_md5 = wp_remote_retrieve_header( $response, 'content-md5' );
 	if ( $content_md5 ) {
 		$md5_check = verify_file_md5( $tmpfname, $content_md5 );
 		if ( is_wp_error( $md5_check ) ) {
 			unlink( $tmpfname );
 			return $md5_check;
 		}
 	}
 		 *
 		 * @since 5.2.0
 		 *
 		 * @param string[] $hostnames List of hostnames.
 		 */
-		$signed_hostnames       = apply_filters( 'wp_signature_hosts', array( 'wordpress.org', 'downloads.wordpress.org', 's.w.org' ) );
+		$signed_hostnames = apply_filters( 'wp_signature_hosts', array( 'wordpress.org', 'downloads.wordpress.org', 's.w.org' ) );
 		$signature_verification = in_array( parse_url( $url, PHP_URL_HOST ), $signed_hostnames, true );
 	}
 	// Perform signature valiation if supported.
 	if ( $signature_verification ) {
 		$signature = wp_remote_retrieve_header( $response, 'x-content-signature' );
 		if ( ! $signature ) {
 			// Retrieve signatures from a file if the header wasn't included.
 			// WordPress.org stores signatures at $package_url.sig.
 			$signature_url = false;
 			if ( '.zip' === substr( $url_path, -4 ) || '.tar.gz' === substr( $url_path, -7 ) ) {
 				$signature_url = str_replace( $url_path, $url_path . '.sig', $url );
 			}
 			/**
-			 * Filter the URL where the signature for a file is located.
+			 * Filters the URL where the signature for a file is located.
 			 *
 			 * @since 5.2.0
 			 *
 			 * @param false|string $signature_url The URL where signatures can be found for a file, or false if none are known.
 			 * @param string $url                 The URL being verified.
 *                             or a hex-encoded md5.
 * @return bool|WP_Error True on success, false when the MD5 format is unknown/unexpected,
 *                       WP_Error on failure.
 */
 function verify_file_md5( $filename, $expected_md5 ) {
-	if ( 32 == strlen( $expected_md5 ) ) {
+	if ( 32 === strlen( $expected_md5 ) ) {
 		$expected_raw_md5 = pack( 'H*', $expected_md5 );
-	} elseif ( 24 == strlen( $expected_md5 ) ) {
+	} elseif ( 24 === strlen( $expected_md5 ) ) {
 		$expected_raw_md5 = base64_decode( $expected_md5 );
 	} else {
 		return false; // Unknown format.
 	}
 *
 * @since 5.2.0
 *
 * @param string       $filename            The file to validate.
 * @param string|array $signatures          A Signature provided for the file.
-* @param string       $filename_for_errors A friendly filename for errors. Optional.
+* @param string|false $filename_for_errors Optional. A friendly filename for errors.
 * @return bool|WP_Error True on success, false if verification not attempted,
 *                       or WP_Error describing an error condition.
 */
 function verify_file_signature( $filename, $signatures, $filename_for_errors = false ) {
 	if ( ! $filename_for_errors ) {
 		in_array( PHP_VERSION_ID, array( 70200, 70201, 70202 ), true ) &&
 		extension_loaded( 'opcache' )
 	) {
 		// Sodium_Compat isn't compatible with PHP 7.2.0~7.2.2 due to a bug in the PHP Opcache extension, bail early as it'll fail.
 		// https://bugs.php.net/bug.php?id=75938
 		return new WP_Error(
 			'signature_verification_unsupported',
 			sprintf(
 				/* translators: %s: The filename of the package. */
 				__( 'The authenticity of %s could not be verified as signature verification is unavailable on this system.' ),
 				'php'    => phpversion(),
 				// phpcs:ignore PHPCompatibility.Constants.NewConstants.sodium_library_versionFound
 				'sodium' => defined( 'SODIUM_LIBRARY_VERSION' ) ? SODIUM_LIBRARY_VERSION : ( defined( 'ParagonIE_Sodium_Compat::VERSION_STRING' ) ? ParagonIE_Sodium_Compat::VERSION_STRING : false ),
 			)
 		);
 	}
 	// Verify runtime speed of Sodium_Compat is acceptable.
 	if ( ! extension_loaded( 'sodium' ) && ! ParagonIE_Sodium_Compat::polyfill_is_fast() ) {
 		$sodium_compat_is_fast = false;
 	}
 	// TODO: Add key #2 with longer expiration.
 	/**
-	 * Filter the valid signing keys used to verify the contents of files.
+	 * Filters the valid signing keys used to verify the contents of files.
 	 *
 	 * @since 5.2.0
 	 *
 	 * @param string[] $trusted_keys The trusted keys that may sign packages.
 	 */
 	global $wp_filesystem;
 	$z = new ZipArchive();
 	$zopen = $z->open( $file, ZIPARCHIVE::CHECKCONS );
 	if ( true !== $zopen ) {
 		return new WP_Error( 'incompatible_archive', __( 'Incompatible Archive.' ), array( 'ziparchive_error' => $zopen ) );
 	}
 	$uncompressed_size = 0;
 	for ( $i = 0; $i < $z->numFiles; $i++ ) {
 		$info = $z->statIndex( $i );
 		if ( ! $info ) {
 			return new WP_Error( 'stat_failed_ziparchive', __( 'Could not retrieve file from archive.' ) );
 		}
 		if ( '__MACOSX/' === substr( $info['name'], 0, 9 ) ) { // Skip the OS X-created __MACOSX directory.
 	 * A disk that has zero free bytes has bigger problems.
 	 * Require we have enough space to unzip the file and copy its contents, with a 10% buffer.
 	 */
 	if ( wp_doing_cron() ) {
 		$available_space = @disk_free_space( WP_CONTENT_DIR );
 		if ( $available_space && ( $uncompressed_size * 2.1 ) > $available_space ) {
-			return new WP_Error( 'disk_full_unzip_file', __( 'Could not copy files. You may have run out of disk space.' ), compact( 'uncompressed_size', 'available_space' ) );
+			return new WP_Error(
+				'disk_full_unzip_file',
+				__( 'Could not copy files. You may have run out of disk space.' ),
+				compact( 'uncompressed_size', 'available_space' )
+			);
 		}
 	}
 	$needed_dirs = array_unique( $needed_dirs );
 	foreach ( $needed_dirs as $dir ) {
 		// Check the parent folders of the folders all exist within the creation array.
-		if ( untrailingslashit( $to ) == $dir ) { // Skip over the working directory, we know this exists (or will exist).
+		if ( untrailingslashit( $to ) === $dir ) { // Skip over the working directory, we know this exists (or will exist).
 			continue;
 		}
 		if ( strpos( $dir, $to ) === false ) { // If the directory is not within the working directory, skip it.
 			continue;
 		}
 		$parent_folder = dirname( $dir );
-		while ( ! empty( $parent_folder ) && untrailingslashit( $to ) != $parent_folder && ! in_array( $parent_folder, $needed_dirs, true ) ) {
+		while ( ! empty( $parent_folder )
+			&& untrailingslashit( $to ) !== $parent_folder
+			&& ! in_array( $parent_folder, $needed_dirs, true )
+		) {
 			$needed_dirs[] = $parent_folder;
 			$parent_folder = dirname( $parent_folder );
 		}
 	}
 	asort( $needed_dirs );
 	// Create those directories if need be:
 	foreach ( $needed_dirs as $_dir ) {
 		// Only check to see if the Dir exists upon creation failure. Less I/O this way.
 	}
 	unset( $needed_dirs );
 	for ( $i = 0; $i < $z->numFiles; $i++ ) {
 		$info = $z->statIndex( $i );
 		if ( ! $info ) {
 			return new WP_Error( 'stat_failed_ziparchive', __( 'Could not retrieve file from archive.' ) );
 		}
 		if ( '/' === substr( $info['name'], -1 ) ) { // Directory.
 		if ( 0 !== validate_file( $info['name'] ) ) {
 			continue;
 		}
 		$contents = $z->getFromIndex( $i );
 		if ( false === $contents ) {
 			return new WP_Error( 'extract_failed_ziparchive', __( 'Could not extract file from archive.' ), $info['name'] );
 		}
 		if ( ! $wp_filesystem->put_contents( $to . $info['name'], $contents, FS_CHMOD_FILE ) ) {
 	 * A disk that has zero free bytes has bigger problems.
 	 * Require we have enough space to unzip the file and copy its contents, with a 10% buffer.
 	 */
 	if ( wp_doing_cron() ) {
 		$available_space = @disk_free_space( WP_CONTENT_DIR );
 		if ( $available_space && ( $uncompressed_size * 2.1 ) > $available_space ) {
-			return new WP_Error( 'disk_full_unzip_file', __( 'Could not copy files. You may have run out of disk space.' ), compact( 'uncompressed_size', 'available_space' ) );
+			return new WP_Error(
+				'disk_full_unzip_file',
+				__( 'Could not copy files. You may have run out of disk space.' ),
+				compact( 'uncompressed_size', 'available_space' )
+			);
 		}
 	}
 	$needed_dirs = array_unique( $needed_dirs );
 	foreach ( $needed_dirs as $dir ) {
 		// Check the parent folders of the folders all exist within the creation array.
-		if ( untrailingslashit( $to ) == $dir ) { // Skip over the working directory, we know this exists (or will exist).
+		if ( untrailingslashit( $to ) === $dir ) { // Skip over the working directory, we know this exists (or will exist).
 			continue;
 		}
 		if ( strpos( $dir, $to ) === false ) { // If the directory is not within the working directory, skip it.
 			continue;
 		}
 		$parent_folder = dirname( $dir );
-		while ( ! empty( $parent_folder ) && untrailingslashit( $to ) != $parent_folder && ! in_array( $parent_folder, $needed_dirs, true ) ) {
+		while ( ! empty( $parent_folder )
+			&& untrailingslashit( $to ) !== $parent_folder
+			&& ! in_array( $parent_folder, $needed_dirs, true )
+		) {
 			$needed_dirs[] = $parent_folder;
 			$parent_folder = dirname( $parent_folder );
 		}
 	}
 	asort( $needed_dirs );
 	// Create those directories if need be:
 	foreach ( $needed_dirs as $_dir ) {
 		// Only check to see if the dir exists upon creation failure. Less I/O this way.
 		if ( ! $wp_filesystem->put_contents( $to . $file['filename'], $file['content'], FS_CHMOD_FILE ) ) {
 			return new WP_Error( 'copy_failed_pclzip', __( 'Could not copy file.' ), $file['filename'] );
 		}
 	}
 	return true;
 }
 /**
 * Copies a directory from one location to another via the WordPress Filesystem
 function copy_dir( $from, $to, $skip_list = array() ) {
 	global $wp_filesystem;
 	$dirlist = $wp_filesystem->dirlist( $from );
+	if ( false === $dirlist ) {
+		return new WP_Error( 'dirlist_failed_copy_dir', __( 'Directory listing failed.' ), basename( $to ) );
+	}
 	$from = trailingslashit( $from );
 	$to   = trailingslashit( $to );
 	foreach ( (array) $dirlist as $filename => $fileinfo ) {
 		if ( in_array( $filename, $skip_list, true ) ) {
 		if ( 'f' === $fileinfo['type'] ) {
 			if ( ! $wp_filesystem->copy( $from . $filename, $to . $filename, true, FS_CHMOD_FILE ) ) {
 				// If copy failed, chmod file to 0644 and try again.
 				$wp_filesystem->chmod( $to . $filename, FS_CHMOD_FILE );
 				if ( ! $wp_filesystem->copy( $from . $filename, $to . $filename, true, FS_CHMOD_FILE ) ) {
 					return new WP_Error( 'copy_failed_copy_dir', __( 'Could not copy file.' ), $to . $filename );
 				}
 			}
 				}
 			}
 			// Generate the $sub_skip_list for the subdirectory as a sub-set of the existing $skip_list.
 			$sub_skip_list = array();
 			foreach ( $skip_list as $skip_item ) {
 				if ( 0 === strpos( $skip_item, $filename . '/' ) ) {
 					$sub_skip_list[] = preg_replace( '!^' . preg_quote( $filename, '!' ) . '/!i', '', $skip_item );
 				}
 			}
 			$result = copy_dir( $from . $filename, $to . $filename, $sub_skip_list );
 			if ( is_wp_error( $result ) ) {
 				return $result;
 			}
 		}
 	}
 	if ( ! $context ) {
 		$context = WP_CONTENT_DIR;
 	}
 	// If the directory doesn't exist (wp-content/languages) then use the parent directory as we'll create it.
-	if ( WP_LANG_DIR == $context && ! is_dir( $context ) ) {
+	if ( WP_LANG_DIR === $context && ! is_dir( $context ) ) {
 		$context = dirname( $context );
 	}
 	$context = trailingslashit( $context );
 	 *                                                    being writable.
 	 * @param array         $extra_fields                 Extra POST fields.
 	 * @param bool          $allow_relaxed_file_ownership Whether to allow Group/World writable.
 	 */
 	$req_cred = apply_filters( 'request_filesystem_credentials', '', $form_post, $type, $error, $context, $extra_fields, $allow_relaxed_file_ownership );
 	if ( '' !== $req_cred ) {
 		return $req_cred;
 	}
 	if ( empty( $type ) ) {
 			$submitted_form['private_key'],
 			$submitted_form['connection_type']
 		);
 	}
-	// If defined, set it to that. Else, if POST'd, set it to that. If not, set it to whatever it previously was (saved details in option).
+	$ftp_constants = array(
-	$credentials['hostname'] = defined( 'FTP_HOST' ) ? FTP_HOST : ( ! empty( $submitted_form['hostname'] ) ? $submitted_form['hostname'] : $credentials['hostname'] );
+		'hostname'    => 'FTP_HOST',
-	$credentials['username'] = defined( 'FTP_USER' ) ? FTP_USER : ( ! empty( $submitted_form['username'] ) ? $submitted_form['username'] : $credentials['username'] );
+		'username'    => 'FTP_USER',
-	$credentials['password'] = defined( 'FTP_PASS' ) ? FTP_PASS : ( ! empty( $submitted_form['password'] ) ? $submitted_form['password'] : '' );
+		'password'    => 'FTP_PASS',
+		'public_key'  => 'FTP_PUBKEY',
-	// Check to see if we are setting the public/private keys for ssh.
+		'private_key' => 'FTP_PRIKEY',
-	$credentials['public_key']  = defined( 'FTP_PUBKEY' ) ? FTP_PUBKEY : ( ! empty( $submitted_form['public_key'] ) ? $submitted_form['public_key'] : '' );
+	);
-	$credentials['private_key'] = defined( 'FTP_PRIKEY' ) ? FTP_PRIKEY : ( ! empty( $submitted_form['private_key'] ) ? $submitted_form['private_key'] : '' );
+	// If defined, set it to that. Else, if POST'd, set it to that. If not, set it to an empty string.
+	// Otherwise, keep it as it previously was (saved details in option).
+	foreach ( $ftp_constants as $key => $constant ) {
+		if ( defined( $constant ) ) {
+			$credentials[ $key ] = constant( $constant );
+		} elseif ( ! empty( $submitted_form[ $key ] ) ) {
+			$credentials[ $key ] = $submitted_form[ $key ];
+		} elseif ( ! isset( $credentials[ $key ] ) ) {
+			$credentials[ $key ] = '';
+		}
+	}
 	// Sanitize the hostname, some people might pass in odd data.
 	$credentials['hostname'] = preg_replace( '|\w+://|', '', $credentials['hostname'] ); // Strip any schemes off.
 	if ( strpos( $credentials['hostname'], ':' ) ) {
 	} elseif ( ! empty( $submitted_form['connection_type'] ) ) {
 		$credentials['connection_type'] = $submitted_form['connection_type'];
 	} elseif ( ! isset( $credentials['connection_type'] ) ) { // All else fails (and it's not defaulted to something else saved), default to FTP.
 		$credentials['connection_type'] = 'ftp';
 	}
 	if ( ! $error
-		&& ( ( ! empty( $credentials['password'] ) && ! empty( $credentials['username'] ) && ! empty( $credentials['hostname'] ) )
+		&& ( ! empty( $credentials['hostname'] ) && ! empty( $credentials['username'] ) && ! empty( $credentials['password'] )
-			|| ( 'ssh' === $credentials['connection_type'] && ! empty( $credentials['public_key'] ) && ! empty( $credentials['private_key'] ) )
+			|| 'ssh' === $credentials['connection_type'] && ! empty( $credentials['public_key'] ) && ! empty( $credentials['private_key'] )
 		)
 	) {
 		$stored_credentials = $credentials;
 		if ( ! empty( $stored_credentials['port'] ) ) { // Save port as part of hostname to simplify above code.
 			$stored_credentials['hostname'] .= ':' . $stored_credentials['port'];
 		}
-		unset( $stored_credentials['password'], $stored_credentials['port'], $stored_credentials['private_key'], $stored_credentials['public_key'] );
+		unset(
+			$stored_credentials['password'],
+			$stored_credentials['port'],
+			$stored_credentials['private_key'],
+			$stored_credentials['public_key']
+		);
 		if ( ! wp_installing() ) {
 			update_option( 'ftp_credentials', $stored_credentials );
 		}
 		return $credentials;
 	}
 	$hostname        = isset( $credentials['hostname'] ) ? $credentials['hostname'] : '';
 	$username        = isset( $credentials['username'] ) ? $credentials['username'] : '';
 	$public_key      = isset( $credentials['public_key'] ) ? $credentials['public_key'] : '';
 	$private_key     = isset( $credentials['private_key'] ) ? $credentials['private_key'] : '';
 	$port            = isset( $credentials['port'] ) ? $credentials['port'] : '';
 	 * @param bool|WP_Error $error       Whether the current request has failed to connect,
 	 *                                   or an error object.
 	 * @param string        $context     Full path to the directory that is tested for being writable.
 	 */
 	$types = apply_filters( 'fs_ftp_connection_types', $types, $credentials, $type, $error, $context );
 	?>
 <form action="<?php echo esc_url( $form_post ); ?>" method="post">
 <div id="request-filesystem-credentials-form" class="request-filesystem-credentials-form">
 	<?php
 	// Print a H1 heading in the FTP credentials modal dialog, default is a H2.
 </div>
 <div class="ftp-password">
 	<label for="password">
 		<span class="field-title"><?php echo $label_pass; ?></span>
 		<input name="password" type="password" id="password" value="<?php echo $password_value; ?>"<?php disabled( defined( 'FTP_PASS' ) ); ?> />
-		<em>
 		<?php
 		if ( ! defined( 'FTP_PASS' ) ) {
 			_e( 'This password will not be stored on the server.' );}
 		?>
-</em>
 	</label>
 </div>
 <fieldset>
 <legend><?php _e( 'Connection Type' ); ?></legend>
 	<?php
 	foreach ( (array) $extra_fields as $field ) {
 		if ( isset( $submitted_form[ $field ] ) ) {
 			echo '<input type="hidden" name="' . esc_attr( $field ) . '" value="' . esc_attr( $submitted_form[ $field ] ) . '" />';
 		}
 	}
+	// Make sure the `submit_button()` function is available during the REST API call
+	// from WP_Site_Health_Auto_Updates::test_check_wp_filesystem_method().
+	if ( ! function_exists( 'submit_button' ) ) {
+		require_once ABSPATH . '/wp-admin/includes/template.php';
+	}
 	?>
 	<p class="request-filesystem-credentials-action-buttons">
 		<?php wp_nonce_field( 'filesystem-credentials', '_fs_nonce', false, true ); ?>
 		<button class="button cancel-button" data-js-action="close" type="button"><?php _e( 'Cancel' ); ?></button>
 		<?php submit_button( __( 'Proceed' ), '', 'upgrade', false ); ?>

changeset 18	be944660c56a
parent 16	a86126ab1dd4
child 19	3d72ae0968f4