Changeset 8880 for trunk/wp-admin/includes/class-wp-filesystem-ssh2.php

Timestamp:

09/13/2008 06:06:20 PM (17 years ago)

Author:

ryan

Message:

ssh2 fs fixes from ShaneF and DD32. see #7690

File:

• trunk/wp-admin/includes/class-wp-filesystem-ssh2.php (modified) (7 diffs)

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

@@ -64 +64 @@
         $this->errors = new WP_Error();
 
-        //Check if possible to use ftp functions.
+        //Check if possible to use ssh2 functions.
         if ( ! extension_loaded('ssh2') ) {
             $this->errors->add('no_ssh2_ext', __('The ssh2 PHP extension is not available'));
@@ -90 +90 @@
             $this->options['username'] = $opt['username'];
 
-        if (( !empty ($opt['public_key']) ) && ( !empty ($opt['private_key']) )) {
+        if ( ( !empty ($opt['public_key']) ) && ( !empty ($opt['private_key']) ) ) {
             $this->options['public_key'] = $opt['public_key'];  
             $this->options['private_key'] = $opt['private_key'];
@@ -100 +100 @@
 
 
-        if ( empty ($opt['password']) )
+        if ( empty ($opt['password']) ) {
             if ( !$this->keys ) //   password can be blank if we are using keys
                 $this->errors->add('empty_password', __('SSH2 password is required'));
-        else
+        } else {
             $this->options['password'] = $opt['password'];
+        }
             
     }
@@ -110 +111 @@
     function connect() {
         $this->debug("connect();");
-        if ( ! $this->keys )
-            $this->link = @ssh2_connect($this->options['hostname'], $this->options['port']);
-        else
-            $this->link = @ssh2_connect($this->options['hostname'], $this->options['port'], $this->options['hostkey']); 
+        
+        if ( ! $this->keys ) {
+            $this->link = @ssh2_connect($this->options['hostname'], $this->options['port']);            
+        } else {
+            $this->link = @ssh2_connect($this->options['hostname'], $this->options['port'], $this->options['hostkey']);         
+        }
             
         if ( ! $this->link ) {
@@ -203 +206 @@
 
     function put_contents($file, $contents, $type = '' ) {
-        $this->debug("put_contents();");
+        $this->debug("put_contents($file);");
         $tempfile = wp_tempnam( $file );
         $temp = fopen($tempfile, 'w');
@@ -327 +330 @@
         $this->debug("is_dir();");
         //DO NOT RELY ON dirlist()!
-        $list = $this->parselisting($this->run_command($this->link, sprintf('ls -lad %s', rtrim($path, '/'))));
+        $list = $this->parselisting($this->run_command($this->link, sprintf('ls -lad %s', untrailingslashit($path))));
         if ( ! $list )
             return false;
@@ -360 +363 @@
     function mkdir($path, $chmod = null, $chown = false, $chgrp = false) {
         $this->debug("mkdir();");
-        $path = trim($path, '/');
+        $path = untrailingslashit($path);
         if( ! ssh2_sftp_mkdir($this->sftp_link, $path, $chmod, true) )
             return false;