mirror
/
plugin-update-checker
mirror of https://github.com/YahnisElsts/plugin-update-checker.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix the remote source folder structure if necessary. 

It re-structures and corrects the folder/zip structure of the extracted remote zip folder - if not correct already.
This commit is contained in:
Mehbub Rashid 2024-07-06 13:46:47 +06:00 committed by GitHub
parent 3b1becb956
commit 1dd70e99f0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 57 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
Puc/v5p4/UpdateChecker.php
View File

@ -924,23 +924,66 @@ if ( !class_exists(UpdateChecker::class, false) ):
return $source; return $source;
} }
// Fix the remote source structure if necessary.
//The update archive should contain a single directory that contains the rest of plugin/theme files.
//Otherwise, WordPress will try to copy the entire working directory ($source == $remoteSource).
//We can't rename $remoteSource because that would break WordPress code that cleans up temporary files
//after update.
if ( $this->isBadDirectoryStructure($remoteSource) ) {
// Create a new folder using plugin slug.
$new_directory = trailingslashit( $remoteSource ) . $this->slug . '/';
if ( ! $wp_filesystem->is_dir( $new_directory ) ) {
$wp_filesystem->mkdir( $new_directory );
// Move all files inside newly created directory.
$sourceFiles = $wp_filesystem->dirlist($remoteSource);
if ( is_array($sourceFiles) ) {
$sourceFiles = array_keys($sourceFiles);
$allMoved = true;
foreach ($sourceFiles as $filename) {
// Skip for our newly created folder.
if ( $filename === $this->slug ) {
continue;
}
$previousSource = trailingslashit( $remoteSource ) . $filename;
$newSource = trailingslashit( $new_directory ) . $filename;
if ( !$wp_filesystem->move($previousSource, $newSource, true) ) {
$allMoved = false;
break;
}
}
if ( $allMoved ) {
// Rename source.
$source = $new_directory;
}
else {
// Delete our newly created folder including all files in it.
$wp_filesystem->rmdir( $new_directory, true );
// And return a relevant error.
return new WP_Error(
'puc-incorrect-directory-structure',
sprintf(
'The directory structure of the update was incorrect. All files should be inside ' .
'a directory named <span class="code">%s</span>, not at the root of the ZIP archive. Plugin Update Checker tried to fix the directory structure, but failed.',
htmlentities($this->slug)
)
);
}
}
}
}
//Rename the source to match the existing directory. //Rename the source to match the existing directory.
$correctedSource = trailingslashit($remoteSource) . $this->directoryName . '/'; $correctedSource = trailingslashit($remoteSource) . $this->directoryName . '/';
if ( $source !== $correctedSource ) { if ( $source !== $correctedSource ) {
//The update archive should contain a single directory that contains the rest of plugin/theme files.
//Otherwise, WordPress will try to copy the entire working directory ($source == $remoteSource).
//We can't rename $remoteSource because that would break WordPress code that cleans up temporary files
//after update.
if ( $this->isBadDirectoryStructure($remoteSource) ) {
return new WP_Error(
'puc-incorrect-directory-structure',
sprintf(
'The directory structure of the update is incorrect. All files should be inside ' .
'a directory named <span class="code">%s</span>, not at the root of the ZIP archive.',
htmlentities($this->slug)
)
);
}
/** @var \WP_Upgrader_Skin $upgrader ->skin */ /** @var \WP_Upgrader_Skin $upgrader ->skin */
$upgrader->skin->feedback(sprintf( $upgrader->skin->feedback(sprintf(