Changeset 7238

Timestamp:

03/11/08 16:37:44 (4 months ago)

Author:

ryan

Message:

Auto update fixes from DD32. see #5586

Files:

• trunk/wp-admin/includes/class-wp-filesystem-direct.php (modified) (1 diff)
• trunk/wp-admin/includes/class-wp-filesystem-ftpext.php (modified) (2 diffs)
• trunk/wp-admin/includes/class-wp-filesystem-ftpsockets.php (modified) (2 diffs)
• trunk/wp-admin/includes/file.php (modified) (2 diffs)
• trunk/wp-admin/includes/update.php (modified) (5 diffs)
• trunk/wp-admin/update.php (modified) (7 diffs)

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

@@ -272 +272 @@
-            if ( '/' == substr($filename,-1,1) )
-                $this->rmdir($path.'/'.$filename,$recursive);
-entry
+filename
-        }
-        return @rmdir($path);

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

@@ -133 +133 @@
-    function get_contents($file,$type='',$resumepos=0){
-        if( empty($type) ){
-name
+
-            $type = isset($this->filetypes[ $extension ]) ? $this->filetypes[ $extension ] : FTP_ASCII;
-        }
@@ -349 +349 @@
-    function rmdir($path,$recursive=false){
-        if( ! $recursive )
-file
+path
-
-        //TODO: Recursive Directory delete, Have to delete files from the folder first.

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

@@ -140 +140 @@
-
-        if( empty($type) ){
-name
+
-            $type = isset($this->filetypes[ $extension ]) ? $this->filetypes[ $extension ] : FTP_AUTOASCII;
-        }
@@ -377 +377 @@
-    function rmdir($path,$recursive=false){
-        if( ! $recursive )
-file
+path
-
-        return $this->ftp->mdel($path);

trunk/wp-admin/includes/file.php

@@ -232 +232 @@
-    // Is the archive valid?
-    if ( false == ($archive_files = $archive->extract(PCLZIP_OPT_EXTRACT_AS_STRING)) )
-_string
+Info(true)
-
-    if ( 0 == count($archive_files) )
@@ -241 +241 @@
-    $tmppath = '';
-    for ( $j = 0; $j < count($path) - 1; $j++ ) {
-        $prevpath = $tmppath;
-        $tmppath .= $path[$j] . '/';
-
-
+
-            $fs->mkdir($tmppath, 0755);
-        }
-    }
-

trunk/wp-admin/includes/update.php

@@ -128 +128 @@
-
-    echo "<tr><td colspan='5' class='plugin-update'>";
-"update.php?action=upgrade-plugin&amp;plugin=$file"
+wp_nonce_url("update.php?action=upgrade-plugin&amp;plugin=$file", 'upgrade-plugin_' . $file)
-    echo "</td></tr>";
-}
@@ -168 +168 @@
-    // Download the package
-    $package = $r->package;
-"Downloading update from %s"
+'Downloading update from %s'
-    $file = download_url($package);
-
@@ -174 +174 @@
-        return new WP_Error('download_failed', __('Download failed.'));
-
-
-
+
-
-    // Clean up working directory
-
+$wp_filesystem->
-        $wp_filesystem->delete($working_dir, true);
-
-"Unpacking the update"
+'Unpacking the update'
-    // Unzip package to working directory
-    $result = unzip_file($file, $working_dir);
@@ -194 +193 @@
-
-    // Remove the existing plugin.
-"Removing the old version of the plugin"
+'Removing the old version of the plugin'
-    $plugin_dir = dirname($base . PLUGINDIR . "/$plugin");
-    $plugin_dir = trailingslashit($plugin_dir);
+    
-    // If plugin is in its own directory, recursively delete the directory.
-! in_array( $plugin_dir, array('.', trailingslashit($base . PLUGINDIR) ) )
+strpos($plugin, '/') && $plugin_dir != $base . PLUGINDIR . '/'
-        $deleted = $wp_filesystem->delete($plugin_dir, true);
-    else
-        $deleted = $wp_filesystem->delete($base . PLUGINDIR . "/$plugin");
+
-    if ( !$deleted ) {
-        $wp_filesystem->delete($working_dir, true);
@@ -207 +208 @@
-    }
-
-"Installing the latest version"
+'Installing the latest version'
-    // Copy new version of plugin into place.
-    if ( !copy_dir($working_dir, $base . PLUGINDIR) ) {
-
+ //TODO: Uncomment? This DOES mean that the new files are available in the upgrade folder if it fails.
-        return new WP_Error('install_failed', __('Installation failed'));
-    }

trunk/wp-admin/update.php

@@ -6 +6 @@
-                wp_die('<p>'.__('You do not have sufficient permissions to update plugins for this blog.').'</p>');
-
-
+, $error = false
-    if ( empty($type) )
-        $type = get_filesystem_method();
@@ -13 +13 @@
-        return array();
-
-
+ $error && !
-        $credentials = array('hostname' => $_POST['hostname'], 'username' => $_POST['username'],
-            'password' => $_POST['password'], 'ssl' => $_POST['ssl']);
@@ -27 +27 @@
-    if ( $credentials = get_option('ftp_credentials') )
-        extract($credentials, EXTR_OVERWRITE);
+    if( $error ){
+        echo '<div id="message" class="error"><p>' . __('<strong>Error:</strong> There was an error connecting to the server, Please verify the settings are correct.') . '</p></div>';
+    }
-?>
-<form action="<?php echo $form_post ?>" method="post">
@@ -43 +46 @@
-<tr valign="top">
-<th scope="row"><?php _e('Password:') ?></th>
-text
+password
-</tr>
-<tr valign="top">
@@ -81 +84 @@
-    global $wp_filesystem;
-
-credentials = request_filesystem_credentials("update.php?action=upgrade-plugin&plugin=
-$credentials
+url = wp_nonce_url("update.php?action=upgrade-plugin&plugin=$plugin", "upgrade-plugin_
+($credentials = request_filesystem_credentials($url))
-        return;
+        
+    if( ! WP_Filesystem($credentials) ){
+        request_filesystem_credentials($url, '', true); //Failed to connect, Error and request again
+        return;
+    }
+        
-    echo '<div class="wrap">';
-    echo '<h2>' . __('Upgrade Plugin') . '</h2>';
-    WP_Filesystem($credentials);
-    // TODO: look for auth and connect error codes and direct back to credentials form.
-    if ( $wp_filesystem->errors->get_error_code() ) {
-        foreach ( $wp_filesystem->errors->get_error_messages() as $message )
@@ -109 +116 @@
-
-    if ( 'upgrade-plugin' == $_GET['action'] ) {
-//check-
+check_
-        $title = __('Upgrade Plugin');
-        $parent_file = 'plugins.php';
@@ -116 +123 @@
-        include('admin-footer.php');
-    }
-
-}
-