X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/03f2fa83c13c1b532284205fa7efcab9b8b2c41f..607b7e02d77e7326161e8ec15639052d2040f745:/wp-admin/includes/file.php
diff --git a/wp-admin/includes/file.php b/wp-admin/includes/file.php
index 3b4d1c6e..face9164 100644
--- a/wp-admin/includes/file.php
+++ b/wp-admin/includes/file.php
@@ -13,38 +13,54 @@
/** 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' => __( 'Theme Footer' ),
- 'header.php' => __( 'Theme 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' => __( 'Static Front Page' ),
+ // 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' ),
);
/**
@@ -152,7 +168,7 @@ function wp_tempnam( $filename = '', $dir = '' ) {
$dir = get_temp_dir();
}
- if ( empty( $filename ) || '.' == $filename || '/' == $filename ) {
+ if ( empty( $filename ) || '.' == $filename || '/' == $filename || '\\' == $filename ) {
$filename = time();
}
@@ -184,7 +200,7 @@ function wp_tempnam( $filename = '', $dir = '' ) {
/**
* Make sure that the file that was requested to edit, 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
*
@@ -214,6 +230,7 @@ function validate_file_to_edit( $file, $allowed_files = '' ) {
* 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
@@ -224,7 +241,7 @@ function validate_file_to_edit( $file, $allowed_files = '' ) {
* @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' ) ) {
@@ -234,7 +251,7 @@ function _wp_handle_upload( &$file, $overrides, $time, $action ) {
}
/**
- * 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.
*
@@ -253,7 +270,7 @@ function _wp_handle_upload( &$file, $overrides, $time, $action ) {
// 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?
@@ -295,11 +312,11 @@ function _wp_handle_upload( &$file, $overrides, $time, $action ) {
// 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'] );
@@ -310,13 +327,13 @@ function _wp_handle_upload( &$file, $overrides, $time, $action ) {
} 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.
@@ -331,7 +348,7 @@ function _wp_handle_upload( &$file, $overrides, $time, $action ) {
$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'];
@@ -345,7 +362,7 @@ function _wp_handle_upload( &$file, $overrides, $time, $action ) {
* 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 );
@@ -382,7 +399,7 @@ function _wp_handle_upload( &$file, $overrides, $time, $action ) {
}
/**
- * Filter the data array for the uploaded file.
+ * Filters the data array for the uploaded file.
*
* @since 2.1.0
*
@@ -399,16 +416,19 @@ function _wp_handle_upload( &$file, $overrides, $time, $action ) {
'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.
@@ -430,13 +450,15 @@ function wp_handle_upload( &$file, $overrides = false, $time = null ) {
}
/**
- * 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.
@@ -457,7 +479,7 @@ function wp_handle_sideload( &$file, $overrides = false, $time = null ) {
/**
- * 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
@@ -471,7 +493,9 @@ function download_url( $url, $timeout = 300 ) {
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.'));
@@ -545,9 +569,8 @@ function unzip_file($file, $to) {
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);
@@ -571,7 +594,7 @@ function unzip_file($file, $to) {
}
/**
- * Filter whether to use ZipArchive to unzip archives.
+ * Filters whether to use ZipArchive to unzip archives.
*
* @since 3.0.0
*
@@ -625,10 +648,13 @@ function _unzip_file_ziparchive($file, $to, $needed_dirs = array() ) {
$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 );
+ }
}
/*
@@ -869,7 +895,7 @@ function WP_Filesystem( $args = false, $context = false, $allow_relaxed_file_own
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
*
@@ -931,12 +957,12 @@ function WP_Filesystem( $args = false, $context = false, $allow_relaxed_file_own
*
* @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 ) {
@@ -985,7 +1011,7 @@ function get_filesystem_method( $args = array(), $context = false, $allow_relaxe
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
*
@@ -1001,48 +1027,52 @@ function get_filesystem_method( $args = array(), $context = false, $allow_relaxe
* 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.
- *
- * @todo Properly mark optional arguments as such
+ * @since 2.5.0
+ * @since 4.6.0 The `$context` parameter default changed from `false` to an empty string.
*
* @global string $pagenow
*
- * @param string $form_post the URL to post the form to
- * @param string $type the chosen Filesystem method in use
- * @param bool $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 bool 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 )
@@ -1127,9 +1157,10 @@ function request_filesystem_credentials($form_post, $type = '', $error = false,
$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.
@@ -1141,19 +1172,6 @@ function request_filesystem_credentials($form_post, $type = '', $error = false,
$types = apply_filters( 'fs_ftp_connection_types', $types, $credentials, $type, $error, $context );
?>
-