Changeset 11005

Timestamp:

04/19/2009 07:36:28 PM (18 years ago)

Author:

ryan

Message:

consolidate plugin/theme/core upgrade/install functions. Props DD32. see #7875

Location:

trunk/wp-admin

Files:

• includes/class-wp-filesystem-ftpext.php (modified) (6 diffs)
• includes/class-wp-filesystem-ftpsockets.php (modified) (2 diffs)
• includes/class-wp-upgrader.php (added)
• includes/file.php (modified) (1 diff)
• includes/plugin-install.php (modified) (3 diffs)
• includes/plugin.php (modified) (3 diffs)
• includes/theme-install.php (modified) (4 diffs)
• includes/theme.php (modified) (1 diff)
• includes/update-core.php (modified) (1 diff)
• includes/update.php (modified) (1 diff)
• plugin-install.php (modified) (4 diffs)
• theme-install.php (modified) (1 diff)
• update.php (modified) (3 diffs)

trunk/wp-admin/includes/class-wp-filesystem-ftpext.php

@@ -18 +18 @@
         var $link;
         var $timeout = 5;
-        var $errors = array();
+        var $errors = null;
         var $options = array();
 
@@ -66 +66 @@
 
         function connect() {
-                if ( $this->options['ssl'] && function_exists('ftp_ssl_connect') )
+                if ( isset($this->options['ssl']) && $this->options['ssl'] && function_exists('ftp_ssl_connect') )
                         $this->link = @ftp_ssl_connect($this->options['hostname'], $this->options['port'],$this->timeout);
                 else
@@ -188 +188 @@
         }
 
