Wordpress 3.0.1

[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 89763df842bdeab903ac77536fbc8ec3145c433e..f5a64021cd6375b15e25eaf6b06933071078ff37 100644 (file)
--- a/wp-admin/includes/class-wp-filesystem-ssh2.php
+++ b/wp-admin/includes/class-wp-filesystem-ssh2.php
@@ -45,19 +45,9 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
        var $link = false;
        var $sftp_link = false;
        var $keys = false;
-       /*
-        * This is the timeout value for ssh results.
-        * Slower servers might need this incressed, but this number otherwise should not change.
-        *
-        * @parm $timeout int
-        *
-        */
-       var $timeout = 15;
        var $errors = array();
        var $options = array();
 
-       var $permission = 0644;
-
        function WP_Filesystem_SSH2($opt='') {
                $this->method = 'ssh2';
                $this->errors = new WP_Error();
@@ -83,7 +73,7 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
                else
                        $this->options['hostname'] = $opt['hostname'];
 
-               if ( isset($opt['base']) && ! empty($opt['base']) )
+               if ( ! empty($opt['base']) )
                        $this->wp_base = $opt['base'];
 
                // Check if the options provided are OK.
@@ -148,7 +138,7 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
                        $this->errors->add('command', sprintf(__('Unable to perform command: %s'), $command));
                } else {
                        stream_set_blocking( $stream, true );
-                       stream_set_timeout( $stream, $this->timeout );
+                       stream_set_timeout( $stream, FS_TIMEOUT );
                        $data = stream_get_contents( $stream );
                        fclose( $stream );
 
@@ -160,12 +150,6 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
                return false;
        }
 
-       function setDefaultPermissions($perm) {
-               $this->debug("setDefaultPermissions();");
-               if ( $perm )
-                       $this->permission = $perm;
-       }
-
        function get_contents($file, $type = '', $resumepos = 0 ) {
                $file = ltrim($file, '/');
                return file_get_contents('ssh2.sftp://' . $this->sftp_link . '/' . $file);
@@ -176,14 +160,18 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
                return file('ssh2.sftp://' . $this->sftp_link . '/' . $file);
        }
 
-       function put_contents($file, $contents, $type = '' ) {
+       function put_contents($file, $contents, $mode = false ) {
                $file = ltrim($file, '/');
-               return file_put_contents('ssh2.sftp://' . $this->sftp_link . '/' . $file, $contents);
+               $ret = file_put_contents('ssh2.sftp://' . $this->sftp_link . '/' . $file, $contents);
+
+               $this->chmod($file, $mode);
+
+               return false !== $ret;
        }
 
        function cwd() {
                $cwd = $this->run_command('pwd');
-               if( $cwd )
+               if ( $cwd )
                        $cwd = trailingslashit($cwd);
                return $cwd;
        }
@@ -201,12 +189,18 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
        }
 
        function chmod($file, $mode = false, $recursive = false) {
-               if( ! $mode )
-                       $mode = $this->permission;
-               if( ! $mode )
-                       return false;
                if ( ! $this->exists($file) )
                        return false;
+
+               if ( ! $mode ) {
+                       if ( $this->is_file($file) )
+                               $mode = FS_CHMOD_FILE;
+                       elseif ( $this->is_dir($file) )
+                               $mode = FS_CHMOD_DIR;
+                       else
+                               return false;
+               }
+
                if ( ! $recursive || ! $this->is_dir($file) )
                        return $this->run_command(sprintf('chmod %o %s', $mode, escapeshellarg($file)), true);
                return $this->run_command(sprintf('chmod -R %o %s', $mode, escapeshellarg($file)), true);
@@ -245,10 +239,10 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
        }
 
        function copy($source, $destination, $overwrite = false ) {
-               if( ! $overwrite && $this->exists($destination) )
+               if ( ! $overwrite && $this->exists($destination) )
                        return false;
                $content = $this->get_contents($source);
-               if( false === $content)
+               if ( false === $content)
                        return false;
                return $this->put_contents($destination, $content);
        }
@@ -315,9 +309,10 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
                //Not implmented.
        }
 
-       function mkdir($path, $chmod = null, $chown = false, $chgrp = false) {
+       function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {
                $path = untrailingslashit($path);
-               $chmod = !empty($chmod) ? $chmod : $this->permission;
+               if ( ! $chmod )
+                       $chmod = FS_CHMOD_DIR;
                if ( ! ssh2_sftp_mkdir($this->sftp_link, $path, $chmod, true) )
                        return false;
                if ( $chown )
@@ -331,29 +326,34 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
                return $this->delete($path, $recursive);
        }
 
-       function dirlist($path, $incdot = false, $recursive = false) {
+       function dirlist($path, $include_hidden = true, $recursive = false) {
                if ( $this->is_file($path) ) {
-                       $limitFile = basename($path);
+                       $limit_file = basename($path);
                        $path = dirname($path);
                } else {
-                       $limitFile = false;
+                       $limit_file = false;
                }
+
                if ( ! $this->is_dir($path) )
                        return false;
 
                $ret = array();
                $dir = @dir('ssh2.sftp://' . $this->sftp_link .'/' . ltrim($path, '/') );
+
                if ( ! $dir )
                        return false;
+
                while (false !== ($entry = $dir->read()) ) {
                        $struc = array();
                        $struc['name'] = $entry;
 
                        if ( '.' == $struc['name'] || '..' == $struc['name'] )
                                continue; //Do not care about these folders.
-                       if ( '.' == $struc['name'][0] && !$incdot)
+
+                       if ( ! $include_hidden && '.' == $struc['name'][0] )
                                continue;
-                       if ( $limitFile && $struc['name'] != $limitFile)
+
+                       if ( $limit_file && $struc['name'] != $limit_file )
                                continue;
 
                        $struc['perms']         = $this->gethchmod($path.'/'.$entry);
@@ -369,7 +369,7 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
 
                        if ( 'd' == $struc['type'] ) {
                                if ( $recursive )
-                                       $struc['files'] = $this->dirlist($path . '/' . $struc['name'], $incdot, $recursive);
+                                       $struc['files'] = $this->dirlist($path . '/' . $struc['name'], $include_hidden, $recursive);
                                else
                                        $struc['files'] = array();
                        }