Changeset 11013 for trunk/wp-admin/includes/class-wp-upgrader.php

Timestamp:

04/20/2009 06:18:39 PM (16 years ago)

Author:

ryan

Message:

Trailing whitespace cleanup

File:

• trunk/wp-admin/includes/class-wp-upgrader.php (modified) (56 diffs)

trunk/wp-admin/includes/class-wp-upgrader.php

@@ -20 +20 @@
     var $skin = null;
     var $result = array();
-    
+
     function WP_Upgrader(&$skin = null) {
         return __construct($skin);
@@ -31 +31 @@
         $this->skin->set_upgrader($this);
     }
-    
+
     function generic_strings() {
         $this->strings['bad_request'] = __('Invalid Data provided.');
@@ -47 +47 @@
         $this->strings['mkdir_failed'] = __('Could not create directory.');
         $this->strings['bad_package'] = __('Incompatible Archive');
-        
+
         $this->strings['maintenance_start'] = __('Enabling Maintenance mode.');
         $this->strings['maintenance_end'] = __('Disabling Maintenance mode.');
     }
-    
+
     function fs_connect( $directories = array() ) {
         global $wp_filesystem;
-    
+
         if ( false === ($credentials = $this->skin->request_filesystem_credentials()) )
             return false;
-    
+
         if ( ! WP_Filesystem($credentials) ) {
             $error = true;
@@ -68 +68 @@
         if ( ! is_object($wp_filesystem) )
             return new WP_Error('fs_unavailable', $this->strings['fs_unavailable'] );
-    
+
         if ( is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code() )
             return new WP_Error('fs_error', $this->strings['fs_error'], $wp_filesystem->errors);
@@ -95 +95 @@
         if ( ! preg_match('!^(http|https|ftp)://!i', $package) && file_exists($package) ) //Local file or remote?
             return $package; //must be a local file..
-        
+
         if ( empty($package) )
             return new WP_Error('no_package', $this->strings['no_package']);
@@ -102 +102 @@
 
         $download_file = download_url($package);
-    
+
         if ( is_wp_error($download_file) )
             return new WP_Error('download_failed', $this->strings['download_failed'], $download_file->get_error_message());
-        
+
         return $download_file;
     }
-    
+
     function unpack_package($package, $delete_package = true) {
         global $wp_filesystem;
-        
+
         $this->skin->feedback('unpack_package');
 
@@ -141 +141 @@
             return $result;
         }
-        
+
         return $working_dir;
     }
-    
+
     function install_package($args = array()) {
         global $wp_filesystem;
@@ -158 +158 @@
         if ( empty($source) || empty($destination) )
             return new WP_Error('bad_request', $this->strings['bad_request']);
-        
+
         $this->skin->feedback('installing_package');
 
@@ -168 +168 @@
         $remote_source = $source;
         $local_destination = $destination;
-        
+
         $source_files = array_keys( $wp_filesystem->dirlist($remote_source) );
         $remote_destination = $wp_filesystem->find_folder($local_destination);
@@ -178 +178 @@
             return new WP_Error('bad_package', $this->strings['bad_package']); //There are no files?
         //else //Its only a single file, The upgrader will use the foldername of this file as the destination folder. foldername is based on zip filename.
-                  
+
         //Hook ability to change the source file location..
         $source = apply_filters('upgrader_source_selection', $source, $remote_source, $this);
         if ( is_wp_error($source) )
             return $source;
-        
+
         //Has the source location changed? If so, we need a new source_files list.
         if ( $source !== $remote_source )
             $source_files = array_keys( $wp_filesystem->dirlist($source) );
-        
+
         //Protection against deleting files in any important base directories.
         if ( in_array( $destination, array(ABSPATH, WP_CONTENT_DIR, WP_PLUGIN_DIR, WP_CONTENT_DIR . '/themes') ) ) {
@@ -213 +213 @@
                 return new WP_Error('remove_old_failed', $this->strings['remove_old_failed']);
         }
-        
+
         //Create destination if needed
         if ( !$wp_filesystem->exists($remote_destination) )
             if ( !$wp_filesystem->mkdir($remote_destination, FS_CHMOD_DIR) )
                 return new WP_Error('mkdir_failed', $this->strings['mkdir_failed'], $remote_destination);
-        
+
         // Copy new version of item into place.
         $result = copy_dir($source, $remote_destination);
@@ -226 +226 @@
             return $result;
         }
