Wordpress 3.0.1

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

diff --git a/wp-admin/includes/class-wp-filesystem-ftpsockets.php b/wp-admin/includes/class-wp-filesystem-ftpsockets.php
index a72abaa766a7ed0c627fa4cfb80f5fa51516679b..efd19d1f6fc2e13dfe0ea78e36553fd7a26f2585 100644 (file)
--- a/wp-admin/includes/class-wp-filesystem-ftpsockets.php
+++ b/wp-admin/includes/class-wp-filesystem-ftpsockets.php
@@ -39,7 +39,7 @@ class WP_Filesystem_ftpsockets 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.
@@ -115,14 +115,9 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
                return explode("\n", $this->get_contents($file) );
        }
 
-       function put_contents($file, $contents, $type = '' ) {
-               if ( empty($type) )
-                       $type = $this->is_binary($contents) ? FTP_BINARY : FTP_ASCII;
-
-               $this->ftp->SetType($type);
-
+       function put_contents($file, $contents, $mode = false ) {
                $temp = wp_tempnam( $file );
-               if ( ! $temphandle = fopen($temp, 'w+') ) {
+               if ( ! $temphandle = @fopen($temp, 'w+') ) {
                        unlink($temp);
                        return false;
                }
@@ -130,10 +125,16 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
                fwrite($temphandle, $contents);
                fseek($temphandle, 0); //Skip back to the start of the file being written to
 
+               $type = $this->is_binary($contents) ? FTP_BINARY : FTP_ASCII;
+               $this->ftp->SetType($type);
+
                $ret = $this->ftp->fput($file, $temphandle);
 
                fclose($temphandle);
                unlink($temp);
+
+               $this->chmod($file, $mode);
+
                return $ret;
        }
 
@@ -153,7 +154,6 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
        }
 
        function chmod($file, $mode = false, $recursive = false ) {
-
                if ( ! $mode ) {
                        if ( $this->is_file($file) )
                                $mode = FS_CHMOD_FILE;
@@ -163,16 +163,15 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
                                return false;
                }
 
-               if ( ! $recursive || ! $this->is_dir($file) ) {
-                       return $this->ftp->chmod($file, $mode);
+               // chmod any sub-objects if recursive.
+               if ( $recursive && $this->is_dir($file) ) {
+                       $filelist = $this->dirlist($file);
+                       foreach ( (array)$filelist as $filename => $filemeta )
+                               $this->chmod($file . '/' . $filename, $mode, $recursive);
                }
 
-               //Is a directory, and we want recursive
-               $filelist = $this->dirlist($file);
-               foreach ( $filelist as $filename )
-                       $this->chmod($file . '/' . $filename, $mode, $recursive);
-
-               return true;
+               // chmod the file or directory
+               return $this->ftp->chmod($file, $mode);
        }
 
        function chown($file, $owner, $recursive = false ) {
@@ -225,7 +224,11 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
        }
 
        function is_file($file) {
-               return $this->is_dir($file) ? false : true;
+               if ( $this->is_dir($file) )
+                       return false;
+               if ( $this->exists($file) )
+                       return true;
+               return false;
        }
 
        function is_dir($path) {
@@ -277,10 +280,7 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
        }
 
        function rmdir($path, $recursive = false ) {
-               if ( ! $recursive )
-                       return $this->ftp->rmdir($path);
-
-               return $this->ftp->mdel($path);
+               $this->delete($path, $recursive);
        }
 
        function dirlist($path = '.', $include_hidden = true, $recursive = false ) {
@@ -292,7 +292,7 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
                }
 
                $list = $this->ftp->dirlist($path);
-               if ( ! $list )
+               if ( empty($list) && !$this->exists($path) )
                        return false;
 
                $ret = array();