Changeset 7547

Timestamp:

03/27/2008 07:36:30 AM (17 years ago)

Author:

ryan

Message:

Return WP_Error from download_url() on HTTP Errors. Fix cases where current plugin filename differs from the WordPress.org slug. Props DD32. see #5586

Location:

trunk/wp-admin/includes

Files:

• file.php (modified) (2 diffs)
• update.php (modified) (5 diffs)

trunk/wp-admin/includes/file.php

@@ -193 +193 @@
 *
 * @param string $url the URL of the file to download
-* @return mixed false on failure, string Filename on success.
+* @return mixed WP_Error on failure, string Filename on success.
 */
 function download_url( $url ) {
     //WARNING: The file is not automatically deleted, The script must unlink() the file.
     if( ! $url )
-        return false;
+        return new WP_Error('http_no_url', __('Invalid URL Provided'));
 
     $tmpfname = tempnam(get_temp_dir(), 'wpupdate');
     if( ! $tmpfname )
-        return false;
+        return new WP_Error('http_no_file', __('Could not create Temporary file'));
 
     $handle = @fopen($tmpfname, 'w');
     if( ! $handle )
-        return false;
+        return new WP_Error('http_no_file', __('Could not create Temporary file'));
 
     require_once( ABSPATH . 'wp-includes/class-snoopy.php' );
@@ -212 +212 @@
     $snoopy->fetch($url);
 
+    if( $snoopy->status != '200' ){
+        fclose($handle);
+        unlink($tmpfname);
+        return new WP_Error('http_404', trim($snoopy->response_code));
+    }
     fwrite($handle, $snoopy->results);
     fclose($handle);

trunk/wp-admin/includes/update.php

@@ -177 +177 @@
     $file = download_url($package);
 
-    if ( !$file )
-        return new WP_Error('download_failed', __('Download failed.'));
+    if ( is_wp_error($file) )
+        return new WP_Error('download_failed', __('Download failed.'), $file->get_error_message());
 
     $working_dir = $base . 'wp-content/upgrade/' . basename($plugin, '.php');
@@ -195 +195 @@
     }
 
-    // Once installed, delete the package
+    // Once extracted, delete the package
     unlink($file);
 
     if ( is_plugin_active($plugin) ) {
-        //Deactivate the plugin
+        //Deactivate the plugin silently, Prevent deactivation hooks from running.
         apply_filters('update_feedback', __('Deactivating the plugin'));
         deactivate_plugins($plugin, true);
@@ -210 +210 @@
     
     // If plugin is in its own directory, recursively delete the directory.
-    if ( strpos($plugin, '/') && $plugin_dir != $base . PLUGINDIR . '/' )
+    if ( strpos($plugin, '/') && $plugin_dir != $base . PLUGINDIR . '/' ) //base check on if plugin includes directory seperator AND that its not the root plugin folder
         $deleted = $wp_filesystem->delete($plugin_dir, true);
     else
@@ -227 +227 @@
     }
 
+    //Get a list of the directories in the working directory before we delete it, We need to know the new folder for the plugin
+    $filelist = array_keys( $wp_filesystem->dirlist($working_dir) );
+
     // Remove working directory
     $wp_filesystem->delete($working_dir, true);
@@ -233 +236 @@
     delete_option('update_plugins');
     
-    //Return the new plugin file.
-    if ( ! preg_match('!/([a-z0-9\-]+)/?$!i', $working_dir, $mat) )
-        return false;
-    $plugin = get_plugins('/' . $mat[1]); //Pass it with a leading slash
-    $list = array_keys($plugin);
-    return $mat[1] . '/' . $list[0]; //Pass it without a leading slash.
+    if( empty($filelist) )
+        return false; //We couldnt find any files in the working dir
+    
+    $folder = $filelist[0];
+    $plugin = get_plugins('/' . $folder); //Pass it with a leading slash, search out the plugins in the folder, 
+    $pluginfiles = array_keys($plugin); //Assume the requested plugin is the first in the list
+
+    return  $folder . '/' . $pluginfiles[0]; //Pass it without a leading slash as WP requires
 }