--- a/wp/wp-admin/includes/file.php Tue Jun 09 11:14:17 2015 +0000
+++ b/wp/wp-admin/includes/file.php Mon Oct 14 17:39:30 2019 +0200
@@ -1,47 +1,66 @@
<?php
/**
+ * Filesystem API: Top-level functionality
+ *
* Functions for reading, writing, modifying, and deleting files on the file system.
* Includes functionality for theme-specific files as well as operations for uploading,
* archiving, and rendering output when necessary.
*
* @package WordPress
- * @subpackage Administration
+ * @subpackage Filesystem
+ * @since 2.3.0
*/
/** The descriptions for theme files. */
$wp_file_descriptions = array(
- 'index.php' => __( 'Main Index Template' ),
- 'style.css' => __( 'Stylesheet' ),
- 'editor-style.css' => __( 'Visual Editor Stylesheet' ),
- 'editor-style-rtl.css' => __( 'Visual Editor RTL Stylesheet' ),
- 'rtl.css' => __( 'RTL Stylesheet' ),
- 'comments.php' => __( 'Comments' ),
- 'comments-popup.php' => __( 'Popup Comments' ),
- 'footer.php' => __( 'Footer' ),
- 'header.php' => __( 'Header' ),
- 'sidebar.php' => __( 'Sidebar' ),
- 'archive.php' => __( 'Archives' ),
- 'author.php' => __( 'Author Template' ),
- 'tag.php' => __( 'Tag Template' ),
- 'category.php' => __( 'Category Template' ),
- 'page.php' => __( 'Page Template' ),
- 'search.php' => __( 'Search Results' ),
- 'searchform.php' => __( 'Search Form' ),
- 'single.php' => __( 'Single Post' ),
- '404.php' => __( '404 Template' ),
- 'link.php' => __( 'Links Template' ),
- 'functions.php' => __( 'Theme Functions' ),
- 'attachment.php' => __( 'Attachment Template' ),
- 'image.php' => __('Image Attachment Template'),
- 'video.php' => __('Video Attachment Template'),
- 'audio.php' => __('Audio Attachment Template'),
- 'application.php' => __('Application Attachment Template'),
- 'my-hacks.php' => __( 'my-hacks.php (legacy hacks support)' ),
- '.htaccess' => __( '.htaccess (for rewrite rules )' ),
+ 'functions.php' => __( 'Theme Functions' ),
+ 'header.php' => __( 'Theme Header' ),
+ 'footer.php' => __( 'Theme Footer' ),
+ 'sidebar.php' => __( 'Sidebar' ),
+ 'comments.php' => __( 'Comments' ),
+ 'searchform.php' => __( 'Search Form' ),
+ '404.php' => __( '404 Template' ),
+ 'link.php' => __( 'Links Template' ),
+ // Archives
+ 'index.php' => __( 'Main Index Template' ),
+ 'archive.php' => __( 'Archives' ),
+ 'author.php' => __( 'Author Template' ),
+ 'taxonomy.php' => __( 'Taxonomy Template' ),
+ 'category.php' => __( 'Category Template' ),
+ 'tag.php' => __( 'Tag Template' ),
+ 'home.php' => __( 'Posts Page' ),
+ 'search.php' => __( 'Search Results' ),
+ 'date.php' => __( 'Date Template' ),
+ // Content
+ 'singular.php' => __( 'Singular Template' ),
+ 'single.php' => __( 'Single Post' ),
+ 'page.php' => __( 'Single Page' ),
+ 'front-page.php' => __( 'Homepage' ),
+ // Attachments
+ 'attachment.php' => __( 'Attachment Template' ),
+ 'image.php' => __( 'Image Attachment Template' ),
+ 'video.php' => __( 'Video Attachment Template' ),
+ 'audio.php' => __( 'Audio Attachment Template' ),
+ 'application.php' => __( 'Application Attachment Template' ),
+ // Embeds
+ 'embed.php' => __( 'Embed Template' ),
+ 'embed-404.php' => __( 'Embed 404 Template' ),
+ 'embed-content.php' => __( 'Embed Content Template' ),
+ 'header-embed.php' => __( 'Embed Header Template' ),
+ 'footer-embed.php' => __( 'Embed Footer Template' ),
+ // Stylesheets
+ 'style.css' => __( 'Stylesheet' ),
+ 'editor-style.css' => __( 'Visual Editor Stylesheet' ),
+ 'editor-style-rtl.css' => __( 'Visual Editor RTL Stylesheet' ),
+ 'rtl.css' => __( 'RTL Stylesheet' ),
+ // Other
+ 'my-hacks.php' => __( 'my-hacks.php (legacy hacks support)' ),
+ '.htaccess' => __( '.htaccess (for rewrite rules )' ),
// Deprecated files
- 'wp-layout.css' => __( 'Stylesheet' ),
- 'wp-comments.php' => __( 'Comments Template' ),
+ 'wp-layout.css' => __( 'Stylesheet' ),
+ 'wp-comments.php' => __( 'Comments Template' ),
'wp-comments-popup.php' => __( 'Popup Comments Template' ),
+ 'comments-popup.php' => __( 'Popup Comments' ),
);
/**
@@ -50,20 +69,25 @@
*
* @since 1.5.0
*
- * @uses $wp_file_descriptions
+ * @global array $wp_file_descriptions Theme file descriptions.
+ * @global array $allowed_files List of allowed files.
* @param string $file Filesystem path or filename
- * @return string Description of file from $wp_file_descriptions or basename of $file if description doesn't exist
+ * @return string Description of file from $wp_file_descriptions or basename of $file if description doesn't exist.
+ * Appends 'Page Template' to basename of $file if the file is a page template
*/
function get_file_description( $file ) {
- global $wp_file_descriptions;
+ global $wp_file_descriptions, $allowed_files;
+
+ $dirname = pathinfo( $file, PATHINFO_DIRNAME );
- if ( isset( $wp_file_descriptions[basename( $file )] ) ) {
- return $wp_file_descriptions[basename( $file )];
- }
- elseif ( file_exists( $file ) && is_file( $file ) ) {
- $template_data = implode( '', file( $file ) );
- if ( preg_match( '|Template Name:(.*)$|mi', $template_data, $name ))
- return sprintf( __( '%s Page Template' ), _cleanup_header_comment($name[1]) );
+ $file_path = $allowed_files[ $file ];
+ if ( isset( $wp_file_descriptions[ basename( $file ) ] ) && '.' === $dirname ) {
+ return $wp_file_descriptions[ basename( $file ) ];
+ } elseif ( file_exists( $file_path ) && is_file( $file_path ) ) {
+ $template_data = implode( '', file( $file_path ) );
+ if ( preg_match( '|Template Name:(.*)$|mi', $template_data, $name ) ) {
+ return sprintf( __( '%s Page Template' ), _cleanup_header_comment( $name[1] ) );
+ }
}
return trim( basename( $file ) );
@@ -96,39 +120,493 @@
* The depth of the recursiveness can be controlled by the $levels param.
*
* @since 2.6.0
+ * @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 array $exclusions Optional. List of folders and files to skip.
* @return bool|array False on failure, Else array of files
*/
-function list_files( $folder = '', $levels = 100 ) {
- if ( empty($folder) )
+function list_files( $folder = '', $levels = 100, $exclusions = array() ) {
+ if ( empty( $folder ) ) {
return false;
+ }
- if ( ! $levels )
+ $folder = trailingslashit( $folder );
+
+ if ( ! $levels ) {
return false;
+ }
$files = array();
- if ( $dir = @opendir( $folder ) ) {
- while (($file = readdir( $dir ) ) !== false ) {
- if ( in_array($file, array('.', '..') ) )
+
+ $dir = @opendir( $folder );
+ if ( $dir ) {
+ while ( ( $file = readdir( $dir ) ) !== false ) {
+ // Skip current and parent folder links.
+ if ( in_array( $file, array( '.', '..' ), true ) ) {
+ continue;
+ }
+
+ // Skip hidden and excluded files.
+ if ( '.' === $file[0] || in_array( $file, $exclusions, true ) ) {
continue;
- if ( is_dir( $folder . '/' . $file ) ) {
- $files2 = list_files( $folder . '/' . $file, $levels - 1);
- if ( $files2 )
+ }
+
+ if ( is_dir( $folder . $file ) ) {
+ $files2 = list_files( $folder . $file, $levels - 1 );
+ if ( $files2 ) {
$files = array_merge($files, $files2 );
- else
- $files[] = $folder . '/' . $file . '/';
+ } else {
+ $files[] = $folder . $file . '/';
+ }
} else {
- $files[] = $folder . '/' . $file;
+ $files[] = $folder . $file;
}
}
}
@closedir( $dir );
+
return $files;
}
/**
+ * Get list of file extensions that are editable in plugins.
+ *
+ * @since 4.9.0
+ *
+ * @param string $plugin Plugin.
+ * @return array File extensions.
+ */
+function wp_get_plugin_file_editable_extensions( $plugin ) {
+
+ $editable_extensions = array(
+ 'bash',
+ 'conf',
+ 'css',
+ 'diff',
+ 'htm',
+ 'html',
+ 'http',
+ 'inc',
+ 'include',
+ 'js',
+ 'json',
+ 'jsx',
+ 'less',
+ 'md',
+ 'patch',
+ 'php',
+ 'php3',
+ 'php4',
+ 'php5',
+ 'php7',
+ 'phps',
+ 'phtml',
+ 'sass',
+ 'scss',
+ 'sh',
+ 'sql',
+ 'svg',
+ 'text',
+ 'txt',
+ 'xml',
+ 'yaml',
+ 'yml',
+ );
+
+ /**
+ * Filters file type extensions editable in the plugin editor.
+ *
+ * @since 2.8.0
+ * @since 4.9.0 Adds $plugin param.
+ *
+ * @param string $plugin Plugin file.
+ * @param array $editable_extensions An array of editable plugin file extensions.
+ */
+ $editable_extensions = (array) apply_filters( 'editable_extensions', $editable_extensions, $plugin );
+
+ return $editable_extensions;
+}
+
+/**
+ * Get list of file extensions that are editable for a given theme.
+ *
+ * @param WP_Theme $theme Theme.
+ * @return array File extensions.
+ */
+function wp_get_theme_file_editable_extensions( $theme ) {
+
+ $default_types = array(
+ 'bash',
+ 'conf',
+ 'css',
+ 'diff',
+ 'htm',
+ 'html',
+ 'http',
+ 'inc',
+ 'include',
+ 'js',
+ 'json',
+ 'jsx',
+ 'less',
+ 'md',
+ 'patch',
+ 'php',
+ 'php3',
+ 'php4',
+ 'php5',
+ 'php7',
+ 'phps',
+ 'phtml',
+ 'sass',
+ 'scss',
+ 'sh',
+ 'sql',
+ 'svg',
+ 'text',
+ 'txt',
+ 'xml',
+ 'yaml',
+ 'yml',
+ );
+
+ /**
+ * Filters the list of file types allowed for editing in the Theme editor.
+ *
+ * @since 4.4.0
+ *
+ * @param array $default_types List of file types. Default types include 'php' and 'css'.
+ * @param WP_Theme $theme The current Theme object.
+ */
+ $file_types = apply_filters( 'wp_theme_editor_filetypes', $default_types, $theme );
+
+ // Ensure that default types are still there.
+ return array_unique( array_merge( $file_types, $default_types ) );
+}
+
+/**
+ * Print file editor templates (for plugins and themes).
+ *
+ * @since 4.9.0
+ */
+function wp_print_file_editor_templates() {
+ ?>
+ <script type="text/html" id="tmpl-wp-file-editor-notice">
+ <div class="notice inline notice-{{ data.type || 'info' }} {{ data.alt ? 'notice-alt' : '' }} {{ data.dismissible ? 'is-dismissible' : '' }} {{ data.classes || '' }}">
+ <# if ( 'php_error' === data.code ) { #>
+ <p>
+ <?php
+ printf(
+ /* translators: %$1s is line number and %1$s is file path. */
+ __( 'Your PHP code changes were rolled back due to an error on line %1$s of file %2$s. Please fix and try saving again.' ),
+ '{{ data.line }}',
+ '{{ data.file }}'
+ );
+ ?>
+ </p>
+ <pre>{{ data.message }}</pre>
+ <# } else if ( 'file_not_writable' === data.code ) { #>
+ <p><?php _e( 'You need to make this file writable before you can save your changes. See <a href="https://codex.wordpress.org/Changing_File_Permissions">the Codex</a> for more information.' ); ?></p>
+ <# } else { #>
+ <p>{{ data.message || data.code }}</p>
+
+ <# if ( 'lint_errors' === data.code ) { #>
+ <p>
+ <# var elementId = 'el-' + String( Math.random() ); #>
+ <input id="{{ elementId }}" type="checkbox">
+ <label for="{{ elementId }}"><?php _e( 'Update anyway, even though it might break your site?' ); ?></label>
+ </p>
+ <# } #>
+ <# } #>
+ <# if ( data.dismissible ) { #>
+ <button type="button" class="notice-dismiss"><span class="screen-reader-text"><?php _e( 'Dismiss' ); ?></span></button>
+ <# } #>
+ </div>
+ </script>
+ <?php
+}
+
+/**
+ * Attempt to edit a file for a theme or plugin.
+ *
+ * When editing a PHP file, loopback requests will be made to the admin and the homepage
+ * to attempt to see if there is a fatal error introduced. If so, the PHP change will be
+ * reverted.
+ *
+ * @since 4.9.0
+ *
+ * @param array $args {
+ * Args. Note that all of the arg values are already unslashed. They are, however,
+ * coming straight from $_POST and are not validated or sanitized in any way.
+ *
+ * @type string $file Relative path to file.
+ * @type string $plugin Plugin being edited.
+ * @type string $theme Theme being edited.
+ * @type string $newcontent New content for the file.
+ * @type string $nonce Nonce.
+ * }
+ * @return true|WP_Error True on success or `WP_Error` on failure.
+ */
+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 ) ) {
+ 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' );
+ }
+
+ $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.' ) );
+ }
+
+ if ( ! wp_verify_nonce( $args['nonce'], 'edit-plugin_' . $file ) ) {
+ return new WP_Error( 'nonce_failure' );
+ }
+
+ if ( ! array_key_exists( $plugin, get_plugins() ) ) {
+ return new WP_Error( 'invalid_plugin' );
+ }
+
+ if ( 0 !== validate_file( $file, get_plugin_files( $plugin ) ) ) {
+ return new WP_Error( 'bad_plugin_file_path', __( 'Sorry, that file cannot be edited.' ) );
+ }
+
+ $editable_extensions = wp_get_plugin_file_editable_extensions( $plugin );
+
+ $real_file = WP_PLUGIN_DIR . '/' . $file;
+
+ $is_active = in_array(
+ $plugin,
+ (array) get_option( 'active_plugins', array() ),
+ 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' ) ) {
+ return new WP_Error( 'unauthorized', __( 'Sorry, you are not allowed to edit templates for this site.' ) );
+ }
+
+ $theme = wp_get_theme( $stylesheet );
+ if ( ! $theme->exists() ) {
+ return new WP_Error( 'non_existent_theme', __( 'The requested theme does not exist.' ) );
+ }
+
+ $real_file = $theme->get_stylesheet_directory() . '/' . $file;
+ if ( ! wp_verify_nonce( $args['nonce'], 'edit-theme_' . $real_file . $stylesheet ) ) {
+ return new WP_Error( 'nonce_failure' );
+ }
+
+ if ( $theme->errors() && 'theme_no_stylesheet' === $theme->errors()->get_error_code() ) {
+ return new WP_Error(
+ 'theme_no_stylesheet',
+ __( 'The requested theme does not exist.' ) . ' ' . $theme->errors()->get_error_message()
+ );
+ }
+
+ $editable_extensions = wp_get_theme_file_editable_extensions( $theme );
+
+ $allowed_files = array();
+ foreach ( $editable_extensions as $type ) {
+ switch ( $type ) {
+ case 'php':
+ $allowed_files = array_merge( $allowed_files, $theme->get_files( 'php', -1 ) );
+ break;
+ case 'css':
+ $style_files = $theme->get_files( 'css', -1 );
+ $allowed_files['style.css'] = $style_files['style.css'];
+ $allowed_files = array_merge( $allowed_files, $style_files );
+ break;
+ default:
+ $allowed_files = array_merge( $allowed_files, $theme->get_files( $type, -1 ) );
+ break;
+ }
+ }
+
+ // Compare based on relative paths
+ if ( 0 !== validate_file( $file, array_keys( $allowed_files ) ) ) {
+ return new WP_Error( 'disallowed_theme_file', __( 'Sorry, that file cannot be edited.' ) );
+ }
+
+ $is_active = ( get_stylesheet() === $stylesheet || get_template() === $stylesheet );
+ } else {
+ return new WP_Error( 'missing_theme_or_plugin' );
+ }
+
+ // Ensure file is real.
+ if ( ! is_file( $real_file ) ) {
+ return new WP_Error( 'file_does_not_exist', __( 'No such file exists! Double check the name and try again.' ) );
+ }
+
+ // Ensure file extension is allowed.
+ $extension = null;
+ if ( preg_match( '/\.([^.]+)$/', $real_file, $matches ) ) {
+ $extension = strtolower( $matches[1] );
+ if ( ! in_array( $extension, $editable_extensions, true ) ) {
+ return new WP_Error( 'illegal_file_type', __( 'Files of this type are not editable.' ) );
+ }
+ }
+
+ $previous_content = file_get_contents( $real_file );
+
+ if ( ! is_writeable( $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.' ) );
+ }
+ if ( 'php' === $extension && function_exists( 'opcache_invalidate' ) ) {
+ opcache_invalidate( $real_file, true );
+ }
+
+ if ( $is_active && 'php' === $extension ) {
+
+ $scrape_key = md5( rand() );
+ $transient = 'scrape_key_' . $scrape_key;
+ $scrape_nonce = strval( rand() );
+ set_transient( $transient, $scrape_nonce, 60 ); // It shouldn't take more than 60 seconds to make the two loopback requests.
+
+ $cookies = wp_unslash( $_COOKIE );
+ $scrape_params = array(
+ 'wp_scrape_key' => $scrape_key,
+ 'wp_scrape_nonce' => $scrape_nonce,
+ );
+ $headers = array(
+ 'Cache-Control' => 'no-cache',
+ );
+
+ // Include Basic auth in loopback requests.
+ if ( isset( $_SERVER['PHP_AUTH_USER'] ) && isset( $_SERVER['PHP_AUTH_PW'] ) ) {
+ $headers['Authorization'] = 'Basic ' . base64_encode( wp_unslash( $_SERVER['PHP_AUTH_USER'] ) . ':' . wp_unslash( $_SERVER['PHP_AUTH_PW'] ) );
+ }
+
+ // Make sure PHP process doesn't die before loopback requests complete.
+ @set_time_limit( 300 );
+
+ // Time to wait for loopback requests to finish.
+ $timeout = 100;
+
+ $needle_start = "###### wp_scraping_result_start:$scrape_key ######";
+ $needle_end = "###### wp_scraping_result_end:$scrape_key ######";
+
+ // Attempt loopback request to editor to see if user just whitescreened themselves.
+ if ( $plugin ) {
+ $url = add_query_arg( compact( 'plugin', 'file' ), admin_url( 'plugin-editor.php' ) );
+ } elseif ( isset( $stylesheet ) ) {
+ $url = add_query_arg(
+ array(
+ 'theme' => $stylesheet,
+ 'file' => $file,
+ ),
+ admin_url( 'theme-editor.php' )
+ );
+ } else {
+ $url = admin_url();
+ }
+ $url = add_query_arg( $scrape_params, $url );
+ $r = wp_remote_get( $url, compact( 'cookies', 'headers', 'timeout' ) );
+ $body = wp_remote_retrieve_body( $r );
+ $scrape_result_position = strpos( $body, $needle_start );
+
+ $loopback_request_failure = array(
+ 'code' => 'loopback_request_failed',
+ 'message' => __( 'Unable to communicate back with site to check for fatal errors, so the PHP change was reverted. You will need to upload your PHP file change by some other means, such as by using SFTP.' ),
+ );
+ $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 ) );
+ $result = json_decode( trim( $error_output ), true );
+ if ( empty( $result ) ) {
+ $result = $json_parse_failure;
+ }
+ }
+
+ // Try making request to homepage as well to see if visitors have been whitescreened.
+ if ( true === $result ) {
+ $url = home_url( '/' );
+ $url = add_query_arg( $scrape_params, $url );
+ $r = wp_remote_get( $url, compact( 'cookies', 'headers', 'timeout' ) );
+ $body = wp_remote_retrieve_body( $r );
+ $scrape_result_position = strpos( $body, $needle_start );
+
+ 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 ) );
+ $result = json_decode( trim( $error_output ), true );
+ if ( empty( $result ) ) {
+ $result = $json_parse_failure;
+ }
+ }
+ }
+
+ delete_transient( $transient );
+
+ if ( true !== $result ) {
+
+ // Roll-back file change.
+ file_put_contents( $real_file, $previous_content );
+ if ( function_exists( 'opcache_invalidate' ) ) {
+ 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 ) {
+ $theme->cache_delete();
+ }
+
+ return true;
+}
+
+
+/**
* Returns a filename of a Temporary unique file.
* Please note that the calling function must unlink() this itself.
*
@@ -146,7 +624,7 @@
$dir = get_temp_dir();
}
- if ( empty( $filename ) || '.' == $filename || '/' == $filename ) {
+ if ( empty( $filename ) || '.' == $filename || '/' == $filename || '\\' == $filename ) {
$filename = time();
}
@@ -154,30 +632,39 @@
$temp_filename = basename( $filename );
$temp_filename = preg_replace( '|\.[^.]*$|', '', $temp_filename );
- // If the folder is falsey, use it's parent directory name instead
+ // If the folder is falsey, use its parent directory name instead.
if ( ! $temp_filename ) {
return wp_tempnam( dirname( $filename ), $dir );
}
+ // Suffix some random data to avoid filename conflicts
+ $temp_filename .= '-' . wp_generate_password( 6, false );
$temp_filename .= '.tmp';
$temp_filename = $dir . wp_unique_filename( $dir, $temp_filename );
- touch( $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;
}
/**
- * Make sure that the file that was requested to edit, is allowed to be edited
+ * Makes sure that the file that was requested to be edited is allowed to be edited.
*
- * Function will die if if you are not allowed to edit the file
+ * Function will die if you are not allowed to edit the file.
*
* @since 1.5.0
*
- * @param string $file file the users is attempting to edit
- * @param array $allowed_files Array of allowed files to edit, $file must match an entry exactly
+ * @param string $file File the user is attempting to edit.
+ * @param array $allowed_files Optional. Array of allowed files to edit, $file must match an entry exactly.
* @return string|null
*/
-function validate_file_to_edit( $file, $allowed_files = '' ) {
+function validate_file_to_edit( $file, $allowed_files = array() ) {
$code = validate_file( $file, $allowed_files );
if (!$code )
@@ -199,6 +686,7 @@
* Handle PHP uploads in WordPress, sanitizing file names, checking extensions for mime type,
* and moving the file to the appropriate directory within the uploads directory.
*
+ * @access private
* @since 4.0.0
*
* @see wp_handle_upload_error
@@ -209,7 +697,7 @@
* @param string $action Expected value for $_POST['action'].
* @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, $time, $action ) {
// The default error handler.
if ( ! function_exists( 'wp_handle_upload_error' ) ) {
@@ -219,7 +707,7 @@
}
/**
- * Filter the data for a file before it is uploaded to WordPress.
+ * 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.
*
@@ -238,7 +726,7 @@
// You may have had one or more 'wp_handle_upload_prefilter' functions error out the file. Handle that gracefully.
if ( isset( $file['error'] ) && ! is_numeric( $file['error'] ) && $file['error'] ) {
- return $upload_error_handler( $file, $file['error'] );
+ return call_user_func_array( $upload_error_handler, array( &$file, $file['error'] ) );
}
// Install user overrides. Did we mention that this voids your warranty?
@@ -280,11 +768,11 @@
// A correct form post will pass this test.
if ( $test_form && ( ! isset( $_POST['action'] ) || ( $_POST['action'] != $action ) ) ) {
- return call_user_func( $upload_error_handler, $file, __( 'Invalid form submission.' ) );
+ 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( $upload_error_handler, $file, $upload_error_strings[ $file['error'] ] );
+ return call_user_func_array( $upload_error_handler, array( &$file, $upload_error_strings[ $file['error'] ] ) );
}
$test_file_size = 'wp_handle_upload' === $action ? $file['size'] : filesize( $file['tmp_name'] );
@@ -295,13 +783,13 @@
} else {
$error_msg = __( 'File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your php.ini or by post_max_size being defined as smaller than upload_max_filesize in php.ini.' );
}
- return call_user_func( $upload_error_handler, $file, $error_msg );
+ return call_user_func_array( $upload_error_handler, array( &$file, $error_msg ) );
}
// A properly uploaded file will pass this test. There should be no reason to override this one.
$test_uploaded_file = 'wp_handle_upload' === $action ? @ is_uploaded_file( $file['tmp_name'] ) : @ is_file( $file['tmp_name'] );
if ( ! $test_uploaded_file ) {
- return call_user_func( $upload_error_handler, $file, __( 'Specified file failed upload test.' ) );
+ return call_user_func_array( $upload_error_handler, array( &$file, __( 'Specified file failed upload test.' ) ) );
}
// A correct MIME type will pass this test. Override $mimes or use the upload_mimes filter.
@@ -316,7 +804,7 @@
$file['name'] = $proper_filename;
}
if ( ( ! $type || !$ext ) && ! current_user_can( 'unfiltered_upload' ) ) {
- return call_user_func( $upload_error_handler, $file, __( 'Sorry, this file type is not permitted for security reasons.' ) );
+ 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'];
@@ -330,26 +818,46 @@
* overriding this one.
*/
if ( ! ( ( $uploads = wp_upload_dir( $time ) ) && false === $uploads['error'] ) ) {
- return call_user_func( $upload_error_handler, $file, $uploads['error'] );
+ return call_user_func_array( $upload_error_handler, array( &$file, $uploads['error'] ) );
}
$filename = wp_unique_filename( $uploads['path'], $file['name'], $unique_filename_callback );
// Move the file to the uploads dir.
$new_file = $uploads['path'] . "/$filename";
- if ( 'wp_handle_upload' === $action ) {
- $move_new_file = @ move_uploaded_file( $file['tmp_name'], $new_file );
- } else {
- $move_new_file = @ rename( $file['tmp_name'], $new_file );
- }
+
+ /**
+ * Filters whether to short-circuit moving the uploaded file after passing all checks.
+ *
+ * If a non-null value is passed to the filter, moving the file and any related error
+ * reporting will be completely skipped.
+ *
+ * @since 4.9.0
+ *
+ * @param string $move_new_file If null (default) move the file after the upload.
+ * @param string $file An array of data for a single file.
+ * @param string $new_file Filename of the newly-uploaded file.
+ * @param string $type File type.
+ */
+ $move_new_file = apply_filters( 'pre_move_uploaded_file', null, $file, $new_file, $type );
- if ( false === $move_new_file ) {
- if ( 0 === strpos( $uploads['basedir'], ABSPATH ) ) {
- $error_path = str_replace( ABSPATH, '', $uploads['basedir'] ) . $uploads['subdir'];
+ if ( null === $move_new_file ) {
+ if ( 'wp_handle_upload' === $action ) {
+ $move_new_file = @ move_uploaded_file( $file['tmp_name'], $new_file );
} else {
- $error_path = basename( $uploads['basedir'] ) . $uploads['subdir'];
+ // use copy and unlink because rename breaks streams.
+ $move_new_file = @ copy( $file['tmp_name'], $new_file );
+ unlink( $file['tmp_name'] );
}
- return $upload_error_handler( $file, sprintf( __('The uploaded file could not be moved to %s.' ), $error_path ) );
+
+ if ( false === $move_new_file ) {
+ 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( __('The uploaded file could not be moved to %s.' ), $error_path ) );
+ }
}
// Set correct file permissions.
@@ -365,7 +873,7 @@
}
/**
- * Filter the data array for the uploaded file.
+ * Filters the data array for the uploaded file.
*
* @since 2.1.0
*
@@ -382,16 +890,19 @@
'file' => $new_file,
'url' => $url,
'type' => $type
- ), 'wp_handle_sideload' === $action ? 'sideload' : 'upload' ); }
+ ), 'wp_handle_sideload' === $action ? 'sideload' : 'upload' );
+}
/**
- * Wrapper for _wp_handle_upload(), passes 'wp_handle_upload' action.
+ * Wrapper for _wp_handle_upload().
+ *
+ * Passes the {@see 'wp_handle_upload'} action.
*
* @since 2.0.0
*
* @see _wp_handle_upload()
*
- * @param array $file Reference to a single element of $_FILES. Call the function once for
+ * @param array $file Reference to a single element of `$_FILES`. Call the function once for
* each uploaded file.
* @param array|bool $overrides Optional. An associative array of names=>values to override default
* variables. Default false.
@@ -413,13 +924,15 @@
}
/**
- * Wrapper for _wp_handle_upload(), passes 'wp_handle_sideload' action
+ * Wrapper for _wp_handle_upload().
+ *
+ * Passes the {@see 'wp_handle_sideload'} action.
*
* @since 2.6.0
*
* @see _wp_handle_upload()
*
- * @param array $file An array similar to that of a PHP $_FILES POST array
+ * @param array $file An array similar to that of a PHP `$_FILES` POST array
* @param array|bool $overrides Optional. An associative array of names=>values to override default
* variables. Default false.
* @param string $time Optional. Time formatted in 'yyyy/mm'. Default null.
@@ -440,7 +953,7 @@
/**
- * Downloads a url to a local temporary file using the WordPress HTTP Class.
+ * Downloads a URL to a local temporary file using the WordPress HTTP Class.
* Please note, That the calling function must unlink() the file.
*
* @since 2.5.0
@@ -454,7 +967,9 @@
if ( ! $url )
return new WP_Error('http_no_url', __('Invalid URL Provided.'));
- $tmpfname = wp_tempnam($url);
+ $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.'));
@@ -516,6 +1031,8 @@
*
* @since 2.5.0
*
+ * @global WP_Filesystem_Base $wp_filesystem Subclass
+ *
* @param string $file Full path and filename of zip archive
* @param string $to Full path on the filesystem to extract archive to
* @return mixed WP_Error on failure, True on success
@@ -526,9 +1043,8 @@
if ( ! $wp_filesystem || !is_object($wp_filesystem) )
return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
- // Unzip can use a lot of memory, but not this much hopefully
- /** This filter is documented in wp-admin/admin.php */
- @ini_set( 'memory_limit', apply_filters( 'admin_memory_limit', WP_MAX_MEMORY_LIMIT ) );
+ // Unzip can use a lot of memory, but not this much hopefully.
+ wp_raise_memory_limit( 'admin' );
$needed_dirs = array();
$to = trailingslashit($to);
@@ -552,13 +1068,13 @@
}
/**
- * Filter whether to use ZipArchive to unzip archives.
+ * Filters whether to use ZipArchive to unzip archives.
*
* @since 3.0.0
*
* @param bool $ziparchive Whether to use ZipArchive. Default true.
*/
- if ( class_exists( 'ZipArchive' ) && apply_filters( 'unzip_file_use_ziparchive', true ) ) {
+ if ( class_exists( 'ZipArchive', false ) && apply_filters( 'unzip_file_use_ziparchive', true ) ) {
$result = _unzip_file_ziparchive($file, $to, $needed_dirs);
if ( true === $result ) {
return $result;
@@ -579,6 +1095,8 @@
* @see unzip_file
* @access private
*
+ * @global WP_Filesystem_Base $wp_filesystem Subclass
+ *
* @param string $file Full path and filename of zip archive
* @param string $to Full path on the filesystem to extract archive to
* @param array $needed_dirs A partial list of required folders needed to be created.
@@ -602,12 +1120,20 @@
if ( '__MACOSX/' === substr($info['name'], 0, 9) ) // Skip the OS X-created __MACOSX directory
continue;
+ // Don't extract invalid files:
+ if ( 0 !== validate_file( $info['name'] ) ) {
+ continue;
+ }
+
$uncompressed_size += $info['size'];
- if ( '/' == substr($info['name'], -1) ) // directory
- $needed_dirs[] = $to . untrailingslashit($info['name']);
- else
- $needed_dirs[] = $to . untrailingslashit(dirname($info['name']));
+ if ( '/' === substr( $info['name'], -1 ) ) {
+ // Directory.
+ $needed_dirs[] = $to . untrailingslashit( $info['name'] );
+ } elseif ( '.' !== $dirname = dirname( $info['name'] ) ) {
+ // Path to a file.
+ $needed_dirs[] = $to . untrailingslashit( $dirname );
+ }
}
/*
@@ -615,7 +1141,7 @@
* 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 ( defined( 'DOING_CRON' ) && DOING_CRON ) {
+ 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' ) );
@@ -656,6 +1182,11 @@
if ( '__MACOSX/' === substr($info['name'], 0, 9) ) // Don't extract the OS X-created __MACOSX directory files
continue;
+ // Don't extract invalid files:
+ 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'] );
@@ -677,6 +1208,8 @@
* @see unzip_file
* @access private
*
+ * @global WP_Filesystem_Base $wp_filesystem Subclass
+ *
* @param string $file Full path and filename of zip archive
* @param string $to Full path on the filesystem to extract archive to
* @param array $needed_dirs A partial list of required folders needed to be created.
@@ -719,7 +1252,7 @@
* 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 ( defined( 'DOING_CRON' ) && DOING_CRON ) {
+ 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' ) );
@@ -757,6 +1290,11 @@
if ( '__MACOSX/' === substr($file['filename'], 0, 9) ) // Don't extract the OS X-created __MACOSX directory files
continue;
+ // Don't extract invalid files:
+ if ( 0 !== validate_file( $file['filename'] ) ) {
+ continue;
+ }
+
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'] );
}
@@ -769,6 +1307,8 @@
*
* @since 2.5.0
*
+ * @global WP_Filesystem_Base $wp_filesystem Subclass
+ *
* @param string $from source directory
* @param string $to destination directory
* @param array $skip_list a list of files/folders to skip copying
@@ -823,13 +1363,13 @@
*
* @since 2.5.0
*
- * @param array $args Optional. Connection args, These are passed directly to
- * the `WP_Filesystem_*()` classes. Default false.
- * @param string $context Optional. Context for {@see get_filesystem_method()}.
- * Default false.
- * @param bool $allow_relaxed_file_ownership Optional. Whether to allow Group/World writable.
- * Default false.
- * @return null|boolean false on failure, true on success.
+ * @global WP_Filesystem_Base $wp_filesystem Subclass
+ *
+ * @param array|false $args Optional. Connection args, These are passed directly to
+ * the `WP_Filesystem_*()` classes. Default false.
+ * @param string|false $context Optional. Context for get_filesystem_method(). Default false.
+ * @param bool $allow_relaxed_file_ownership Optional. Whether to allow Group/World writable. Default false.
+ * @return null|bool false on failure, true on success.
*/
function WP_Filesystem( $args = false, $context = false, $allow_relaxed_file_ownership = false ) {
global $wp_filesystem;
@@ -841,10 +1381,10 @@
if ( ! $method )
return false;
- if ( ! class_exists("WP_Filesystem_$method") ) {
+ if ( ! class_exists( "WP_Filesystem_$method" ) ) {
/**
- * Filter the path for a specific filesystem method class file.
+ * Filters the path for a specific filesystem method class file.
*
* @since 2.6.0
*
@@ -902,14 +1442,16 @@
*
* @since 2.5.0
*
+ * @global callable $_wp_filesystem_direct_method
+ *
* @param array $args Optional. Connection details. Default empty array.
* @param string $context Optional. Full path to the directory that is tested
- * for being writable. Default false.
+ * for being writable. Default empty.
* @param bool $allow_relaxed_file_ownership Optional. Whether to allow Group/World writable.
* Default false.
* @return string The transport to use, see description for valid return values.
*/
-function get_filesystem_method( $args = array(), $context = false, $allow_relaxed_file_ownership = false ) {
+function get_filesystem_method( $args = array(), $context = '', $allow_relaxed_file_ownership = false ) {
$method = defined('FS_METHOD') ? FS_METHOD : false; // Please ensure that this is either 'direct', 'ssh2', 'ftpext' or 'ftpsockets'
if ( ! $context ) {
@@ -958,7 +1500,7 @@
if ( ! $method && ( extension_loaded('sockets') || function_exists('fsockopen') ) ) $method = 'ftpsockets'; //Sockets: Socket extension; PHP Mode: FSockopen / fwrite / fread
/**
- * Filter the filesystem method to use.
+ * Filters the filesystem method to use.
*
* @since 2.6.0
*
@@ -974,45 +1516,52 @@
* Displays a form to the user to request for their FTP/SSH details in order
* to connect to the filesystem.
*
- * All chosen/entered details are saved, Excluding the Password.
+ * All chosen/entered details are saved, excluding the password.
*
* Hostnames may be in the form of hostname:portnumber (eg: wordpress.org:2467)
* to specify an alternate FTP/SSH port.
*
- * Plugins may override this form by returning true|false via the
- * {@see 'request_filesystem_credentials'} filter.
+ * Plugins may override this form by returning true|false via the {@see 'request_filesystem_credentials'} filter.
*
- * @since 2.5.
+ * @since 2.5.0
+ * @since 4.6.0 The `$context` parameter default changed from `false` to an empty string.
*
- * @todo Properly mark optional arguments as such
+ * @global string $pagenow
*
- * @param string $form_post the URL to post the form to
- * @param string $type the chosen Filesystem method in use
- * @param boolean $error if the current request has failed to connect
- * @param string $context The directory which is needed access to, The write-test will be performed on this directory by get_filesystem_method()
- * @param array $extra_fields Extra POST fields which should be checked for to be included in the post.
- * @param bool $allow_relaxed_file_ownership Whether to allow Group/World writable.
- * @return boolean False on failure. True on success.
+ * @param string $form_post The URL to post the form to.
+ * @param string $type Optional. Chosen type of filesystem. Default empty.
+ * @param bool $error Optional. Whether the current request has failed to connect.
+ * Default false.
+ * @param string $context Optional. Full path to the directory that is tested for being
+ * writable. Default empty.
+ * @param array $extra_fields Optional. Extra `POST` fields to be checked for inclusion in
+ * the post. Default null.
+ * @param bool $allow_relaxed_file_ownership Optional. Whether to allow Group/World writable. Default false.
+ *
+ * @return bool False on failure, true on success.
*/
-function request_filesystem_credentials($form_post, $type = '', $error = false, $context = false, $extra_fields = null, $allow_relaxed_file_ownership = false ) {
+function request_filesystem_credentials( $form_post, $type = '', $error = false, $context = '', $extra_fields = null, $allow_relaxed_file_ownership = false ) {
+ global $pagenow;
/**
- * Filter the filesystem credentials form output.
+ * Filters the filesystem credentials form output.
*
* Returning anything other than an empty string will effectively short-circuit
* output of the filesystem credentials form, returning that value instead.
*
* @since 2.5.0
+ * @since 4.6.0 The `$context` parameter default changed from `false` to an empty string.
*
- * @param mixed $output Form output to return instead. Default empty.
- * @param string $form_post URL to POST the form to.
- * @param string $type Chosen type of filesystem.
- * @param bool $error Whether the current request has failed to connect.
- * Default false.
- * @param string $context Full path to the directory that is tested for
- * being writable.
- * @param bool $allow_relaxed_file_ownership Whether to allow Group/World writable.
- * @param array $extra_fields Extra POST fields.
+ * @param mixed $output Form output to return instead. Default empty.
+ * @param string $form_post The URL to post the form to.
+ * @param string $type Chosen type of filesystem.
+ * @param bool $error Whether the current request has failed to connect.
+ * Default false.
+ * @param string $context Full path to the directory that is tested for
+ * being writable.
+ * @param bool $allow_relaxed_file_ownership Whether to allow Group/World writable.
+ * Default false.
+ * @param array $extra_fields Extra POST fields.
*/
$req_cred = apply_filters( 'request_filesystem_credentials', '', $form_post, $type, $error, $context, $extra_fields, $allow_relaxed_file_ownership );
if ( '' !== $req_cred )
@@ -1030,14 +1579,28 @@
$credentials = get_option('ftp_credentials', array( 'hostname' => '', 'username' => ''));
+ $submitted_form = wp_unslash( $_POST );
+
+ // Verify nonce, or unset submitted form field values on failure
+ if ( ! isset( $_POST['_fs_nonce'] ) || ! wp_verify_nonce( $_POST['_fs_nonce'], 'filesystem-credentials' ) ) {
+ unset(
+ $submitted_form['hostname'],
+ $submitted_form['username'],
+ $submitted_form['password'],
+ $submitted_form['public_key'],
+ $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)
- $credentials['hostname'] = defined('FTP_HOST') ? FTP_HOST : (!empty($_POST['hostname']) ? wp_unslash( $_POST['hostname'] ) : $credentials['hostname']);
- $credentials['username'] = defined('FTP_USER') ? FTP_USER : (!empty($_POST['username']) ? wp_unslash( $_POST['username'] ) : $credentials['username']);
- $credentials['password'] = defined('FTP_PASS') ? FTP_PASS : (!empty($_POST['password']) ? wp_unslash( $_POST['password'] ) : '');
+ $credentials['hostname'] = defined('FTP_HOST') ? FTP_HOST : (!empty($submitted_form['hostname']) ? $submitted_form['hostname'] : $credentials['hostname']);
+ $credentials['username'] = defined('FTP_USER') ? FTP_USER : (!empty($submitted_form['username']) ? $submitted_form['username'] : $credentials['username']);
+ $credentials['password'] = defined('FTP_PASS') ? FTP_PASS : (!empty($submitted_form['password']) ? $submitted_form['password'] : '');
// Check to see if we are setting the public/private keys for ssh
- $credentials['public_key'] = defined('FTP_PUBKEY') ? FTP_PUBKEY : (!empty($_POST['public_key']) ? wp_unslash( $_POST['public_key'] ) : '');
- $credentials['private_key'] = defined('FTP_PRIKEY') ? FTP_PRIKEY : (!empty($_POST['private_key']) ? wp_unslash( $_POST['private_key'] ) : '');
+ $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'] : '');
// Sanitize the hostname, Some people might pass in odd-data:
$credentials['hostname'] = preg_replace('|\w+://|', '', $credentials['hostname']); //Strip any schemes off
@@ -1054,8 +1617,8 @@
$credentials['connection_type'] = 'ssh';
} elseif ( ( defined( 'FTP_SSL' ) && FTP_SSL ) && 'ftpext' == $type ) { //Only the FTP Extension understands SSL
$credentials['connection_type'] = 'ftps';
- } elseif ( ! empty( $_POST['connection_type'] ) ) {
- $credentials['connection_type'] = wp_unslash( $_POST['connection_type'] );
+ } 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';
}
@@ -1069,7 +1632,7 @@
$stored_credentials['hostname'] .= ':' . $stored_credentials['port'];
unset($stored_credentials['password'], $stored_credentials['port'], $stored_credentials['private_key'], $stored_credentials['public_key']);
- if ( ! defined( 'WP_INSTALLING' ) ) {
+ if ( ! wp_installing() ) {
update_option( 'ftp_credentials', $stored_credentials );
}
return $credentials;
@@ -1097,9 +1660,10 @@
$types[ 'ssh' ] = __('SSH2');
/**
- * Filter the connection types to output to the filesystem credentials form.
+ * Filters the connection types to output to the filesystem credentials form.
*
* @since 2.9.0
+ * @since 4.6.0 The `$context` parameter default changed from `false` to an empty string.
*
* @param array $types Types of connections.
* @param array $credentials Credentials to connect with.
@@ -1111,22 +1675,16 @@
$types = apply_filters( 'fs_ftp_connection_types', $types, $credentials, $type, $error, $context );
?>
-<script type="text/javascript">
-<!--
-jQuery(function($){
- jQuery("#ssh").click(function () {
- jQuery("#ssh_keys").show();
- });
- jQuery("#ftp, #ftps").click(function () {
- jQuery("#ssh_keys").hide();
- });
- jQuery('#request-filesystem-credentials-form input[value=""]:first').focus();
-});
--->
-</script>
<form action="<?php echo esc_url( $form_post ) ?>" method="post">
<div id="request-filesystem-credentials-form" class="request-filesystem-credentials-form">
-<h3 id="request-filesystem-credentials-title"><?php _e( 'Connection Information' ) ?></h3>
+<?php
+// Print a H1 heading in the FTP credentials modal dialog, default is a H2.
+$heading_tag = 'h2';
+if ( 'plugins.php' === $pagenow || 'plugin-install.php' === $pagenow ) {
+ $heading_tag = 'h1';
+}
+echo "<$heading_tag id='request-filesystem-credentials-title'>" . __( 'Connection Information' ) . "</$heading_tag>";
+?>
<p id="request-filesystem-credentials-desc"><?php
$label_user = __('Username');
$label_pass = __('Password');
@@ -1163,8 +1721,28 @@
<em><?php if ( ! defined('FTP_PASS') ) _e( 'This password will not be stored on the server.' ); ?></em>
</label>
</div>
-<?php if ( isset($types['ssh']) ) : ?>
-<h4><?php _e('Authentication Keys') ?></h4>
+<fieldset>
+<legend><?php _e( 'Connection Type' ); ?></legend>
+<?php
+ $disabled = disabled( ( defined( 'FTP_SSL' ) && FTP_SSL ) || ( defined( 'FTP_SSH' ) && FTP_SSH ), true, false );
+ foreach ( $types as $name => $text ) : ?>
+ <label for="<?php echo esc_attr( $name ) ?>">
+ <input type="radio" name="connection_type" id="<?php echo esc_attr( $name ) ?>" value="<?php echo esc_attr( $name ) ?>"<?php checked( $name, $connection_type ); echo $disabled; ?> />
+ <?php echo $text; ?>
+ </label>
+<?php
+ endforeach;
+?>
+</fieldset>
+<?php
+if ( isset( $types['ssh'] ) ) {
+ $hidden_class = '';
+ if ( 'ssh' != $connection_type || empty( $connection_type ) ) {
+ $hidden_class = ' class="hidden"';
+ }
+?>
+<fieldset id="ssh-keys"<?php echo $hidden_class; ?>>
+<legend><?php _e( 'Authentication Keys' ); ?></legend>
<label for="public_key">
<span class="field-title"><?php _e('Public Key:') ?></span>
<input name="public_key" type="text" id="public_key" aria-describedby="auth-keys-desc" value="<?php echo esc_attr($public_key) ?>"<?php disabled( defined('FTP_PUBKEY') ); ?> />
@@ -1173,28 +1751,20 @@
<span class="field-title"><?php _e('Private Key:') ?></span>
<input name="private_key" type="text" id="private_key" value="<?php echo esc_attr($private_key) ?>"<?php disabled( defined('FTP_PRIKEY') ); ?> />
</label>
-<span id="auth-keys-desc"><?php _e('Enter the location on the server where the public and private keys are located. If a passphrase is needed, enter that in the password field above.') ?></span>
-<?php endif; ?>
-<h4><?php _e('Connection Type') ?></h4>
-<fieldset><legend class="screen-reader-text"><span><?php _e('Connection Type') ?></span></legend>
-<?php
- $disabled = disabled( (defined('FTP_SSL') && FTP_SSL) || (defined('FTP_SSH') && FTP_SSH), true, false );
- foreach ( $types as $name => $text ) : ?>
- <label for="<?php echo esc_attr($name) ?>">
- <input type="radio" name="connection_type" id="<?php echo esc_attr($name) ?>" value="<?php echo esc_attr($name) ?>"<?php checked($name, $connection_type); echo $disabled; ?> />
- <?php echo $text ?>
- </label>
- <?php endforeach; ?>
+<p id="auth-keys-desc"><?php _e( 'Enter the location on the server where the public and private keys are located. If a passphrase is needed, enter that in the password field above.' ) ?></p>
</fieldset>
<?php
+}
+
foreach ( (array) $extra_fields as $field ) {
- if ( isset( $_POST[ $field ] ) )
- echo '<input type="hidden" name="' . esc_attr( $field ) . '" value="' . esc_attr( wp_unslash( $_POST[ $field ] ) ) . '" />';
+ if ( isset( $submitted_form[ $field ] ) )
+ echo '<input type="hidden" name="' . esc_attr( $field ) . '" value="' . esc_attr( $submitted_form[ $field ] ) . '" />';
}
?>
<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' ), 'button', 'upgrade', false ); ?>
+ <?php submit_button( __( 'Proceed' ), '', 'upgrade', false ); ?>
</p>
</div>
</form>
@@ -1222,8 +1792,459 @@
<div class="notification-dialog" role="dialog" aria-labelledby="request-filesystem-credentials-title" tabindex="0">
<div class="request-filesystem-credentials-dialog-content">
<?php request_filesystem_credentials( site_url() ); ?>
- <div>
+ </div>
</div>
</div>
<?php
}
+
+/**
+ * Generate a single group for the personal data export report.
+ *
+ * @since 4.9.6
+ *
+ * @param array $group_data {
+ * The group data to render.
+ *
+ * @type string $group_label The user-facing heading for the group, e.g. 'Comments'.
+ * @type array $items {
+ * An array of group items.
+ *
+ * @type array $group_item_data {
+ * An array of name-value pairs for the item.
+ *
+ * @type string $name The user-facing name of an item name-value pair, e.g. 'IP Address'.
+ * @type string $value The user-facing value of an item data pair, e.g. '50.60.70.0'.
+ * }
+ * }
+ * }
+ * @return string The HTML for this group and its items.
+ */
+function wp_privacy_generate_personal_data_export_group_html( $group_data ) {
+ $allowed_tags = array(
+ 'a' => array(
+ 'href' => array(),
+ 'target' => array()
+ ),
+ 'br' => array()
+ );
+ $allowed_protocols = array( 'http', 'https' );
+ $group_html = '';
+
+ $group_html .= '<h2>' . esc_html( $group_data['group_label'] ) . '</h2>';
+ $group_html .= '<div>';
+
+ foreach ( (array) $group_data['items'] as $group_item_id => $group_item_data ) {
+ $group_html .= '<table>';
+ $group_html .= '<tbody>';
+
+ foreach ( (array) $group_item_data as $group_item_datum ) {
+ $value = $group_item_datum['value'];
+ // If it looks like a link, make it a link
+ if ( false === strpos( $value, ' ' ) && ( 0 === strpos( $value, 'http://' ) || 0 === strpos( $value, 'https://' ) ) ) {
+ $value = '<a href="' . esc_url( $value ) . '">' . esc_html( $value ) . '</a>';
+ }
+
+ $group_html .= '<tr>';
+ $group_html .= '<th>' . esc_html( $group_item_datum['name'] ) . '</th>';
+ $group_html .= '<td>' . wp_kses( $value, $allowed_tags, $allowed_protocols ) . '</td>';
+ $group_html .= '</tr>';
+ }
+
+ $group_html .= '</tbody>';
+ $group_html .= '</table>';
+ }
+
+ $group_html .= '</div>';
+
+ return $group_html;
+}
+
+/**
+ * Generate the personal data export file.
+ *
+ * @since 4.9.6
+ *
+ * @param int $request_id The export request ID.
+ */
+function wp_privacy_generate_personal_data_export_file( $request_id ) {
+ if ( ! class_exists( 'ZipArchive' ) ) {
+ wp_send_json_error( __( 'Unable to generate export file. ZipArchive not available.' ) );
+ }
+
+ // Get the request data.
+ $request = wp_get_user_request_data( $request_id );
+
+ if ( ! $request || 'export_personal_data' !== $request->action_name ) {
+ wp_send_json_error( __( 'Invalid request ID when generating export file.' ) );
+ }
+
+ $email_address = $request->email;
+
+ if ( ! is_email( $email_address ) ) {
+ wp_send_json_error( __( 'Invalid email address when generating export file.' ) );
+ }
+
+ // Create the exports folder if needed.
+ $exports_dir = wp_privacy_exports_dir();
+ $exports_url = wp_privacy_exports_url();
+
+ if ( ! wp_mkdir_p( $exports_dir ) ) {
+ wp_send_json_error( __( 'Unable to create export folder.' ) );
+ }
+
+ // Protect export folder from browsing.
+ $index_pathname = $exports_dir . 'index.html';
+ if ( ! file_exists( $index_pathname ) ) {
+ $file = fopen( $index_pathname, 'w' );
+ if ( false === $file ) {
+ wp_send_json_error( __( 'Unable to protect export folder from browsing.' ) );
+ }
+ fwrite( $file, '<!-- Silence is golden. -->' );
+ fclose( $file );
+ }
+
+ $stripped_email = str_replace( '@', '-at-', $email_address );
+ $stripped_email = sanitize_title( $stripped_email ); // slugify the email address
+ $obscura = wp_generate_password( 32, false, false );
+ $file_basename = 'wp-personal-data-file-' . $stripped_email . '-' . $obscura;
+ $html_report_filename = $file_basename . '.html';
+ $html_report_pathname = wp_normalize_path( $exports_dir . $html_report_filename );
+ $file = fopen( $html_report_pathname, 'w' );
+ if ( false === $file ) {
+ wp_send_json_error( __( 'Unable to open export file (HTML report) for writing.' ) );
+ }
+
+ $title = sprintf(
+ /* translators: %s: user's e-mail address */
+ __( 'Personal Data Export for %s' ),
+ $email_address
+ );
+
+ // Open HTML.
+ fwrite( $file, "<!DOCTYPE html>\n" );
+ fwrite( $file, "<html>\n" );
+
+ // Head.
+ fwrite( $file, "<head>\n" );
+ fwrite( $file, "<meta http-equiv='Content-Type' content='text/html; charset=UTF-8' />\n" );
+ fwrite( $file, "<style type='text/css'>" );
+ fwrite( $file, "body { color: black; font-family: Arial, sans-serif; font-size: 11pt; margin: 15px auto; width: 860px; }" );
+ fwrite( $file, "table { background: #f0f0f0; border: 1px solid #ddd; margin-bottom: 20px; width: 100%; }" );
+ fwrite( $file, "th { padding: 5px; text-align: left; width: 20%; }" );
+ fwrite( $file, "td { padding: 5px; }" );
+ fwrite( $file, "tr:nth-child(odd) { background-color: #fafafa; }" );
+ fwrite( $file, "</style>" );
+ fwrite( $file, "<title>" );
+ fwrite( $file, esc_html( $title ) );
+ fwrite( $file, "</title>" );
+ fwrite( $file, "</head>\n" );
+
+ // Body.
+ fwrite( $file, "<body>\n" );
+
+ // Heading.
+ fwrite( $file, "<h1>" . esc_html__( 'Personal Data Export' ) . "</h1>" );
+
+ // And now, all the Groups.
+ $groups = get_post_meta( $request_id, '_export_data_grouped', true );
+
+ // First, build an "About" group on the fly for this report.
+ $about_group = array(
+ /* translators: Header for the About section in a personal data export. */
+ 'group_label' => _x( 'About', 'personal data group label' ),
+ 'items' => array(
+ 'about-1' => array(
+ array(
+ 'name' => _x( 'Report generated for', 'email address' ),
+ 'value' => $email_address,
+ ),
+ array(
+ 'name' => _x( 'For site', 'website name' ),
+ 'value' => get_bloginfo( 'name' ),
+ ),
+ array(
+ 'name' => _x( 'At URL', 'website URL' ),
+ 'value' => get_bloginfo( 'url' ),
+ ),
+ array(
+ 'name' => _x( 'On', 'date/time' ),
+ 'value' => current_time( 'mysql' ),
+ ),
+ ),
+ ),
+ );
+
+ // Merge in the special about group.
+ $groups = array_merge( array( 'about' => $about_group ), $groups );
+
+ // Now, iterate over every group in $groups and have the formatter render it in HTML.
+ foreach ( (array) $groups as $group_id => $group_data ) {
+ fwrite( $file, wp_privacy_generate_personal_data_export_group_html( $group_data ) );
+ }
+
+ fwrite( $file, "</body>\n" );
+
+ // Close HTML.
+ fwrite( $file, "</html>\n" );
+ fclose( $file );
+
+ /*
+ * Now, generate the ZIP.
+ *
+ * If an archive has already been generated, then remove it and reuse the
+ * filename, to avoid breaking any URLs that may have been previously sent
+ * via email.
+ */
+ $error = false;
+ $archive_url = get_post_meta( $request_id, '_export_file_url', true );
+ $archive_pathname = get_post_meta( $request_id, '_export_file_path', true );
+
+ if ( empty( $archive_pathname ) || empty( $archive_url ) ) {
+ $archive_filename = $file_basename . '.zip';
+ $archive_pathname = $exports_dir . $archive_filename;
+ $archive_url = $exports_url . $archive_filename;
+
+ update_post_meta( $request_id, '_export_file_url', $archive_url );
+ update_post_meta( $request_id, '_export_file_path', wp_normalize_path( $archive_pathname ) );
+ }
+
+ if ( ! empty( $archive_pathname ) && file_exists( $archive_pathname ) ) {
+ wp_delete_file( $archive_pathname );
+ }
+
+ $zip = new ZipArchive;
+ if ( true === $zip->open( $archive_pathname, ZipArchive::CREATE ) ) {
+ if ( ! $zip->addFile( $html_report_pathname, 'index.html' ) ) {
+ $error = __( 'Unable to add data to export file.' );
+ }
+
+ $zip->close();
+
+ if ( ! $error ) {
+ /**
+ * Fires right after all personal data has been written to the export file.
+ *
+ * @since 4.9.6
+ *
+ * @param string $archive_pathname The full path to the export file on the filesystem.
+ * @param string $archive_url The URL of the archive file.
+ * @param string $html_report_pathname The full path to the personal data report on the filesystem.
+ * @param int $request_id The export request ID.
+ */
+ do_action( 'wp_privacy_personal_data_export_file_created', $archive_pathname, $archive_url, $html_report_pathname, $request_id );
+ }
+ } else {
+ $error = __( 'Unable to open export file (archive) for writing.' );
+ }
+
+ // And remove the HTML file.
+ unlink( $html_report_pathname );
+
+ if ( $error ) {
+ wp_send_json_error( $error );
+ }
+}
+
+/**
+ * Send an email to the user with a link to the personal data export file
+ *
+ * @since 4.9.6
+ *
+ * @param int $request_id The request ID for this personal data export.
+ * @return true|WP_Error True on success or `WP_Error` on failure.
+ */
+function wp_privacy_send_personal_data_export_email( $request_id ) {
+ // Get the request data.
+ $request = wp_get_user_request_data( $request_id );
+
+ if ( ! $request || 'export_personal_data' !== $request->action_name ) {
+ return new WP_Error( 'invalid', __( 'Invalid request ID when sending personal data export email.' ) );
+ }
+
+ /** This filter is documented in wp-includes/functions.php */
+ $expiration = apply_filters( 'wp_privacy_export_expiration', 3 * DAY_IN_SECONDS );
+ $expiration_date = date_i18n( get_option( 'date_format' ), time() + $expiration );
+
+/* translators: Do not translate EXPIRATION, LINK, SITENAME, SITEURL: those are placeholders. */
+$email_text = __(
+'Howdy,
+
+Your request for an export of personal data has been completed. You may
+download your personal data by clicking on the link below. For privacy
+and security, we will automatically delete the file on ###EXPIRATION###,
+so please download it before then.
+
+###LINK###
+
+Regards,
+All at ###SITENAME###
+###SITEURL###'
+);
+
+ /**
+ * Filters the text of the email sent with a personal data export file.
+ *
+ * The following strings have a special meaning and will get replaced dynamically:
+ * ###EXPIRATION### The date when the URL will be automatically deleted.
+ * ###LINK### URL of the personal data export file for the user.
+ * ###SITENAME### The name of the site.
+ * ###SITEURL### The URL to the site.
+ *
+ * @since 4.9.6
+ *
+ * @param string $email_text Text in the email.
+ * @param int $request_id The request ID for this personal data export.
+ */
+ $content = apply_filters( 'wp_privacy_personal_data_email_content', $email_text, $request_id );
+
+ $email_address = $request->email;
+ $export_file_url = get_post_meta( $request_id, '_export_file_url', true );
+ $site_name = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
+ $site_url = home_url();
+
+ $content = str_replace( '###EXPIRATION###', $expiration_date, $content );
+ $content = str_replace( '###LINK###', esc_url_raw( $export_file_url ), $content );
+ $content = str_replace( '###EMAIL###', $email_address, $content );
+ $content = str_replace( '###SITENAME###', $site_name, $content );
+ $content = str_replace( '###SITEURL###', esc_url_raw( $site_url ), $content );
+
+ $mail_success = wp_mail(
+ $email_address,
+ sprintf(
+ __( '[%s] Personal Data Export' ),
+ $site_name
+ ),
+ $content
+ );
+
+ if ( ! $mail_success ) {
+ return new WP_Error( 'error', __( 'Unable to send personal data export email.' ) );
+ }
+
+ return true;
+}
+
+/**
+ * Intercept personal data exporter page ajax responses in order to assemble the personal data export file.
+ * @see wp_privacy_personal_data_export_page
+ * @since 4.9.6
+ *
+ * @param array $response The response from the personal data exporter for the given page.
+ * @param int $exporter_index The index of the personal data exporter. Begins at 1.
+ * @param string $email_address The email address of the user whose personal data this is.
+ * @param int $page The page of personal data for this exporter. Begins at 1.
+ * @param int $request_id The request ID for this personal data export.
+ * @param bool $send_as_email Whether the final results of the export should be emailed to the user.
+ * @param string $exporter_key The slug (key) of the exporter.
+ * @return array The filtered response.
+ */
+function wp_privacy_process_personal_data_export_page( $response, $exporter_index, $email_address, $page, $request_id, $send_as_email, $exporter_key ) {
+ /* Do some simple checks on the shape of the response from the exporter.
+ * If the exporter response is malformed, don't attempt to consume it - let it
+ * pass through to generate a warning to the user by default ajax processing.
+ */
+ if ( ! is_array( $response ) ) {
+ return $response;
+ }
+
+ if ( ! array_key_exists( 'done', $response ) ) {
+ return $response;
+ }
+
+ if ( ! array_key_exists( 'data', $response ) ) {
+ return $response;
+ }
+
+ if ( ! is_array( $response['data'] ) ) {
+ return $response;
+ }
+
+ // Get the request data.
+ $request = wp_get_user_request_data( $request_id );
+
+ if ( ! $request || 'export_personal_data' !== $request->action_name ) {
+ wp_send_json_error( __( 'Invalid request ID when merging exporter data.' ) );
+ }
+
+ $export_data = array();
+
+ // First exporter, first page? Reset the report data accumulation array.
+ if ( 1 === $exporter_index && 1 === $page ) {
+ update_post_meta( $request_id, '_export_data_raw', $export_data );
+ } else {
+ $export_data = get_post_meta( $request_id, '_export_data_raw', true );
+ }
+
+ // Now, merge the data from the exporter response into the data we have accumulated already.
+ $export_data = array_merge( $export_data, $response['data'] );
+ update_post_meta( $request_id, '_export_data_raw', $export_data );
+
+ // If we are not yet on the last page of the last exporter, return now.
+ /** This filter is documented in wp-admin/includes/ajax-actions.php */
+ $exporters = apply_filters( 'wp_privacy_personal_data_exporters', array() );
+ $is_last_exporter = $exporter_index === count( $exporters );
+ $exporter_done = $response['done'];
+ if ( ! $is_last_exporter || ! $exporter_done ) {
+ return $response;
+ }
+
+ // Last exporter, last page - let's prepare the export file.
+
+ // First we need to re-organize the raw data hierarchically in groups and items.
+ $groups = array();
+ foreach ( (array) $export_data as $export_datum ) {
+ $group_id = $export_datum['group_id'];
+ $group_label = $export_datum['group_label'];
+ if ( ! array_key_exists( $group_id, $groups ) ) {
+ $groups[ $group_id ] = array(
+ 'group_label' => $group_label,
+ 'items' => array(),
+ );
+ }
+
+ $item_id = $export_datum['item_id'];
+ if ( ! array_key_exists( $item_id, $groups[ $group_id ]['items'] ) ) {
+ $groups[ $group_id ]['items'][ $item_id ] = array();
+ }
+
+ $old_item_data = $groups[ $group_id ]['items'][ $item_id ];
+ $merged_item_data = array_merge( $export_datum['data'], $old_item_data );
+ $groups[ $group_id ]['items'][ $item_id ] = $merged_item_data;
+ }
+
+ // Then save the grouped data into the request.
+ delete_post_meta( $request_id, '_export_data_raw' );
+ update_post_meta( $request_id, '_export_data_grouped', $groups );
+
+ /**
+ * Generate the export file from the collected, grouped personal data.
+ *
+ * @since 4.9.6
+ *
+ * @param int $request_id The export request ID.
+ */
+ do_action( 'wp_privacy_personal_data_export_file', $request_id );
+
+ // Clear the grouped data now that it is no longer needed.
+ delete_post_meta( $request_id, '_export_data_grouped' );
+
+ // If the destination is email, send it now.
+ if ( $send_as_email ) {
+ $mail_success = wp_privacy_send_personal_data_export_email( $request_id );
+ if ( is_wp_error( $mail_success ) ) {
+ wp_send_json_error( $mail_success->get_error_message() );
+ }
+ } else {
+ // Modify the response to include the URL of the export file so the browser can fetch it.
+ $export_file_url = get_post_meta( $request_id, '_export_file_url', true );
+ if ( ! empty( $export_file_url ) ) {
+ $response['url'] = $export_file_url;
+ }
+ }
+
+ // Update the request to completed state.
+ _wp_privacy_completed_request( $request_id );
+
+ return $response;
+}