Changeset 6779

Timestamp:

02/11/08 05:45:54 (5 months ago)

Author:

ryan

Message:

First cut at plugin update. Props DD32 for the filesystem abstraction. see #5586

Files:

• trunk/wp-admin/includes/class-ftp.php (added)
• trunk/wp-admin/includes/class-pclzip.php (added)
• trunk/wp-admin/includes/class-wp-filesystem-direct.php (added)
• trunk/wp-admin/includes/class-wp-filesystem-ftpext.php (added)
• trunk/wp-admin/includes/class-wp-filesystem-ftpsockets.php (added)
• trunk/wp-admin/includes/file.php (modified) (1 diff)
• trunk/wp-admin/includes/update.php (modified) (1 diff)
• trunk/wp-admin/update.php (added)

trunk/wp-admin/includes/file.php

@@ -172 +172 @@
-}
-
+/**
+* Downloads a url to a local file using the Snoopy HTTP Class
+*
+* @param string $url the URL of the file to download
+* @return mixed false 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;
+
+    $tmpfname = tempnam('/tmp', 'wpupdate');
+    if( ! $tmpfname )
+        return false;
+
+    $handle = fopen($tmpfname, 'w');
+    if( ! $handle )
+        return false;
+
+    require_once( ABSPATH . 'wp-includes/class-snoopy.php' );
+    $snoopy = new Snoopy();
+    $snoopy->fetch($url);
+    
+    fwrite($handle, $snoopy->results);
+    fclose($handle);
+
+    return $tmpfname;
+}
+
+function unzip_file($file, $to) {
+    global $wp_filesystem;
+
+    if ( ! $wp_filesystem || !is_object($wp_filesystem) )
+        return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
+            
+    $fs =& $wp_filesystem;
+
+    require_once(ABSPATH . 'wp-admin/includes/class-pclzip.php');
+
+    $archive = new PclZip($file);
+
+    // Is the archive valid?
+    if ( false == ($archive_files = $archive->extract(PCLZIP_OPT_EXTRACT_AS_STRING)) )
+        return new WP_Error('incompatible_archive', __('Incompatible archive'), $archive->error_string);
+
+    if ( 0 == count($archive_files) )
+        return new WP_Error('empty_archive', __('Empty archive'));
+
+    $to = trailingslashit($to);
+    $path = explode('/', $to);
+    $tmppath = '';
+    for ( $j = 0; $j < count($path) - 1; $j++ ) {
+        $tmppath .= $path[$j] . '/';
+        if ( ! $fs->is_dir($tmppath) ) {
+            $fs->mkdir($tmppath);
+        } else {
+            $fs->setDefaultPermissions( $fs->getchmod($tmppath) );
+        }
+    }
+
+    foreach ($archive_files as $file) {
+        $path = explode('/', $file['filename']);
+        $tmppath = '';
+
+        // Loop through each of the items and check that the folder exists.
+        for ( $j = 0; $j < count($path) - 1; $j++ ) {
+            $tmppath .= $path[$j] . '/';
+            if ( ! $fs->is_dir($to . $tmppath) )
+                $fs->mkdir($to . $tmppath);
+        }
+
+        // We've made sure the folders are there, so let's extract the file now:
+        if ( ! $file['folder'] )
+            $fs->put_contents( $to . $file['filename'], $file['content']);
+    }
+}
+
+function copy_dir($from, $to) {
+    global $wp_filesystem;
+
+    $dirlist = $wp_filesystem->dirlist($from);
+
+    $from = trailingslashit($from);
+    $to = trailingslashit($to);
+
+    foreach ( (array) $dirlist as $filename => $fileinfo ) {
+        if ( 'file' == $fileinfo['type'] ) {
+            $wp_filesystem->copy($from . $filename, $to . $filename, true);
+        } elseif ( 'folder' == $fileinfo['type'] ) {
+            $wp_filesystem->mkdir($to . $filename);
+            copy_dir($from . $filename, $to . $filename);
+        }
+    }
+}
+
+function WP_Filesystem( $args = false, $preference = false ) {
+    global $wp_filesystem;
+
+    $method = get_filesystem_method($preference);
+    if ( ! $method )
+        return false;
+
+    require_once('class-wp-filesystem-'.$method.'.php');
+    $method = "WP_Filesystem_$method";
+
+    $wp_filesystem = new $method($args);
+
+    if ( $wp_filesystem->errors->get_error_code() )
+        return false;
+
+    if ( !$wp_filesystem->connect() )
+        return false; //There was an erorr connecting to the server.
+
+    return true;
+}
+
+function get_filesystem_method() {
+    $tempFile = tempnam('/tmp', 'WPU');
+
+    if ( getmyuid() == fileowner($tempFile) ) {
+        unlink($tempFile);
+        //return 'direct';
+    } else {
+        unlink($tempFile);
+    }
+
+    if ( extension_loaded('ftp') ) return 'ftpext';
+    if ( extension_loaded('sockets') ) return 'ftpsockets';
+    return false;
+}
+
-?>

trunk/wp-admin/includes/update.php

@@ -115 +115 @@
-
-    echo "<tr><td colspan='5' class='plugin-update'>";
-s available. <a href="%s">Download version %s here</a>.'), $plugin_data['Name'], $r->url, $r->new_version
+1$s available. <a href="%2$s">Download version %3$s here</a> or <a href="%4$s">upgrade automatically</a>.'), $plugin_data['Name'], $r->url, $r->new_version, "update.php?action=upgrade-plugin&amp;plugin=$file"
-    echo "</td></tr>";
-}
-add_action( 'after_plugin_row', 'wp_plugin_update_row' );
-
+function wp_update_plugin($plugin, $feedback = '') {
+    global $wp_filesystem;
+
+    if ( !empty($feedback) )
+        add_filter('update_feedback', $feedback);
+
+    // Is an update available?
+    $current = get_option( 'update_plugins' );
+    if ( !isset( $current->response[ $plugin ] ) )
+        return new WP_Error('up_to_date', __('The plugin is at the latest version.'));
+
+    // Is a filesystem accessor setup?
+    if ( ! $wp_filesystem || !is_object($wp_filesystem) )
+        WP_Filesystem();
+
+    if ( ! is_object($wp_filesystem) )
+        return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
+
+    if ( $wp_filesystem->errors->get_error_code() ) 
+        return new WP_Error('fs_error', __('Filesystem error'), $wp_filesystem->errors);
+
+    // Get the URL to the zip file
+    $r = $current->response[ $plugin ];
+
+    if ( empty($r->package) )
+        return new WP_Error('no_package', __('Upgrade package not available.'));
+
+    // Download the package
+    $package = $r->package;
+    apply_filters('update_feedback', __("Downloading update from $package"));
+    $file = download_url($package);
+
+    if ( !$file )
+        return new WP_Error('download_failed', __('Download failed.'));
+
+    $name = basename($plugin, '.php');
+    $working_dir = ABSPATH . 'wp-content/upgrade/' . $name;
+
+    // Clean up working directory
+    $wp_filesystem->delete($working_dir, true);
+
+    apply_filters('update_feedback', __("Unpacking the update"));
+    // Unzip package to working directory
+    $result = unzip_file($file, $working_dir);
+    if ( is_wp_error($result) ) {
+        unlink($file);
+        $wp_filesystem->delete($working_dir, true);
+        return $result;
+    }
+
+    // Once installed, delete the package
+    unlink($file);
+    
+    // Remove the existing plugin.
+    apply_filters('update_feedback', __("Removing the old version of the plugin"));
+    $wp_filesystem->delete(ABSPATH . PLUGINDIR . "/$plugin");
+    $plugin_dir = dirname(ABSPATH . PLUGINDIR . "/$plugin");
+
+    // If plugin is in its own directory, recursively delete the directory.
+    if ( '.' != $plugin_dir )
+        $wp_filesystem->delete($plugin_dir, true);
+
+    apply_filters('update_feedback', __("Installing the latest version"));
+    // Copy new version of plugin into place.
+    copy_dir($working_dir, ABSPATH . PLUGINDIR);
+
+    // Remove working directory
+    $wp_filesystem->delete($working_dir, true);
+
+    // Force refresh of plugin update information
+    delete_option('update_plugins');
+}
+
-?>