-        function delete($file,$recursive=false) {
+        function delete($file, $recursive = false ) {
+                if ( empty($file) )
+                        return false;
                 if ( $this->is_file($file) )
                         return @ftp_delete($this->link, $file);
                 if ( !$recursive )
                         return @ftp_rmdir($this->link, $file);
-                $filelist = $this->dirlist($file);
-                foreach ((array) $filelist as $filename => $fileinfo) {
-                        $this->delete($file . '/' . $filename, $recursive);
-                }
+
+                $filelist = $this->dirlist( trailingslashit($file) );
+                if ( !empty($filelist) )
+                        foreach ( $filelist as $delete_file )
+                                $this->delete( trailingslashit($file) . $delete_file['name'], $recursive);
                 return @ftp_rmdir($this->link, $file);
         }
 
         function exists($file) {
-                $list = ftp_rawlist($this->link, $file, false);
-                if( ! $list )
-                        return false;
-                return count($list) == 1 ? true : false;
+                $list = @ftp_rawlist($this->link, $file, false);
+                return !empty($list); //empty list = no file, so invert.
         }
         function is_file($file) {
-                return $this->is_dir($file) ? false : true;
+                return $this->exists($file) && !$this->is_dir($file);
         }
         function is_dir($path) {
                 $cwd = $this->cwd();
-                $result = @ftp_chdir($this->link, $path);
+                $result = @ftp_chdir($this->link, trailingslashit($path) );
                 if( $result && $path == $this->cwd() || $this->cwd() != $cwd ) {
                         @ftp_chdir($this->link, $cwd);
@@ -219 +220 @@
         }
         function is_readable($file) {
-                //Get dir list, Check if the file is writable by the current user??
+                //Get dir list, Check if the file is readable by the current user??
                 return true;
         }
@@ -239 +240 @@
         }
         function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {
-                if( !@ftp_mkdir($this->link, $path) )
+                if( !ftp_mkdir($this->link, $path) )
                         return false;
                 if( $chmod )
@@ -250 +251 @@
         }
         function rmdir($path, $recursive = false) {
-                if( ! $recursive )
-                        return @ftp_rmdir($this->link, $path);
-
-                //TODO: Recursive Directory delete, Have to delete files from the folder first.
-                //$dir = $this->dirlist($path);
-                //foreach($dir as $file)
-
+                return $this->delete($path, $recursive);
         }
 
         function parselisting($line) {
-                $is_windows = ($this->OS_remote == FTP_OS_Windows);
+                static $is_windows;
+                if ( is_null($is_windows) )
+                        $is_windows = strpos( strtolower(ftp_systype($this->link)), 'win') !== false;
+
                 if ($is_windows && preg_match("/([0-9]{2})-([0-9]{2})-([0-9]{2}) +([0-9]{2}):([0-9]{2})(AM|PM) +([0-9]+|<DIR>) +(.+)/", $line, $lucifer)) {
                         $b = array();

trunk/wp-admin/includes/class-wp-filesystem-ftpsockets.php

@@ -18 +18 @@
         var $ftp = false;
         var $timeout = 5;
-        var $errors;
+        var $errors = null;
         var $options = array();
 
@@ -211 +211 @@
 
         function delete($file, $recursive = false ) {
+                if ( empty($file) )
+                        return false;
                 if ( $this->is_file($file) )
                         return $this->ftp->delete($file);

trunk/wp-admin/includes/file.php

@@ -599 +599 @@
         $wp_filesystem = new $method($args);
 
-        if ( $wp_filesystem->errors->get_error_code() )
+        if ( is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code() )
                 return false;
 

trunk/wp-admin/includes/plugin-install.php

@@ -209 +209 @@
         <h4><?php _e('Install a plugin in .zip format') ?></h4>
         <p class="install-help"><?php _e('If you have a plugin in a .zip format, You may install it by uploading it here.') ?></p>
-        <form method="post" enctype="multipart/form-data" action="<?php echo admin_url('plugin-install.php?tab=do_upload') ?>">
+        <form method="post" enctype="multipart/form-data" action="<?php echo admin_url('update.php?action=upload-plugin') ?>">
                 <?php wp_nonce_field( 'plugin-upload') ?>
                 <input type="file" name="pluginzip" />
@@ -462 +462 @@
                                 case 'install':
                                         if ( current_user_can('install_plugins') ) :
-                                ?><a href="<?php echo wp_nonce_url(admin_url('plugin-install.php?tab=install&plugin=' . $api->slug), 'install-plugin_' . $api->slug) ?>" target="_parent"><?php _e('Install Now') ?></a><?php
+                                ?><a href="<?php echo wp_nonce_url(admin_url('update.php?action=install-plugin&plugin=' . $api->slug), 'install-plugin_' . $api->slug) ?>" target="_parent"><?php _e('Install Now') ?></a><?php
                                         endif;
                                 break;
@@ -545 +545 @@
         exit;
 }
-
-
-add_action('install_plugins_do_upload', 'upload_plugin');
-function upload_plugin() {
-
-        if ( ! ( ( $uploads = wp_upload_dir() ) && false === $uploads['error'] ) )
-                wp_die($uploads['error']);
-
-        if ( !empty($_FILES) )
-                $filename = $_FILES['pluginzip']['name'];
-        else if ( isset($_GET['package']) )
-                $filename = $_GET['package'];
-
-        check_admin_referer('plugin-upload');
-
-        echo '<div class="wrap">';
-        echo '<h2>', sprintf( __('Installing Plugin from file: %s'), basename($filename) ), '</h2>';
-
-        //Handle a newly uploaded file, Else assume it was
-        if ( !empty($_FILES) ) {
-                $filename = wp_unique_filename( $uploads['basedir'], $filename );
-                $local_file = $uploads['basedir'] . '/' . $filename;
-
-                // Move the file to the uploads dir
-                if ( false === @ move_uploaded_file( $_FILES['pluginzip']['tmp_name'], $local_file) )
-                        wp_die( sprintf( __('The uploaded file could not be moved to %s.' ), $uploads['path']));
-        } else {
-                $local_file = $uploads['basedir'] . '/' . $filename;
-        }
-
-        do_plugin_install_local_package($local_file, $filename);
-        echo '</div>';
-}
-
-add_action('install_plugins_install', 'install_plugin');
-
-/**
- * Display plugin link and execute install.
- *
- * @since 2.7.0
- */
-function install_plugin() {
-
-        $plugin = isset($_REQUEST['plugin']) ? stripslashes( $_REQUEST['plugin'] ) : '';
-
-        check_admin_referer('install-plugin_' . $plugin);
-        $api = plugins_api('plugin_information', array('slug' => $plugin, 'fields' => array('sections' => false) ) ); //Save on a bit of bandwidth.
-
-        if ( is_wp_error($api) )
-                wp_die($api);
-
-        echo '<div class="wrap">';
-        echo '<h2>', sprintf( __('Installing Plugin: %s'), $api->name . ' ' . $api->version ), '</h2>';
-
-        do_plugin_install($api->download_link, $api);
-        echo '</div>';
-
-}
-
-/**
- * Retrieve plugin and install.
- *
- * @since 2.7.0
- *
- * @param string $download_url Download URL.
- * @param object $plugin_information Optional. Plugin information
- */
-function do_plugin_install($download_url, $plugin_information = null) {
-        global $wp_filesystem;
-
-        if ( empty($download_url) ) {
-                show_message( __('No plugin Specified') );
-                return;
-        }
-
-        $plugin = isset($_REQUEST['plugin']) ? stripslashes( $_REQUEST['plugin'] ) : '';
-
-        $url = 'plugin-install.php?tab=install';
-        $url = add_query_arg(array('plugin' => $plugin, 'plugin_name' => stripslashes( $_REQUEST['plugin_name'] ), 'download_url' => stripslashes( $_REQUEST['download_url'] ) ), $url);
-
-        $url = wp_nonce_url($url, 'install-plugin_' . $plugin);
-        if ( false === ($credentials = request_filesystem_credentials($url)) )
-                return;
-
-        if ( ! WP_Filesystem($credentials) ) {
-                request_filesystem_credentials($url, '', true); //Failed to connect, Error and request again
-                return;
-        }
-
-        if ( $wp_filesystem->errors->get_error_code() ) {
-                foreach ( $wp_filesystem->errors->get_error_messages() as $message )
-                        show_message($message);
-                return;
-        }
-
-        $result = wp_install_plugin( $download_url, 'show_message' );
-
-        if ( is_wp_error($result) ) {
-                show_message($result);
-                show_message( __('Installation Failed') );
-        } else {
-                show_message( sprintf(__('Successfully installed the plugin <strong>%s %s</strong>.'), $plugin_information->name, $plugin_information->version) );
-                $plugin_file = $result;
-
-                $install_actions = apply_filters('install_plugin_complete_actions', array(
-                        'activate_plugin' => '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;plugin=' . $plugin_file, 'activate-plugin_' . $plugin_file) . '" title="' . attribute_escape(__('Activate this plugin')) . '" target="_parent">' . __('Activate Plugin') . '</a>',
-                        'plugins_page' => '<a href="' . admin_url('plugins.php') . '" title="' . attribute_escape(__('Goto plugins page')) . '" target="_parent">' . __('Return to Plugins page') . '</a>'
-                                                        ), $plugin_information, $plugin_file);
-                if ( ! empty($install_actions) )
-                        show_message('<strong>' . __('Actions:') . '</strong> ' . implode(' | ', (array)$install_actions));
-        }
-}
-
-/**
- * Install a plugin from a local file.
- *
- * @since 2.7.0
- *
- * @param string $package Local Plugin zip
- * @param string $filename Optional. Original filename
- * @param object $plugin_information Optional. Plugin information
- */
-function do_plugin_install_local_package($package, $filename = '') {
-        global $wp_filesystem;
-
-        if ( empty($package) ) {
-                show_message( __('No plugin Specified') );
-                return;
-        }
-
-        if ( empty($filename) )
-                $filename = basename($package);
-
-        $url = 'plugin-install.php?tab=upload';
-        $url = add_query_arg(array('package' => $filename), $url);
-
-        $url = wp_nonce_url($url, 'plugin-upload');
-        if ( false === ($credentials = request_filesystem_credentials($url)) )
-                return;
-
-        if ( ! WP_Filesystem($credentials) ) {
-                request_filesystem_credentials($url, '', true); //Failed to connect, Error and request again
-                return;
-        }
-
-        if ( $wp_filesystem->errors->get_error_code() ) {
-                foreach ( $wp_filesystem->errors->get_error_messages() as $message )
-                        show_message($message);
-                return;
-        }
-
-        $result = wp_install_plugin_local_package( $package, 'show_message' );
-
-        if ( is_wp_error($result) ) {
-                show_message($result);
-                show_message( __('Installation Failed') );
-        } else {
-                show_message( __('Successfully installed the plugin.') );
-                $plugin_file = $result;
-
-                $install_actions = apply_filters('install_plugin_complete_actions', array(
-                                                        'activate_plugin' => '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;plugin=' . $plugin_file, 'activate-plugin_' . $plugin_file) . '" title="' . __('Activate this plugin') . '" target="_parent">' . __('Activate Plugin') . '</a>',
-                                                        'plugins_page' => '<a href="' . admin_url('plugins.php') . '" title="' . __('Goto plugins page') . '" target="_parent">' . __('Return to Plugins page') . '</a>'
-                                                        ), array(), $plugin_file);
-                if ( ! empty($install_actions) )
-                        show_message('<strong>' . __('Actions:') . '</strong> ' . implode(' | ', (array)$install_actions));
-        }
-}
-
-/**
- * Install plugin.
- *
- * @since 2.7.0
- *
- * @param string $package
- * @param string $feedback Optional.
- * @return mixed.
- */
-function wp_install_plugin($package, $feedback = '') {
-        global $wp_filesystem;
-
-        if ( !empty($feedback) )
-                add_filter('install_feedback', $feedback);
-
-        // 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 base plugin folder
-        $plugins_dir = $wp_filesystem->wp_plugins_dir();
-        if ( empty($plugins_dir) )
-                return new WP_Error('fs_no_plugins_dir', __('Unable to locate WordPress Plugin directory.'));
-
-        //And the same for the Content directory.
-        $content_dir = $wp_filesystem->wp_content_dir();
-        if( empty($content_dir) )
-                return new WP_Error('fs_no_content_dir', __('Unable to locate WordPress Content directory (wp-content).'));
-
-        $plugins_dir = trailingslashit( $plugins_dir );
-        $content_dir = trailingslashit( $content_dir );
-
-        if ( empty($package) )
-                return new WP_Error('no_package', __('Install package not available.'));
-
-        // Download the package
-        apply_filters('install_feedback', sprintf(__('Downloading plugin package from %s'), $package));
-        $download_file = download_url($package);
-
-        if ( is_wp_error($download_file) )
-                return new WP_Error('download_failed', __('Download failed.'), $download_file->get_error_message());
-
-        $working_dir = $content_dir . 'upgrade/' . basename($package, '.zip');
-
-        // Clean up working directory
-        if ( $wp_filesystem->is_dir($working_dir) )
-                $wp_filesystem->delete($working_dir, true);
-
-        apply_filters('install_feedback', __('Unpacking the plugin package'));
-        // Unzip package to working directory
-        $result = unzip_file($download_file, $working_dir);
-
-        // Once extracted, delete the package
-        @unlink($download_file);
-
-        if ( is_wp_error($result) ) {
-                $wp_filesystem->delete($working_dir, true);
-                return $result;
-        }
-
-        //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) );
-
-        if( $wp_filesystem->exists( $plugins_dir . $filelist[0] ) ) {
-                $wp_filesystem->delete($working_dir, true);
-                return new WP_Error('install_folder_exists', __('Folder already exists.'), $filelist[0] );
-        }
-
-        apply_filters('install_feedback', __('Installing the plugin'));
-        // Copy new version of plugin into place.
-        $result = copy_dir($working_dir, $plugins_dir);
-        if ( is_wp_error($result) ) {
-                $wp_filesystem->delete($working_dir, true);
-                return $result;
-        }
-
-        //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);
-
-        if( empty($filelist) )
-                return false; //We couldnt find any files in the working dir, therefor no plugin installed? Failsafe backup.
-
-        $folder = $filelist[0];
-        $plugin = get_plugins('/' . $folder); //Ensure to pass with leading slash
-        $pluginfiles = array_keys($plugin); //Assume the requested plugin is the first in the list
-
-        //Return the plugin files name.
-        return  $folder . '/' . $pluginfiles[0];
-}
-
-/**
- * Install plugin from local package
- *
- * @since 2.7.0
- *
- * @param string $package
- * @param string $feedback Optional.
- * @return mixed.
- */
-function wp_install_plugin_local_package($package, $feedback = '') {
-        global $wp_filesystem;
-
-        if ( !empty($feedback) )
-                add_filter('install_feedback', $feedback);
-
-        // 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 base plugin folder
-        $plugins_dir = $wp_filesystem->wp_plugins_dir();
-        if ( empty($plugins_dir) )
-                return new WP_Error('fs_no_plugins_dir', __('Unable to locate WordPress Plugin directory.'));
-
-        //And the same for the Content directory.
-        $content_dir = $wp_filesystem->wp_content_dir();
-        if( empty($content_dir) )
-                return new WP_Error('fs_no_content_dir', __('Unable to locate WordPress Content directory (wp-content).'));
-
-        $plugins_dir = trailingslashit( $plugins_dir );
-        $content_dir = trailingslashit( $content_dir );
-
-        if ( empty($package) )
-                return new WP_Error('no_package', __('Install package not available.'));
-
-        $working_dir = $content_dir . 'upgrade/' . basename($package, '.zip');
-
-        // Clean up working directory
-        if ( $wp_filesystem->is_dir($working_dir) )
-                $wp_filesystem->delete($working_dir, true);
-
-        apply_filters('install_feedback', __('Unpacking the plugin package'));
-        // Unzip package to working directory
-        $result = unzip_file($package, $working_dir);
-
-        // Once extracted, delete the package
-        unlink($package);
-
-        if ( is_wp_error($result) ) {
-                $wp_filesystem->delete($working_dir, true);
-                return $result;
-        }
-
-        //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) );
-
-        if( $wp_filesystem->exists( $plugins_dir . $filelist[0] ) ) {
-                $wp_filesystem->delete($working_dir, true);
-                return new WP_Error('install_folder_exists', __('Folder already exists.'), $filelist[0] );
-        }
-
-        apply_filters('install_feedback', __('Installing the plugin'));
-        // Copy new version of plugin into place.
-        $result = copy_dir($working_dir, $plugins_dir);
-        if ( is_wp_error($result) ) {
-                $wp_filesystem->delete($working_dir, true);
-                return $result;
-        }
-
-        //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);
-
-        if( empty($filelist) )
-                return false; //We couldnt find any files in the working dir, therefor no plugin installed? Failsafe backup.
-
-        $folder = $filelist[0];
-        $plugin = get_plugins('/' . $folder); //Ensure to pass with leading slash
-        $pluginfiles = array_keys($plugin); //Assume the requested plugin is the first in the list
-
-        //Return the plugin files name.
-        return  $folder . '/' . $pluginfiles[0];
-}
-
-?>

trunk/wp-admin/includes/plugin.php

@@ -217 +217 @@
         // Files in wp-content/plugins directory
         $plugins_dir = @ opendir( $plugin_root);
+        $plugin_files = array();
         if ( $plugins_dir ) {
                 while (($file = readdir( $plugins_dir ) ) !== false ) {
@@ -240 +241 @@
         @closedir( $plugins_subdir );
 
-        if ( !$plugins_dir || !$plugin_files )
+        if ( !$plugins_dir || empty($plugin_files) )
                 return $wp_plugins;
 
@@ -433 +434 @@
         }
 
-        if ( $wp_filesystem->errors->get_error_code() ) {
-                return $wp_filesystem->errors;
-        }
-
         if ( ! is_object($wp_filesystem) )
                 return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
 
-        if ( $wp_filesystem->errors->get_error_code() )
+        if ( is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code() )
                 return new WP_Error('fs_error', __('Filesystem error'), $wp_filesystem->errors);
 

trunk/wp-admin/includes/theme-install.php

@@ -278 +278 @@
 <h4><?php _e('Install a theme in .zip format') ?></h4>
 <p class="install-help"><?php _e('If you have a theme in a .zip format, you may install it by uploading it here.') ?></p>
-<form method="post" enctype="multipart/form-data" action="<?php echo admin_url('theme-install.php?tab=do_upload') ?>">
+<form method="post" enctype="multipart/form-data" action="<?php echo admin_url('update.php?action=upload-theme') ?>">
         <?php wp_nonce_field( 'theme-upload') ?>
         <input type="file" name="themezip" />
-        <input type="submit" class="button" value="<?php _e('Install Now') ?>" />
+        <input type="submit"
+        class="button" value="<?php _e('Install Now') ?>" />
 </form>
-<?php
+        <?php
 }
 
@@ -412 +413 @@
         <tr>
         <?php
+
         foreach ( $cols as $col => $theme_index ) {
                 $class = array('available-theme');
@@ -512 +514 @@
 case 'install':
         if ( current_user_can('install_themes') ) :
-        $buttons .= '<a class="button-primary" id="install" href="' . wp_nonce_url(admin_url('theme-install.php?tab=install&theme=' . $api->slug), 'install-theme_' . $api->slug) . '" target="_parent">' . __('Install Now') . '</a>';
+        $buttons .= '<a class="button-primary" id="install" href="' . wp_nonce_url(admin_url('update.php?action=install-theme&theme=' . $api->slug), 'install-theme_' . $api->slug) . '" target="_parent">' . __('Install Now') . '</a>';
         endif;
         break;
@@ -543 +545 @@
         exit;
 }
-
-add_action('install_themes_do_upload', 'upload_theme');
-function upload_theme() {
-
-        if ( ! ( ( $uploads = wp_upload_dir() ) && false === $uploads['error'] ) )
-                wp_die($uploads['error']);
-
-        if ( !empty($_FILES) )
-                $filename = $_FILES['themezip']['name'];
-        else if ( isset($_GET['package']) )
-                $filename = $_GET['package'];
-
-        check_admin_referer('theme-upload');
-
-        echo '<div class="wrap">';
-        echo '<h2>', sprintf( __('Installing theme from file: %s'), basename($filename) ), '</h2>';
-
-        //Handle a newly uploaded file, Else assume it was
-        if ( !empty($_FILES) ) {
-                $filename = wp_unique_filename( $uploads['basedir'], $filename );
-                $local_file = $uploads['basedir'] . '/' . $filename;
-
-                // Move the file to the uploads dir
-                if ( false === @ move_uploaded_file( $_FILES['themezip']['tmp_name'], $local_file) )
-                        wp_die( sprintf( __('The uploaded file could not be moved to %s.' ), $uploads['path']));
-        } else {
-                $local_file = $uploads['basedir'] . '/' . $filename;
-        }
-
-        do_theme_install_local_package($local_file, $filename);
-        echo '</div>';
-}
-
-add_action('install_themes_install', 'install_theme');
-
-/**
- * Display theme link and execute install.
- *
- * @since 2.8.0
- */
-function install_theme() {
-
-        $theme = isset($_REQUEST['theme']) ? stripslashes( $_REQUEST['theme'] ) : '';
-
-        check_admin_referer('install-theme_' . $theme);
-        $api = themes_api('theme_information', array('slug' => $theme, 'fields' => array('sections' => false) ) ); //Save on a bit of bandwidth.
-
-        if ( is_wp_error($api) )
-                wp_die($api);
-
-        echo '<div class="wrap">';
-        echo '<h2>', sprintf( __('Installing theme: %s'), $api->name . ' ' . $api->version ), '</h2>';
-
-        do_theme_install($api->download_link, $api);
-        echo '</div>';
-
-}
-
-/**
- * Retrieve theme and install.
- *
- * @since 2.8.0
- *
- * @param string $download_url Download URL.
- * @param object $theme_information Optional. Theme information
- */
-function do_theme_install($download_url, $theme_information = null) {
-        global $wp_filesystem;
-
-        if ( empty($download_url) ) {
-                show_message( __('No theme specified') );
-                return;
-        }
-
-        $theme        = isset($_REQUEST['theme'])        ? stripslashes( $_REQUEST['theme'] )        : '';
-        $theme_name   = isset($_REQUEST['theme_name'])   ? stripslashes( $_REQUEST['theme_name'] )   : '';
-
-        $url = 'theme-install.php?tab=install';
-        $url = add_query_arg(array('theme' => $theme, 'theme_name' => $theme_name, 'download_url' => $download_url ), $url);
-
-        $url = wp_nonce_url($url, 'install-theme_' . $theme);
-        if ( false === ($credentials = request_filesystem_credentials($url)) )
-                return;
-
-        if ( ! WP_Filesystem($credentials) ) {
-                request_filesystem_credentials($url, '', true); //Failed to connect, Error and request again
-                return;
-        }
-
-        if ( $wp_filesystem->errors->get_error_code() ) {
-                foreach ( $wp_filesystem->errors->get_error_messages() as $message )
-                show_message($message);
-                return;
-        }
-
-        $result = wp_install_theme( $download_url, 'show_message' );
-
-        if ( is_wp_error($result) ) {
-                show_message($result);
-                show_message( __('Installation Failed') );
-        } else {
-                show_message( sprintf(__('Successfully installed the theme <strong>%s %s</strong>.'), $theme_information->name, $theme_information->version) );
-                $theme_file = $result;
-
-                $install_actions = apply_filters('install_theme_complete_actions', array(
-                //'activate_theme' => '<a href="' . wp_nonce_url('themes.php?action=activate&amp;theme=' . $theme_file, 'activate-theme_' . $theme_file) . '" title="' . attribute_escape(__('Activate this theme')) . '" target="_parent">' . __('Activate Theme') . '</a>',
-                        'themes_page' => '<a href="' . admin_url('themes.php') . '" title="' . attribute_escape(__('Return to Themes page')) . '" target="_parent">' . __('Return to Themes page') . '</a>'
-                        ), $theme_information, $theme_file);
-                        if ( ! empty($install_actions) )
-                        show_message('<strong>' . __('Actions:') . '</strong> ' . implode(' | ', (array)$install_actions));
-        }
-}
-
-/**
- * Install a theme from a local file.
- *
- * @since 2.8.0
- *
- * @param string $package Local Theme zip
- * @param string $filename Optional. Original filename
- * @param object $theme_information Optional. Theme information
- */
-function do_theme_install_local_package($package, $filename = '') {
-        global $wp_filesystem;
-
-        if ( empty($package) ) {
-                show_message( __('No theme specified') );
-                return;
-        }
-
-        if ( empty($filename) )
-                $filename = basename($package);
-
-        $url = 'theme-install.php?tab=upload';
-        $url = add_query_arg(array('package' => $filename), $url);
-
-        $url = wp_nonce_url($url, 'theme-upload');
-        if ( false === ($credentials = request_filesystem_credentials($url)) )
-                return;
-
-        if ( ! WP_Filesystem($credentials) ) {
-                request_filesystem_credentials($url, '', true); //Failed to connect, Error and request again
-                return;
-        }
-
-        if ( $wp_filesystem->errors->get_error_code() ) {
-                foreach ( $wp_filesystem->errors->get_error_messages() as $message )
-                show_message($message);
-                return;
-        }
-
-        $result = wp_install_theme_local_package( $package, 'show_message' );
-
-        if ( is_wp_error($result) ) {
-                show_message($result);
-                show_message( __('Installation Failed') );
-        } else {
-                show_message( __('Successfully installed the theme.') );
-                $theme_file = $result;
-
-                $install_actions = apply_filters('install_theme_complete_actions', array(
-                //'activate_theme' => '<a href="' . wp_nonce_url('themes.php?action=activate&amp;theme=' . $theme_file, 'activate-theme_' . $theme_file) . '" title="' . __('Activate this theme') . '" target="_parent">' . __('Activate Theme') . '</a>',
-                                                        'themes_page' => '<a href="' . admin_url('themes.php') . '" title="' . __('Goto themes page') . '" target="_parent">' . __('Return to Themes page') . '</a>'
-                                                        ), array(), $theme_file);
-                                                        if ( ! empty($install_actions) )
-                                                        show_message('<strong>' . __('Actions:') . '</strong> ' . implode(' | ', (array)$install_actions));
-        }
-}
-
-/**
- * Install theme.
- *
- * @since 2.8.0
- *
- * @param string $package
- * @param string $feedback Optional.
- * @return mixed.
- */
-function wp_install_theme($package, $feedback = '') {
-        global $wp_filesystem;
-
-        if ( !empty($feedback) )
-                add_filter('install_feedback', $feedback);
-
-        // 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 base theme folder
-        $themes_dir = $wp_filesystem->wp_themes_dir();
-        if ( empty($themes_dir) )
-                return new WP_Error('fs_no_themes_dir', __('Unable to locate WordPress themes directory.'));
-
-        // And the same for the Content directory.
-        $content_dir = $wp_filesystem->wp_content_dir();
-        if ( empty($content_dir) )
-                return new WP_Error('fs_no_content_dir', __('Unable to locate WordPress content directory (wp-content).'));
-
-        $themes_dir = trailingslashit( $themes_dir );
-        $content_dir = trailingslashit( $content_dir );
-
-        if ( empty($package) )
-                return new WP_Error('no_package', __('Install package not available.'));
-
-        // Download the package
-        apply_filters('install_feedback', sprintf(__('Downloading theme package from %s'), $package));
-        $download_file = download_url($package);
-
-        if ( is_wp_error($download_file) )
-                return new WP_Error('download_failed', __('Download failed.'), $download_file->get_error_message());
-
-        $working_dir = $content_dir . 'upgrade/' . basename($package, '.zip');
-
-        // Clean up working directory
-        if ( $wp_filesystem->is_dir($working_dir) )
-                $wp_filesystem->delete($working_dir, true);
-
-        apply_filters('install_feedback', __('Unpacking the theme package'));
-        // Unzip package to working directory
-        $result = unzip_file($download_file, $working_dir);
-
-        // Once extracted, delete the package
-        @unlink($download_file);
-
-        if ( is_wp_error($result) ) {
-                $wp_filesystem->delete($working_dir, true);
-                return $result;
-        }
-
-        //Get a list of the directories in the working directory before we delete it, We need to know the new folder for the theme
-        $filelist = array_keys( $wp_filesystem->dirlist($working_dir) );
-
-        if ( $wp_filesystem->exists( $themes_dir . $filelist[0] ) ) {
-                $wp_filesystem->delete($working_dir, true);
-                return new WP_Error('install_folder_exists', __('Folder already exists.'), $filelist[0] );
-        }
-
-        apply_filters('install_feedback', __('Installing the theme'));
-        // Copy new version of theme into place.
-        $result = copy_dir($working_dir, $themes_dir);
-        if ( is_wp_error($result) ) {
-                $wp_filesystem->delete($working_dir, true);
-                return $result;
-        }
-
-        //Get a list of the directories in the working directory before we delete it, We need to know the new folder for the theme
-        $filelist = array_keys( $wp_filesystem->dirlist($working_dir) );
-
-        // Remove working directory
-        $wp_filesystem->delete($working_dir, true);
-
-        if ( empty($filelist) )
-                return false; //We couldnt find any files in the working dir, therefor no theme installed? Failsafe backup.
-
-        //TODO: TODO: TODO
-        $stylesheet = $filelist[0];
-        //      $theme = get_themes('/' . $folder); //Ensure to pass with leading slash //TODO: TODO: TODO
-        //      $themefiles = array_keys($theme); //Assume the requested theme is the first in the list
-
-        //Return the theme files name.
-        return  $stylesheet; //$folder . '/' . $themefiles[0];
-}
-
-/**
- * Install theme from local package
- *
- * @since 2.8.0
- *
- * @param string $package
- * @param string $feedback Optional.
- * @return mixed.
- */
-function wp_install_theme_local_package($package, $feedback = '') {
-        global $wp_filesystem;
-
-        if ( !empty($feedback) )
-                add_filter('install_feedback', $feedback);
-
-        // 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 base theme folder
-        $themes_dir = $wp_filesystem->wp_themes_dir();
-        if ( empty($themes_dir) )
-                return new WP_Error('fs_no_themes_dir', __('Unable to locate WordPress themes directory.'));
-
-        //And the same for the Content directory.
-        $content_dir = $wp_filesystem->wp_content_dir();
-        if ( empty($content_dir) )
-                return new WP_Error('fs_no_content_dir', __('Unable to locate WordPress content directory (wp-content).'));
-
-        $themes_dir = trailingslashit( $themes_dir );
-        $content_dir = trailingslashit( $content_dir );
-
-        if ( empty($package) )
-                return new WP_Error('no_package', __('Install package not available.'));
-
-        $working_dir = $content_dir . 'upgrade/' . basename($package, '.zip');
-
-
-        // Clean up working directory
-        if ( $wp_filesystem->is_dir($working_dir) )
-                $wp_filesystem->delete($working_dir, true);
-
-        apply_filters('install_feedback', __('Unpacking the theme package'));
-        // Unzip package to working directory
-        $result = unzip_file($package, $working_dir);
-
-        // Once extracted, delete the package
-        unlink($package);
-
-        if ( is_wp_error($result) ) {
-                $wp_filesystem->delete($working_dir, true);
-                return $result;
-        }
-
-        //Get a list of the directories in the working directory before we delete it, We need to know the new folder for the theme
-        $filelist = array_keys( $wp_filesystem->dirlist($working_dir) );
-
-        if ( $wp_filesystem->exists( $themes_dir . $filelist[0] ) ) {
-                $wp_filesystem->delete($working_dir, true);
-                return new WP_Error('install_folder_exists', __('Folder already exists.'), $filelist[0] );
-        }
-
-        apply_filters('install_feedback', __('Installing the theme'));
-        // Copy new version of theme into place.
-        $result = copy_dir($working_dir, $themes_dir);
-        if ( is_wp_error($result) ) {
-                $wp_filesystem->delete($working_dir, true);
-                return $result;
-        }
-
-        //Get a list of the directories in the working directory before we delete it, We need to know the new folder for the theme
-        $filelist = array_keys( $wp_filesystem->dirlist($working_dir) );
-
-        // Remove working directory
-        $wp_filesystem->delete($working_dir, true);
-
-        if ( empty($filelist) )
-                return false; //We couldnt find any files in the working dir, therefor no theme installed? Failsafe backup.
-
-        //TODO TODO TODO
-        $stylesheet = $filelist[0];
-        //      $theme = get_themes('/' . $folder); //Ensure to pass with leading slash
-        //      $themefiles = array_keys($theme); //Assume the requested theme is the first in the list
-
-        //Return the theme files name.
-        return  $stylsheet; //$folder . '/' . $themefiles[0];
-}

trunk/wp-admin/includes/theme.php

@@ -73 +73 @@
         }
 