-        
-        //Clear the Working folder? 
+
+        //Clear the Working folder?
         if ( $clear_working )
             $wp_filesystem->delete($remote_source, true);
-        
+
         $destination_name = basename( str_replace($local_destination, '', $destination) );
         if ( '.' == $destination_name )
@@ -246 +246 @@
         return $this->result;
     }
-    
+
     function run($options) {
 
@@ -278 +278 @@
             return $download;
         }
-        
+
         //Unzip's the file into a temporary directory
         $working_dir = $this->unpack_package( $download );
@@ -287 +287 @@
 
         //With the given options, this installs it to the destination directory.
-        $result = $this->install_package( array( 
+        $result = $this->install_package( array(
                                             'source' => $working_dir,
                                             'destination' => $destination,
@@ -306 +306 @@
         return $result;
     }
-    
+
     function maintenance_mode($enable = false) {
         global $wp_filesystem;
@@ -321 +321 @@
         }
     }
-    
+
 }
 
@@ -327 +327 @@
 
     var $result;
-    
+
     function upgrade_strings() {
         $this->generic_strings();
@@ -352 +352 @@
 
     function install($package) {
-        
+
         $this->install_strings();
 
@@ -362 +362 @@
                     'hook_extra' => array()
                     ));
-    
+
         // Force refresh of plugin update information
         delete_transient('update_plugins');
@@ -369 +369 @@
 
     function upgrade($plugin) {
-        
+
         $this->upgrade_strings();
-        
+
         $current = get_transient( 'update_plugins' );
         if ( !isset( $current->response[ $plugin ] ) ) {
@@ -381 +381 @@
         // Get the URL to the zip file
         $r = $current->response[ $plugin ];
-        
+
         add_filter('upgrader_pre_install', array(&$this, 'deactivate_plugin_before_upgrade'), 10, 2);
         add_filter('upgrader_clear_destination', array(&$this, 'delete_old_plugin'), 10, 4);
@@ -406 +406 @@
         delete_transient('update_plugins');
     }
-    
+
     //return plugin info.
     function plugin_info() {
@@ -412 +412 @@
             return false;
         if ( empty($this->result['destination_name']) )
-            return false; 
+            return false;
 
         $plugin = get_plugins('/' . $this->result['destination_name']); //Ensure to pass with leading slash
@@ -420 +420 @@
         $pluginfiles = array_keys($plugin); //Assume the requested plugin is the first in the list
 
-        return $this->result['destination_name'] . '/' . $pluginfiles[0];   
+        return $this->result['destination_name'] . '/' . $pluginfiles[0];
     }
 
@@ -437 +437 @@
             //Deactivate the plugin silently, Prevent deactivation hooks from running.
             deactivate_plugins($plugin, true);
-        }   
+        }
     }
 
@@ -443 +443 @@
     function delete_old_plugin($removed, $local_destination, $remote_destination, $plugin) {
         global $wp_filesystem;
-    
+
         if ( is_wp_error($removed) )
             return $removed; //Pass errors through.
-    
+
         $plugin = isset($plugin['plugin']) ? $plugin['plugin'] : '';
         if ( empty($plugin) )
@@ -453 +453 @@
         $plugins_dir = $wp_filesystem->wp_plugins_dir();
         $this_plugin_dir = trailingslashit( dirname($plugins_dir . $plugin) );
-        
+
         if ( ! $wp_filesystem->exists($this_plugin_dir) ) //If its already vanished.
             return $removed;
-    
+
         // 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
@@ -465 +465 @@
         if ( ! $deleted )
             return new WP_Error('remove_old_failed', $this->strings['remove_old_failed']);
-        
+
         return $removed;
     }
