Changeset 8852 for trunk/wp-admin/includes/file.php

Timestamp:

09/09/2008 03:24:05 AM (18 years ago)

Author:

azaozz

Message:

SSH2 filesystem improvements, props ShaneF, see #7690

File:

• trunk/wp-admin/includes/file.php (modified) (8 diffs)

trunk/wp-admin/includes/file.php

@@ -387 +387 @@
                 return new WP_Error('empty_archive', __('Empty archive'));
 
+        $path = explode('/', $to);
+        for ( $i = count($path); $i > 0; $i-- ) { //>0 = first element is empty allways for paths starting with '/'
+                $tmppath = implode('/', array_slice($path, 0, $i) );
+                if ( $fs->is_dir($tmppath) ) { //Found the highest folder that exists, Create from here(ie +1)
+                        for ( $i = $i + 1; $i <= count($path); $i++ ) {
+                                $tmppath = implode('/', array_slice($path, 0, $i) );
+                                if ( ! $fs->mkdir($tmppath, 0755) )
+                                        return new WP_Error('mkdir_failed', __('Could not create directory'), $tmppath);
+                        }
+                        break; //Exit main for loop
+                }
+        }
+
         $to = trailingslashit($to);
-        $path = explode('/', $to);
-        $tmppath = '';
-        for ( $j = 0; $j < count($path) - 1; $j++ ) {
-                $tmppath .= $path[$j] . '/';
-                if ( ! $fs->is_dir($tmppath) )
-                        $fs->mkdir($tmppath, 0755);
-        }
-
         foreach ($archive_files as $file) {
                 $path = explode('/', $file['filename']);
-                $tmppath = '';
-
-                // Loop through each of the items and check that the folder exists.
-                for ( $j = 0; $j < count($path) - 1; $j++ ) {
-                        $tmppath .= $path[$j] . '/';
-                        if ( ! $fs->is_dir($to . $tmppath) )
-                                if ( !$fs->mkdir($to . $tmppath, 0755) )
-                                        return new WP_Error('mkdir_failed', __('Could not create directory'), $to . $tmppath);
+                for ( $i = count($path) - 1; $i >= 0; $i-- ) { //>=0 as the first element contains data, count()-1, as we do not want the file component
+                        $tmppath = $to . implode('/', array_slice($path, 0, $i) );
+                        if ( $fs->is_dir($tmppath) ) {//Found the highest folder that exists, Create from here
+                                for ( $i = $i + 1; $i < count($path); $i++ ) { //< count() no file component please.
+                                        $tmppath = $to . implode('/', array_slice($path, 0, $i) );
+                                        if ( ! $fs->mkdir($tmppath, 0755) )
+                                                return new WP_Error('mkdir_failed', __('Could not create directory'), $tmppath);
+                                }
+                                break; //Exit main for loop
+                        }
                 }
 
@@ -415 +422 @@
                 }
         }
-
         return true;
 }
@@ -454 +460 @@
                 return false;
 
-        $abstraction_file = apply_filters('filesystem_method_file', ABSPATH . 'wp-admin/includes/class-wp-filesystem-'.$method.'.php', $method);
+        $abstraction_file = apply_filters('filesystem_method_file', ABSPATH . 'wp-admin/includes/class-wp-filesystem-' . $method . '.php', $method);
         if( ! file_exists($abstraction_file) )
                 return;
@@ -481 +487 @@
         }
 
-        if ( isset($args['connection_type']) && 'ssh' == $args['connection_type'] ) {
-                $method = 'SSH2';
-                return apply_filters('filesystem_method', $method);
-        }
-
+        if ( ! $method && isset($args['connection_type']) && 'ssh' == $args['connection_type'] && extension_loaded('ssh2') ) $method = 'ssh2';
         if ( ! $method && extension_loaded('ftp') ) $method = 'ftpext';
         if ( ! $method && ( extension_loaded('sockets') || function_exists('fsockopen') ) ) $method = 'ftpsockets'; //Sockets: Socket extension; PHP Mode: FSockopen / fwrite / fread
@@ -508 +510 @@
         $credentials['username'] = defined('FTP_USER') ? FTP_USER : (!empty($_POST['username']) ? $_POST['username'] : $credentials['username']);
         $credentials['password'] = defined('FTP_PASS') ? FTP_PASS : (!empty($_POST['password']) ? $_POST['password'] : $credentials['password']);
-        if ( defined('FTP_SSH') || 'ssh' == $_POST['connection_type'] )
+        
+        if ( strpos($credentials['hostname'], ':') )
+                list( $credentials['hostname'], $credentials['port'] ) = explode(':', $credentials['hostname'], 2);
+
+        if ( defined('FTP_SSH') || (isset($_POST['connection_type']) && 'ssh' == $_POST['connection_type']) )
                 $credentials['connection_type'] = 'ssh';
-        else if ( defined('FTP_SSL') || 'ftps' == $_POST['connection_type'] )
+        else if ( defined('FTP_SSL') || (isset($_POST['connection_type']) && 'ftps' == $_POST['connection_type']) )
                 $credentials['connection_type'] = 'ftps';
         else
@@ -524 +530 @@
         $username = '';
         $password = '';
-        $ssl = '';
+        $connection_type = '';
         if ( !empty($credentials) )
                 extract($credentials, EXTR_OVERWRITE);
@@ -541 +547 @@
 <tr valign="top">
 <th scope="row"><label for="hostname"><?php _e('Hostname') ?></label></th>
-<td><input name="hostname" type="text" id="hostname" value="<?php echo attribute_escape($hostname) ?>"<?php if( defined('FTP_HOST') ) echo ' disabled="disabled"' ?> size="40" /></td>
+<td><input name="hostname" type="text" id="hostname" value="<?php echo attribute_escape($hostname); if ( !empty($port) ) echo ":$port"; ?>"<?php if( defined('FTP_HOST') ) echo ' disabled="disabled"' ?> size="40" /></td>
 </tr>
 <tr valign="top">
@@ -557 +563 @@
 <p><label><input name="connection_type"  type="radio" value="ftp" <?php checked('ftp', $connection_type); ?>    /> <?php _e('FTP') ?></label><br />
 <label><input name="connection_type" type="radio" value="ftps" <?php checked('ftps', $connection_type); ?> /> <?php _e('FTPS (SSL)') ?></label><br />
-<label><input name="connection_type" type="radio" value="ssh" <?php checked('ssh', $connection_type); ?> /> <?php _e('SSH') ?></label></p>
+<?php if ( extension_loaded('ssh2') ) { ?><label><input name="connection_type" type="radio" value="ssh" <?php checked('ssh', $connection_type); ?> /> <?php _e('SSH') ?></label><?php } ?></p>
 </fieldset>
 </td>