-        if ( $wp_filesystem->errors->get_error_code() ) {
-                return $wp_filesystem->errors;
-        }
 
         if ( ! is_object($wp_filesystem) )
                 return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
 
-        if ( $wp_filesystem->errors->get_error_code() )
+        if ( is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code() )
                 return new WP_Error('fs_error', __('Filesystem error'), $wp_filesystem->errors);
 

trunk/wp-admin/includes/update-core.php

@@ -230 +230 @@
         if ( is_wp_error($result) ) {
                 $wp_filesystem->delete($maintenance_file);
-                //$wp_filesystem->delete($working_dir, true); //TODO: Uncomment? This DOES mean that the new files are available in the upgrade folder if it fails.
+                $wp_filesystem->delete($working_dir, true);
                 return $result;
         }

trunk/wp-admin/includes/update.php

@@ -168 +168 @@
 
 function wp_update_plugin($plugin, $feedback = '') {
-        global $wp_filesystem;
 
         if ( !empty($feedback) )
                 add_filter('update_feedback', $feedback);
 
-        // Is an update available?
-        $current = get_transient( '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 base plugin folder
-        $plugins_dir = $wp_filesystem->wp_plugins_dir();
-        if ( empty($plugins_dir) )
-                return new WP_Error('fs_no_plugins_dir', __('Unable to locate WordPress Plugin directory.'));
-
-        //And the same for the Content directory.
-        $content_dir = $wp_filesystem->wp_content_dir();
-        if( empty($content_dir) )
-                return new WP_Error('fs_no_content_dir', __('Unable to locate WordPress Content directory (wp-content).'));
-
-        $plugins_dir = trailingslashit( $plugins_dir );
-        $content_dir = trailingslashit( $content_dir );
-
-        // 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', sprintf(__('Downloading update from %s'), $package));
-        $download_file = download_url($package);
-
-        if ( is_wp_error($download_file) )
-                return new WP_Error('download_failed', __('Download failed.'), $download_file->get_error_message());
-
-        $working_dir = $content_dir . 'upgrade/' . basename($plugin, '.php');
-
-        // Clean up working directory
-        if ( $wp_filesystem->is_dir($working_dir) )
-                $wp_filesystem->delete($working_dir, true);
-
-        apply_filters('update_feedback', __('Unpacking the update'));
-        // Unzip package to working directory
-        $result = unzip_file($download_file, $working_dir);
-
-        // Once extracted, delete the package
-        unlink($download_file);
-
-        if ( is_wp_error($result) ) {
-                $wp_filesystem->delete($working_dir, true);
-                return $result;
-        }
-
-        if ( is_plugin_active($plugin) ) {
-                //Deactivate the plugin silently, Prevent deactivation hooks from running.
-                apply_filters('update_feedback', __('Deactivating the plugin'));
-                deactivate_plugins($plugin, true);
-        }
-
-        // Remove the existing plugin.
-        apply_filters('update_feedback', __('Removing the old version of the plugin'));
-        $this_plugin_dir = trailingslashit( dirname($plugins_dir . $plugin) );
-
-        // If plugin is in its own directory, recursively delete the directory.
-        if ( strpos($plugin, '/') && $this_plugin_dir != $plugins_dir ) //base check on if plugin includes directory seperator AND that its not the root plugin folder
-                $deleted = $wp_filesystem->delete($this_plugin_dir, true);
-        else
-                $deleted = $wp_filesystem->delete($plugins_dir . $plugin);
-
-        if ( ! $deleted ) {
-                $wp_filesystem->delete($working_dir, true);
-                return new WP_Error('delete_failed', __('Could not remove the old plugin'));
-        }
-
-        apply_filters('update_feedback', __('Installing the latest version'));
-        // Copy new version of plugin into place.
-        $result = copy_dir($working_dir, $plugins_dir);
-        if ( is_wp_error($result) ) {
-                $wp_filesystem->delete($working_dir, true);
-                return $result;
-        }
-
-        //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);
-
-        // Force refresh of plugin update information
-        delete_transient('update_plugins');
-
-        if( empty($filelist) )
-                return false; //We couldnt find any files in the working dir, therefor no plugin installed? Failsafe backup.
-
-        $folder = $filelist[0];
-        $plugin = get_plugins('/' . $folder); //Ensure to pass with leading slash
-        $pluginfiles = array_keys($plugin); //Assume the requested plugin is the first in the list
-
-        return  $folder . '/' . $pluginfiles[0];
+        include ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
+        $upgrader = new Plugin_Upgrader();
+        return $upgrader->upgrade($plugin);
 }
 
 function wp_update_theme($theme, $feedback = '') {
-        global $wp_filesystem;
-
+        
         if ( !empty($feedback) )
                 add_filter('update_feedback', $feedback);
 
-        // Is an update available?
-        $current = get_transient( 'update_themes' );
-        if ( !isset( $current->response[ $theme ] ) )
-                return new WP_Error('up_to_date', __('The theme is at the latest version.'));
-
-        $r = $current->response[ $theme ];
-
-        $themes = get_themes();
-        foreach ( (array) $themes as $this_theme ) {
-                if ( $this_theme['Stylesheet'] == $theme ) {
-                        $theme_directory = preg_replace('!^/themes/!i', '', $this_theme['Stylesheet Dir']);
-                        break;
-                }
-        }
-        unset($themes);
-
-        if ( empty($theme_directory) )
-                return new WP_Error('theme_non_existant', __('Theme does not exist.'));
-
-        // 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 base plugin folder
-        $themes_dir = $wp_filesystem->wp_themes_dir();
-        if ( empty($themes_dir) )
-                return new WP_Error('fs_no_themes_dir', __('Unable to locate WordPress Theme directory.'));
-
-        //And the same for the Content directory.
-        $content_dir = $wp_filesystem->wp_content_dir();
-        if( empty($content_dir) )
-                return new WP_Error('fs_no_content_dir', __('Unable to locate WordPress Content directory (wp-content).'));
-
-        $themes_dir = trailingslashit( $themes_dir );
-        $content_dir = trailingslashit( $content_dir );
-
-        if ( empty($r->package) )
-                return new WP_Error('no_package', __('Upgrade package not available.'));
-
-        // Download the package
-        apply_filters('update_feedback', sprintf(__('Downloading update from %s'), $r['package']));
-        $download_file = download_url($r['package']);
-
-        if ( is_wp_error($download_file) )
-                return new WP_Error('download_failed', __('Download failed.'), $download_file->get_error_message());
-
-        $working_dir = $content_dir . 'upgrade/' . basename($theme_directory);
-
-        // Clean up working directory
-        if ( $wp_filesystem->is_dir($working_dir) )
-                $wp_filesystem->delete($working_dir, true);
-
-        apply_filters('update_feedback', __('Unpacking the update'));
-        // Unzip package to working directory
-        $result = unzip_file($download_file, $working_dir);
-
-        // Once extracted, delete the package
-        unlink($download_file);
-
-        if ( is_wp_error($result) ) {
-                $wp_filesystem->delete($working_dir, true);
-                return $result;
-        }
-
-        //TODO: Is theme currently active? If so, set default theme
-        /*
-        if ( is_plugin_active($plugin) ) {
-                //Deactivate the plugin silently, Prevent deactivation hooks from running.
-                apply_filters('update_feedback', __('Deactivating the plugin'));
-                deactivate_plugins($plugin, true);
-        }*/
-
-        // Remove the existing plugin.
-        apply_filters('update_feedback', __('Removing the old version of the theme'));
-        $deleted = $wp_filesystem->delete($themes_dir . $theme_directory, true);
-
-        if ( ! $deleted ) {
-                $wp_filesystem->delete($working_dir, true);
-                return new WP_Error('delete_failed', __('Could not remove the old plugin'));
-        }
-
-        apply_filters('update_feedback', __('Installing the latest version'));
-        // Copy new version of plugin into place.
-        $result = copy_dir($working_dir, $themes_dir);
-        if ( is_wp_error($result) ) {
-                $wp_filesystem->delete($working_dir, true);
-                return $result;
-        }
-
-        //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);
-
-        // Force refresh of plugin update information
-        delete_transient('update_themes');
-
-        /*if( empty($filelist) )
-                return false; //We couldnt find any files in the working dir, therefor no plugin installed? Failsafe backup.
-
-        $folder = $filelist[0];
-        $plugin = get_plugins('/' . $folder); //Ensure to pass with leading slash
-        $pluginfiles = array_keys($plugin); //Assume the requested plugin is the first in the list
-
-        return  $folder . '/' . $pluginfiles[0];*/
+        include ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
+        $upgrader = new Theme_Upgrader();
+        return $upgrader->upgrade($theme);
 }
 
 
 function wp_update_core($current, $feedback = '') {
-        global $wp_filesystem;
-
-        @set_time_limit( 300 );
-
+        
         if ( !empty($feedback) )
                 add_filter('update_feedback', $feedback);
 
-        // Is an update available?
-        if ( !isset( $current->response ) || $current->response == 'latest' )
-                return new WP_Error('up_to_date', __('WordPress 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 base WP folder
-        $wp_dir = $wp_filesystem->abspath();
-        if ( empty($wp_dir) )
-                return new WP_Error('fs_no_wp_dir', __('Unable to locate WordPress directory.'));
-
-        // And the same for the Content directory.
-        $content_dir = $wp_filesystem->wp_content_dir();
-        if( empty($content_dir) )
-                return new WP_Error('fs_no_content_dir', __('Unable to locate WordPress Content directory (wp-content).'));
-
-        $wp_dir = trailingslashit( $wp_dir );
-        $content_dir = trailingslashit( $content_dir );
-
-        // Get the URL to the zip file
-        $package = $current->package;
-
-        // Download the package
-        apply_filters('update_feedback', sprintf(__('Downloading update from %s'), $package));
-        $download_file = download_url($package);
-
-        if ( is_wp_error($download_file) )
-                return new WP_Error('download_failed', __('Download failed.'), $download_file->get_error_message());
-
-        $working_dir = $content_dir . 'upgrade/core';
-        // Clean up working directory
-        if ( $wp_filesystem->is_dir($working_dir) ) {
-                $wp_filesystem->delete($working_dir, true);
-        }
-
-        apply_filters('update_feedback', __('Unpacking the core update'));
-        // Unzip package to working directory
-        $result = unzip_file($download_file, $working_dir);
-        // Once extracted, delete the package
-        unlink($download_file);
-
-        if ( is_wp_error($result) ) {
-                $wp_filesystem->delete($working_dir, true);
-                return $result;
-        }
-
-        // Copy update-core.php from the new version into place.
-        if ( !$wp_filesystem->copy($working_dir . '/wordpress/wp-admin/includes/update-core.php', $wp_dir . 'wp-admin/includes/update-core.php', true) ) {
-                $wp_filesystem->delete($working_dir, true);
-                return new WP_Error('copy_failed', __('Could not copy files'));
-        }
-        $wp_filesystem->chmod($wp_dir . 'wp-admin/includes/update-core.php', FS_CHMOD_FILE);
-
-        require(ABSPATH . 'wp-admin/includes/update-core.php');
-
-        return update_core($working_dir, $wp_dir);
+        include ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
+        $upgrader = new Core_Upgrader();
+        return $upgrader->upgrade($current);
+
 }
 

trunk/wp-admin/plugin-install.php

@@ -25 +25 @@
 //These are the tabs which are shown on the page,
 $tabs = array();
-$tabs['dashboard'] = __('Search'); //TODO: Better name?
+$tabs['dashboard'] = __('Search');
 if ( 'search' == $tab )
         $tabs['search'] = __('Search Results');
@@ -34 +34 @@
 $tabs['updated']  = __('Recently Updated');
 
-$nonmenu_tabs = array('install', 'plugin-information', 'do_upload'); //Valid actions to perform which do not have a Menu item.
+$nonmenu_tabs = array('plugin-information'); //Valid actions to perform which do not have a Menu item.
 
 $tabs = apply_filters('install_plugins_tabs', $tabs );
@@ -63 +63 @@
         $sep = ( end($tabs) != $text ) ? ' | ' : '';
         $class = ( $action == $tab ) ? ' class="current"' : '';
-        $href = admin_url('plugin-install.php?tab='. $action);
+        $href = admin_url('plugin-install.php?tab=' . $action);
         echo "\t\t<li><a href='$href'$class>$text</a>$sep</li>\n";
 }
@@ -73 +73 @@
 <?php
 include('admin-footer.php');
-?>

trunk/wp-admin/theme-install.php

@@ -36 +36 @@
 $tabs['updated']  = __('Recently Updated');
 
-$nonmenu_tabs = array('install', 'theme-information', 'do_upload'); //Valid actions to perform which do not have a Menu item.
+$nonmenu_tabs = array('theme-information'); //Valid actions to perform which do not have a Menu item.
 
 $tabs = apply_filters('install_themes_tabs', $tabs );

trunk/wp-admin/update.php

@@ -1 +1 @@
 <?php
 /**
- * Update Plugin/Theme administration panel.
+ * Update/Install Plugin/Theme administration panel.
  *
  * @package WordPress
@@ -10 +10 @@
 require_once('admin.php');
 
-if ( ! current_user_can('update_plugins') )
-        wp_die(__('You do not have sufficient permissions to update plugins for this blog.'));
-
-/**
- * Plugin upgrade display.
- *
- * @since 2.5
- *
- * @param string $plugin Plugin
- */
-function do_plugin_upgrade($plugin) {
-        global $wp_filesystem;
-
-        $url = wp_nonce_url("update.php?action=upgrade-plugin&plugin=$plugin", "upgrade-plugin_$plugin");
-        if ( false === ($credentials = request_filesystem_credentials($url)) )
-                return;
-
-        if ( ! WP_Filesystem($credentials) ) {
-                $error = true;
-                if ( is_object($wp_filesystem) && $wp_filesystem->errors->get_error_code() )
-                        $error = $wp_filesystem->errors;
-                request_filesystem_credentials($url, '', $error); //Failed to connect, Error and request again
-                return;
-        }
-
-        echo '<div class="wrap">';
-        echo screen_icon();
-        echo '<h2>' . __('Upgrade Plugin') . '</h2>';
-        if ( $wp_filesystem->errors->get_error_code() ) {
-                foreach ( $wp_filesystem->errors->get_error_messages() as $message )
-                        show_message($message);
-                echo '</div>';
-                return;
-        }
-
-        $was_activated = is_plugin_active($plugin); //Check now, It'll be deactivated by the next line if it is
-
-        $result = wp_update_plugin($plugin, 'show_message');
-
-        if ( is_wp_error($result) ) {
-                show_message($result);
-                show_message( __('Plugin upgrade Failed') );
-        } else {
-                $plugin_file = $result;
-                show_message( __('Plugin upgraded successfully') );
-                if( $result && $was_activated ){
-                        show_message(__('Attempting reactivation of the plugin'));
-                        echo '<iframe style="border:0;overflow:hidden" width="100%" height="170px" src="' . wp_nonce_url('update.php?action=activate-plugin&plugin=' . $plugin_file, 'activate-plugin_' . $plugin_file) .'"></iframe>';
-                }
-                $update_actions =  array(
-                        'activate_plugin' => '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;plugin=' . $plugin_file, 'activate-plugin_' . $plugin_file) . '" title="' . attribute_escape(__('Activate this plugin')) . '" target="_parent">' . __('Activate Plugin') . '</a>',
-                        'plugins_page' => '<a href="' . admin_url('plugins.php') . '" title="' . attribute_escape(__('Goto plugins page')) . '" target="_parent">' . __('Return to Plugins page') . '</a>'
-                );
-                if ( $was_activated )
-                        unset( $update_actions['activate_plugin'] );
-
-                $update_actions = apply_filters('update_plugin_complete_actions', $update_actions, $plugin_file);
-                if ( ! empty($update_actions) )
-                        show_message('<strong>' . __('Actions:') . '</strong> ' . implode(' | ', (array)$update_actions));
-        }
-        echo '</div>';
-}
-
-/**
- * Theme upgrade display.
- *
- * @since 2.5
- *
- * @param string $plugin Plugin
- */
-function do_theme_upgrade($theme) {
-        global $wp_filesystem;
-
-        $url = wp_nonce_url('update.php?action=upgrade-theme&theme=' . urlencode($theme), 'upgrade-theme_' . urlencode($theme));
-        if ( false === ($credentials = request_filesystem_credentials($url)) )
-                return;
-
-        if ( ! WP_Filesystem($credentials) ) {
-                $error = true;
-                if ( is_object($wp_filesystem) && $wp_filesystem->errors->get_error_code() )
-                        $error = $wp_filesystem->errors;
-                request_filesystem_credentials($url, '', $error); //Failed to connect, Error and request again
-                return;
-        }
-
-        echo '<div class="wrap">';
-        echo screen_icon();
-        echo '<h2>' . __('Upgrade Theme') . '</h2>';
-        if ( $wp_filesystem->errors->get_error_code() ) {
-                foreach ( $wp_filesystem->errors->get_error_messages() as $message )
-                        show_message($message);
-                echo '</div>';
-                return;
-        }
-
-        //TODO: Is theme currently active?
-        $was_current = false; //is_plugin_active($plugin); //Check now, It'll be deactivated by the next line if it is
-
-        $result = wp_update_theme($theme, 'show_message');
-
-        if ( is_wp_error($result) ) {
-                show_message($result);
-                show_message( __('Installation Failed') );
-        } else {
-                //Result is the new plugin file relative to WP_PLUGIN_DIR
-                show_message( __('Theme upgraded successfully') );
-                if( $result && $was_current ){
-                        show_message(__('Setting theme as Current'));
-                        //TODO: Actually set it as active again.
-                        //echo '<iframe style="border:0" width="100%" height="170px" src="' . wp_nonce_url('update.php?action=activate-plugin&plugin=' . $result, 'activate-plugin_' . $result) .'"></iframe>';
-                }
-        }
-        echo '</div>';
-}
+include_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
 
 if ( isset($_GET['action']) ) {
-        $plugin = isset($_GET['plugin']) ? trim($_GET['plugin']) : '';
+        $plugin = isset($_REQUEST['plugin']) ? trim($_REQUEST['plugin']) : '';
         $theme = isset($_REQUEST['theme']) ? urldecode($_REQUEST['theme']) : '';
-        $action = isset($_GET['action']) ? $_GET['action'] : '';
+        $action = isset($_REQUEST['action']) ? $_REQUEST['action'] : '';
 
         if ( 'upgrade-plugin' == $action ) {
+                if ( ! current_user_can('update_plugins') )
+                        wp_die(__('You do not have sufficient permissions to update plugins for this blog.'));
+
                 check_admin_referer('upgrade-plugin_' . $plugin);
+
                 $title = __('Upgrade Plugin');
                 $parent_file = 'plugins.php';
-                require_once('admin-header.php');
-                do_plugin_upgrade($plugin);
-                include('admin-footer.php');
+                $submenu_file = 'plugins.php';
+                require_once('admin-header.php');
+
+                $nonce = 'upgrade-plugin_' . $plugin;
+                $url = 'update.php?action=upgrade-plugin&plugin=' . $plugin;
+
+                $upgrader = new Plugin_Upgrader( new Plugin_Upgrader_Skin( compact('title', 'nonce', 'url', 'plugin') ) );
+                $upgrader->upgrade($plugin);
+
+                include('admin-footer.php');
+                
         } elseif ('activate-plugin' == $action ) {
+                if ( ! current_user_can('update_plugins') )
+                        wp_die(__('You do not have sufficient permissions to update plugins for this blog.'));
+
                 check_admin_referer('activate-plugin_' . $plugin);
                 if( ! isset($_GET['failure']) && ! isset($_GET['success']) ) {
@@ -156 +58 @@
                 }
                 iframe_footer();
+        } elseif ( 'install-plugin' == $action ) {
+
+                if ( ! current_user_can('install_plugins') )
+                        wp_die(__('You do not have sufficient permissions to install plugins for this blog.'));
+
+                include_once ABSPATH . 'wp-admin/includes/plugin-install.php'; //for plugins_api..
+        
+                check_admin_referer('install-plugin_' . $plugin);
+                $api = plugins_api('plugin_information', array('slug' => $plugin, 'fields' => array('sections' => false) ) ); //Save on a bit of bandwidth.
+        
+                if ( is_wp_error($api) )
+                        wp_die($api);
+        
+                $title = __('Plugin Install');
+                $parent_file = 'plugins.php';
+                $submenu_file = 'plugin-install.php';
+                require_once('admin-header.php');
+        
+                $title = sprintf( __('Installing Plugin: %s'), $api->name . ' ' . $api->version );
+                $nonce = 'install-plugin_' . $plugin;
+                $url = add_query_arg( array(
+                                                                'plugin' => $plugin,
+                                                                'plugin_name' => $api->name . ' ' . $api->version,
+                                                                'download_url' => $api->download_link
+                                                        ), 'update.php?action=install-plugin');
+                $type = 'web'; //Install plugin type, From Web or an Upload.
+
+                $upgrader = new Plugin_Upgrader( new Plugin_Installer_Skin( compact('title', 'url', 'nonce', 'plugin', 'api') ) );
+                $upgrader->install($api->download_link);
+                
+                include('admin-footer.php');
+
+        } elseif ( 'upload-plugin' == $action ) {
+
+                if ( ! current_user_can('install_plugins') )
+                        wp_die(__('You do not have sufficient permissions to install plugins for this blog.'));
+
+                check_admin_referer('plugin-upload');
+
+                $file_upload = new File_Upload_Upgrader('pluginzip', 'package');
+
+                $title = __('Upload Plugin');
+                $parent_file = 'plugins.php';
+                $submenu_file = 'plugin-install.php';
+                require_once('admin-header.php');
+                
+                $title = sprintf( __('Installing Plugin from uploaded file: %s'), basename( $file_upload->filename ) );
+                $nonce = 'plugin-upload';
+                $url = add_query_arg(array('package' => $file_upload->filename ), 'update.php?action=upload-plugin');
+                $type = 'upload'; //Install plugin type, From Web or an Upload.
+
+                $upgrader = new Plugin_Upgrader( new Plugin_Installer_Skin( compact('type', 'title', 'nonce', 'url') ) );
+                $upgrader->install( $file_upload->package );
+
+                include('admin-footer.php');
+
         } elseif ( 'upgrade-theme' == $action ) {
+
+                if ( ! current_user_can('update_themes') )
+                        wp_die(__('You do not have sufficient permissions to update themes for this blog.'));
+
                 check_admin_referer('upgrade-theme_' . $theme);
+
+                add_thickbox();
+                wp_enqueue_script('theme-preview');
                 $title = __('Upgrade Theme');
                 $parent_file = 'themes.php';
-                require_once('admin-header.php');
-                do_theme_upgrade($theme);
-                include('admin-footer.php');
+                $submenu_file = 'themes.php';
+                require_once('admin-header.php');
+
+                $nonce = 'upgrade-theme_' . $theme;
+                $url = 'update.php?action=upgrade-theme&theme=' . $theme;
+
+                $upgrader = new Theme_Upgrader( new Theme_Upgrader_Skin( compact('title', 'nonce', 'url', 'theme') ) );
+                $upgrader->upgrade($theme);
+
+                include('admin-footer.php');
+        
+        } elseif ( 'install-theme' == $action ) {
+
+                if ( ! current_user_can('install_themes') )
+                        wp_die(__('You do not have sufficient permissions to install themes for this blog.'));
+
+                include_once ABSPATH . 'wp-admin/includes/theme-install.php'; //for themes_api..
+        
+                check_admin_referer('install-theme_' . $theme);
+                $api = themes_api('theme_information', array('slug' => $theme, 'fields' => array('sections' => false) ) ); //Save on a bit of bandwidth.
+
+                if ( is_wp_error($api) )
+                        wp_die($api);
+
+                add_thickbox();
+                wp_enqueue_script('theme-preview');
+                $title = __('Install Themes');
+                $parent_file = 'themes.php';
+                $submenu_file = 'theme-install.php';
+                require_once('admin-header.php');
+        
+                $title = sprintf( __('Installing theme: %s'), $api->name . ' ' . $api->version );
+                $nonce = 'install-theme_' . $theme;
+                $url = add_query_arg( array(
+                                                                'theme' => $theme,
+                                                                'theme_name' => $api->name . ' ' . $api->version,
+                                                                'download_url' => $api->download_link
+                                                        ), 'update.php?action=install-theme');
+                $type = 'web'; //Install theme type, From Web or an Upload.
+        
+                $upgrader = new Theme_Upgrader( new Theme_Installer_Skin( compact('title', 'url', 'nonce', 'plugin', 'api') ) );
+                $upgrader->install($api->download_link);
+                
+                include('admin-footer.php');
+                
+        } elseif ( 'upload-theme' == $action ) {
+
+                if ( ! current_user_can('install_themes') )
+                        wp_die(__('You do not have sufficient permissions to install themes for this blog.'));
+
+                check_admin_referer('theme-upload');
+
+                $file_upload = new File_Upload_Upgrader('themezip', 'package');
+
+                $title = __('Upload Theme');
+                $parent_file = 'themes.php';
+                $submenu_file = 'theme-install.php';
+                add_thickbox();
+                wp_enqueue_script('theme-preview');
+                require_once('admin-header.php');
+
+                $title = sprintf( __('Installing Theme from uploaded file: %s'), basename( $file_upload->filename ) );
+                $nonce = 'theme-upload';
+                $url = add_query_arg(array('package' => $file_upload->filename), 'update.php?action=upload-theme');
+                $type = 'upload'; //Install plugin type, From Web or an Upload.
+
+                $upgrader = new Theme_Upgrader( new Theme_Installer_Skin( compact('type', 'title', 'nonce', 'url') ) );
+                $upgrader->install( $file_upload->package );
+
+                include('admin-footer.php');
+
+        } else {
+                do_action('update-custom_' . $action);
         }
 }
-
-?>