@@ -498 +498 @@
 
     function install($package) {
-        
+
         $this->install_strings();
 
@@ -507 +507 @@
                         'clear_working' => true
                         );
-        
+
         $this->run($options);
-    
+
         if ( ! $this->result || is_wp_error($this->result) )
             return $this->result;
-    
+
         // Force refresh of theme update information
         delete_transient('update_themes');
-    
+
         if ( empty($result['destination_name']) )
-            return false; 
+            return false;
         else
             return $result['destination_name'];
@@ -523 +523 @@
 
     function upgrade($theme) {
-        
+
         $this->upgrade_strings();
-        
+
         // Is an update available?
         $current = get_transient( 'update_themes' );
         if ( !isset( $current->response[ $theme ] ) )
             return new WP_Error('up_to_date', $this->strings['up_to_date']);
-        
+
         $r = $current->response[ $theme ];
 
@@ -546 +546 @@
                                             )
                         );
-        
+
         $this->run($options);
 
@@ -557 +557 @@
         return true;
     }
-    
+
     function current_before($return, $theme) {
-        
+
         if ( is_wp_error($return) )
             return $return;
@@ -593 +593 @@
         return $return;
     }
-    
+
     function delete_old_theme($removed, $local_destination, $remote_destination, $theme) {
         global $wp_filesystem;
-    
+
         $theme = isset($theme['theme']) ? $theme['theme'] : '';
-    
+
         if ( is_wp_error($removed) || empty($theme) )
             return $removed; //Pass errors through.
-        
+
         $themes_dir = $wp_filesystem->wp_themes_dir();
         if ( $wp_filesystem->exists( trailingslashit($themes_dir) . $theme ) )
@@ -608 +608 @@
         return true;
     }
-    
+
     function theme_info() {
         if ( empty($this->result['destination_name']) )
@@ -632 +632 @@
         global $wp_filesystem;
         $this->upgrade_strings();
-        
-    
+
+
         if ( !empty($feedback) )
             add_filter('update_feedback', $feedback);
-    
+
         // Is an update available?
         if ( !isset( $current->response ) || $current->response == 'latest' )
@@ -644 +644 @@
         if ( is_wp_error($res) )
             return $res;
-        
+
         $wp_dir = trailingslashit($wp_filesystem->abspath());
-        
+
         $download = $this->download_package( $current->package );
         if ( is_wp_error($download) )
             return $download;
-        
+
         $working_dir = $this->unpack_package( $download );
         if ( is_wp_error($working_dir) )
@@ -661 +661 @@
         }
         $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);
     }
@@ -678 +678 @@
 
 class WP_Upgrader_Skin {
-    
+
     var $upgrader;
     var $done_header = false;
-    
+
     function WP_Upgrader_Skin($args = array()) {
         return __construct($args);
@@ -689 +689 @@
         $this->options = wp_parse_args($args, $defaults);
     }
-    
+
     function set_upgrader(&$upgrader) {
         if ( is_object($upgrader) )
@@ -697 +697 @@
         $this->result = $result;
     }
-    
+
     function request_filesystem_credentials($error = false) {
         $url = $this->options['url'];
@@ -704 +704 @@
         return request_filesystem_credentials($url, '', $error); //Possible to bring inline, Leaving as0is for now.
     }
-    
+
     function header() {
         if ( $this->done_header )
@@ -711 +711 @@
         echo '<div class="wrap">';
         echo screen_icon();
-        echo '<h2>' . $this->options['title'] . '</h2>';    
+        echo '<h2>' . $this->options['title'] . '</h2>';
     }
     function footer() {
         echo '</div>';
     }
-    
+
     function error($errors) {
         if ( ! $this->done_header )
@@ -739 +739 @@
             return;
         show_message($string);
-    }   
+    }
     function before() {}
     function after() {}
-    
+
 }
 
@@ -760 +760 @@
 
         $this->plugin_active = is_plugin_active($this->plugin);
-        
+
         parent::__construct($args);
     }
