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

Timestamp:

09/11/2008 05:44:43 PM (17 years ago)

Author:

ryan

Message:

Handle ssh keys in ssf2 fs. Props ShaneF. see #7690

File:

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

trunk/wp-admin/includes/file.php

@@ -406 +406 @@
             $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.
+                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) )
@@ -511 +511 @@
     $credentials['password'] = defined('FTP_PASS') ? FTP_PASS : (!empty($_POST['password']) ? $_POST['password'] : $credentials['password']);
     
+    // Check to see if we are setting the public/private keys for ssh
+    $credentials['public_key'] = defined('FTP_PUBKEY') ? FTP_PUBKEY : (!empty($_POST['public_key']) ? $_POST['public_key'] : $credentials['public_key']);
+    $credentials['private_key'] = defined('FTP_PRIKEY') ? FTP_PRIKEY : (!empty($_POST['private_key']) ? $_POST['private_key'] : $credentials['private_key']);       
+    
     if ( strpos($credentials['hostname'], ':') )
         list( $credentials['hostname'], $credentials['port'] ) = explode(':', $credentials['hostname'], 2);
@@ -523 +527 @@
     if ( ! $error && !empty($credentials['password']) && !empty($credentials['username']) && !empty($credentials['hostname']) ) {
         $stored_credentials = $credentials;
-        unset($stored_credentials['password']);
+        unset($stored_credentials['password'], $stored_credentials['private_key'], $stored_credentials['public_key']);
         update_option('ftp_credentials', $stored_credentials);
         return $credentials;
@@ -540 +544 @@
     }
 ?>
+<script type="text/javascript">
+<!--
+jQuery(function($){
+    jQuery("#ssh").click(function () {
+        jQuery("#ssh_keys").show();     
+    });
+    jQuery("#ftp").click(function () {
+        jQuery("#ssh_keys").hide();     
+    }); 
+    jQuery("#ftps").click(function () {
+        jQuery("#ssh_keys").hide();     
+    });
+    jQuery(document).ready(function(){
+        if ( jQuery("#ssh:checked").length )
+        {
+            jQuery("#ssh_keys").show();
+        }
+    });
+});
+-->
+</script>
 <form action="<?php echo $form_post ?>" method="post">
 <div class="wrap">
@@ -557 +582 @@
 <td><input name="password" type="password" id="password" value=""<?php if( defined('FTP_PASS') ) echo ' disabled="disabled"' ?> size="40" /><?php if( defined('FTP_PASS') && !empty($password) ) echo '<em>'.__('(Password not shown)').'</em>'; ?></td>
 </tr>
+<tr id="ssh_keys" valign="top" style="display:none">
+<th scope="row"><label id="keys" for="keys"><?php _e('Authentication Keys') ?></label></th>
+<td><label for="public_key"><?php _e('Public Key:') ?></label ><input name="public_key" type="text" id="public_key" value=""<?php if( defined('FTP_PUBKEY') ) echo ' disabled="disabled"' ?> size="40" /> <label for="private_key"><?php _e('Private Key:') ?></label> <input name="private_key" type="text" id="private_key" value=""<?php if( defined('FTP_PRIKEY') ) echo ' disabled="disabled"' ?> size="40" /><br/><div><?php _e('Enter the location on the server where the keys are located. If a passphrase is needed, enter that in the password field above.') ?></div></td>
+</tr>
 <tr valign="top">
 <th scope="row"><?php _e('Connection Type') ?></th>
 <td>
 <fieldset><legend class="hidden"><?php _e('Connection Type') ?> </legend>
-<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 />
-<?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>
+<p><label><input id="ftp" name="connection_type"  type="radio" value="ftp" <?php checked('ftp', $connection_type); ?>   /> <?php _e('FTP') ?></label><br />
+<label><input id="ftps" name="connection_type" type="radio" value="ftps" <?php checked('ftps', $connection_type); ?> /> <?php _e('FTPS (SSL)') ?></label><br />
+<?php if ( extension_loaded('ssh2') ) { ?><label><input id="ssh" name="connection_type" type="radio" value="ssh" <?php checked('ssh', $connection_type); ?> /> <?php _e('SSH') ?></label><?php } ?></p>
 </fieldset>
 </td>