WordPress 3.9.1-scripts

[autoinstalls/wordpress.git] / wp-admin / includes / class-wp-filesystem-ssh2.php

diff --git a/wp-admin/includes/class-wp-filesystem-ssh2.php b/wp-admin/includes/class-wp-filesystem-ssh2.php
index 8ff3cb18e79f458b4dc800b45737a9924a9e9f6e..30a96b1da51ba7fbd71be4de5a63c388ebe28831 100644 (file)
--- a/wp-admin/includes/class-wp-filesystem-ssh2.php
+++ b/wp-admin/includes/class-wp-filesystem-ssh2.php
@@ -1,13 +1,6 @@
 <?php
 /**
- * WordPress SSH2 Filesystem.
- *
- * @package WordPress
- * @subpackage Filesystem
- */
-
-/**
- * WordPress Filesystem Class for implementing SSH2.
+ * WordPress Filesystem Class for implementing SSH2
  *
  * To use this class you must follow these steps for PHP 5.2.6+
  *
@@ -35,10 +28,10 @@
  *
  * Note: as of WordPress 2.8, This utilises the PHP5+ function 'stream_get_contents'
  *
- * @since 2.7
+ * @since 2.7.0
+ *
  * @package WordPress
  * @subpackage Filesystem
- * @uses WP_Filesystem_Base Extends class
  */
 class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
 
@@ -150,7 +143,7 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
                return false;
        }
 
-       function get_contents($file, $type = '', $resumepos = 0 ) {
+       function get_contents( $file ) {
                $file = ltrim($file, '/');
                return file_get_contents('ssh2.sftp://' . $this->sftp_link . '/' . $file);
        }
@@ -161,12 +154,14 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
        }
 
        function put_contents($file, $contents, $mode = false ) {
-               $file = ltrim($file, '/');
-               $ret = file_put_contents('ssh2.sftp://' . $this->sftp_link . '/' . $file, $contents);
+               $ret = file_put_contents( 'ssh2.sftp://' . $this->sftp_link . '/' . ltrim( $file, '/' ), $contents );
+
+               if ( $ret !== strlen( $contents ) )
+                       return false;
 
                $this->chmod($file, $mode);
 
-               return false !== $ret;
+               return true;
        }
 
        function cwd() {
@@ -206,7 +201,17 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
                return $this->run_command(sprintf('chmod -R %o %s', $mode, escapeshellarg($file)), true);
        }
 
-       function chown($file, $owner, $recursive = false ) {
+       /**
+        * Change the ownership of a file / folder.
+        *
+        * @since Unknown
+        *
+        * @param string $file    Path to the file.
+        * @param mixed  $owner   A user name or number.
+        * @param bool $recursive Optional. If set True changes file owner recursivly. Defaults to False.
+        * @return bool Returns true on success or false on failure.
+        */
+       function chown( $file, $owner, $recursive = false ) {
                if ( ! $this->exists($file) )
                        return false;
                if ( ! $recursive || ! $this->is_dir($file) )
@@ -225,7 +230,7 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
        }
 
        function getchmod($file) {
-               return substr(decoct(@fileperms( 'ssh2.sftp://' . $this->sftp_link . '/' . ltrim($file, '/') )),3);
+               return substr( decoct( @fileperms( 'ssh2.sftp://' . $this->sftp_link . '/' . ltrim( $file, '/' ) ) ), -3 );
        }
 
        function group($file) {