-    
+
     function after() {
         $this->plugin = $this->upgrader->plugin_info();
@@ -797 +797 @@
         $defaults = array( 'type' => 'web', 'url' => '', 'plugin' => '', 'nonce' => '', 'title' => '' );
         $args = wp_parse_args($args, $defaults);
-        
+
         $this->type = $args['type'];
         $this->api = isset($args['api']) ? $args['api'] : array();
-        
+
         parent::__construct($args);
     }
@@ -808 +808 @@
             $this->upgrader->strings['process_success'] = sprintf( __('Successfully installed the plugin <strong>%s %s</strong>.'), $this->api->name, $this->api->version);
     }
-    
+
     function after() {
 
@@ -843 +843 @@
         $defaults = array( 'type' => 'web', 'url' => '', 'theme' => '', 'nonce' => '', 'title' => '' );
         $args = wp_parse_args($args, $defaults);
-        
+
         $this->type = $args['type'];
         $this->api = isset($args['api']) ? $args['api'] : array();
-        
+
         parent::__construct($args);
     }
@@ -854 +854 @@
             $this->upgrader->strings['process_success'] = sprintf( __('Successfully installed the theme <strong>%s %s</strong>.'), $this->api->name, $this->api->version);
     }
-    
+
     function after() {
         if ( empty($this->upgrader->result['destination_name']) )
@@ -865 +865 @@
         $stylesheet = $this->upgrader->result['destination_name'];
         $template = !empty($theme_info['Template']) ? $theme_info['Template'] : $stylesheet;
-        
+
         $preview_link = htmlspecialchars( add_query_arg( array('preview' => 1, 'template' => $template, 'stylesheet' => $stylesheet, 'TB_iframe' => 'true' ), trailingslashit(clean_url(get_option('home'))) ) );
         $activate_link = wp_nonce_url("themes.php?action=activate&amp;template=" . urlencode($template) . "&amp;stylesheet=" . urlencode($stylesheet), 'switch-theme_' . $template);
-        
+
         $install_actions = array(
             'preview' => '<a href="' . $preview_link . '" class="thickbox thickbox-preview" title="' . attribute_escape(sprintf(__('Preview "%s"'), $name)) . '">' . __('Preview') . '</a>',
@@ -900 +900 @@
 
         $this->theme = $args['theme'];
-        
+
         parent::__construct($args);
     }
-    
+
     function after() {
 
@@ -915 +915 @@
         $stylesheet = $this->upgrader->result['destination_name'];
         $template = !empty($theme_info['Template']) ? $theme_info['Template'] : $stylesheet;
-        
+
         $preview_link = htmlspecialchars( add_query_arg( array('preview' => 1, 'template' => $template, 'stylesheet' => $stylesheet, 'TB_iframe' => 'true' ), trailingslashit(clean_url(get_option('home'))) ) );
         $activate_link = wp_nonce_url("themes.php?action=activate&amp;template=" . urlencode($template) . "&amp;stylesheet=" . urlencode($stylesheet), 'switch-theme_' . $template);
@@ -926 +926 @@
         if ( ( ! $this->result || is_wp_error($this->result) ) || $stylesheet == get_stylesheet() )
             unset($update_actions['preview'], $update_actions['activate']);
-    
+
         $update_actions = apply_filters('update_theme_complete_actions', $update_actions, $this->theme);
         if ( ! empty($update_actions) )
@@ -943 +943 @@
         if ( ! ( ( $uploads = wp_upload_dir() ) && false === $uploads['error'] ) )
             wp_die($uploads['error']);
-        
+
         if ( empty($_FILES[$form]['name']) && empty($_GET[$urlholder]) )
             wp_die(__('Please select a file'));
-    
+
         if ( !empty($_FILES) )
             $this->filename = $_FILES[$form]['name'];
@@ -956 +956 @@
             $this->filename = wp_unique_filename( $uploads['basedir'], $this->filename );
             $this->package = $uploads['basedir'] . '/' . $this->filename;
-    
+
             // Move the file to the uploads dir
             if ( false === @ move_uploaded_file( $_FILES[$form]['tmp_name'], $this->package) )