mirror of
git://develop.git.wordpress.org/
synced 2025-03-23 13:29:56 +01:00
Uploads: Check for and verify ZIP archives.
Merges [57388] to 6.4 branch. Props costdev, peterwilsoncc, azaozz, tykoted, johnbillion, desrosj, afragen, jorbin. git-svn-id: https://develop.svn.wordpress.org/branches/6.4@57390 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
89c53f4db7
commit
ee5a601e0f
@ -69,6 +69,30 @@ class File_Upload_Upgrader {
|
||||
wp_die( $file['error'] );
|
||||
}
|
||||
|
||||
if ( 'pluginzip' === $form || 'themezip' === $form ) {
|
||||
$archive_is_valid = false;
|
||||
|
||||
/** This filter is documented in wp-admin/includes/file.php */
|
||||
if ( class_exists( 'ZipArchive', false ) && apply_filters( 'unzip_file_use_ziparchive', true ) ) {
|
||||
$archive = new ZipArchive();
|
||||
$archive_is_valid = $archive->open( $file['file'], ZIPARCHIVE::CHECKCONS );
|
||||
|
||||
if ( true === $archive_is_valid ) {
|
||||
$archive->close();
|
||||
}
|
||||
} else {
|
||||
require_once ABSPATH . 'wp-admin/includes/class-pclzip.php';
|
||||
|
||||
$archive = new PclZip( $file['file'] );
|
||||
$archive_is_valid = is_array( $archive->properties() );
|
||||
}
|
||||
|
||||
if ( true !== $archive_is_valid ) {
|
||||
wp_delete_file( $file['file'] );
|
||||
wp_die( __( 'Incompatible Archive.' ) );
|
||||
}
|
||||
}
|
||||
|
||||
$this->filename = $_FILES[ $form ]['name'];
|
||||
$this->package = $file['file'];
|
||||
|
||||
|
@ -154,6 +154,10 @@ if ( isset( $_GET['action'] ) ) {
|
||||
|
||||
check_admin_referer( 'plugin-upload' );
|
||||
|
||||
if ( isset( $_FILES['pluginzip']['name'] ) && ! str_ends_with( strtolower( $_FILES['pluginzip']['name'] ), '.zip' ) ) {
|
||||
wp_die( __( 'Only .zip archives may be uploaded.' ) );
|
||||
}
|
||||
|
||||
$file_upload = new File_Upload_Upgrader( 'pluginzip', 'package' );
|
||||
|
||||
// Used in the HTML title tag.
|
||||
@ -302,6 +306,10 @@ if ( isset( $_GET['action'] ) ) {
|
||||
|
||||
check_admin_referer( 'theme-upload' );
|
||||
|
||||
if ( isset( $_FILES['themezip']['name'] ) && ! str_ends_with( strtolower( $_FILES['themezip']['name'] ), '.zip' ) ) {
|
||||
wp_die( __( 'Only .zip archives may be uploaded.' ) );
|
||||
}
|
||||
|
||||
$file_upload = new File_Upload_Upgrader( 'themezip', 'package' );
|
||||
|
||||
// Used in the HTML title tag.
|
||||
|
Loading…
x
Reference in New Issue
Block a user