Wordpress 3.5

[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..1c931e19281c5a600c63e294d9b0cf524f3f9da7 100644 (file)
--- a/wp-admin/includes/class-wp-filesystem-ftpsockets.php
+++ b/wp-admin/includes/class-wp-filesystem-ftpsockets.php
@@ -19,7 +19,7 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
        var $errors = null;
        var $options = array();
 
        var $errors = null;
        var $options = array();
 

-       function WP_Filesystem_ftpsockets($opt = '') {
+       function __construct($opt = '') {

                $this->method = 'ftpsockets';
                $this->errors = new WP_Error();
 
                $this->method = 'ftpsockets';
                $this->errors = new WP_Error();
 


@@ -39,7 +39,7 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
                else
                        $this->options['hostname'] = $opt['hostname'];
 
                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.
                        $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) );
        }
 
                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 );
                $temp = wp_tempnam( $file );

-               if ( ! $temphandle = fopen($temp, 'w+') ) {
+               if ( ! $temphandle = @fopen($temp, 'w+') ) {

                        unlink($temp);
                        return false;
                }
                        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
 
                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);
                $ret = $this->ftp->fput($file, $temphandle);
 
                fclose($temphandle);
                unlink($temp);

+
+               $this->chmod($file, $mode);
+

                return $ret;
        }
 
                return $ret;
        }
 


@@ -153,7 +154,6 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
        }
 
        function chmod($file, $mode = false, $recursive = false ) {
        }
 
        function chmod($file, $mode = false, $recursive = false ) {

-

                if ( ! $mode ) {
                        if ( $this->is_file($file) )
                                $mode = FS_CHMOD_FILE;
                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;
                }
 
                                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 ) {
        }
 
        function chown($file, $owner, $recursive = false ) {


@@ -194,7 +193,7 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
                return $dir[$file]['group'];
        }
 
                return $dir[$file]['group'];
        }
 

-       function copy($source, $destination, $overwrite = false ) {
+       function copy($source, $destination, $overwrite = false, $mode = false) {

                if ( ! $overwrite && $this->exists($destination) )
                        return false;
 
                if ( ! $overwrite && $this->exists($destination) )
                        return false;
 


@@ -202,17 +201,17 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
                if ( false === $content )
                        return false;
 
                if ( false === $content )
                        return false;
 

-               return $this->put_contents($destination, $content);
+               return $this->put_contents($destination, $content, $mode);

        }
 
        function move($source, $destination, $overwrite = false ) {
                return $this->ftp->rename($source, $destination);
        }
 
        }
 
        function move($source, $destination, $overwrite = false ) {
                return $this->ftp->rename($source, $destination);
        }
 

-       function delete($file, $recursive = false ) {
+       function delete($file, $recursive = false, $type = false) {

                if ( empty($file) )
                        return false;
                if ( empty($file) )
                        return false;

-               if ( $this->is_file($file) )
+               if ( 'f' == $type || $this->is_file($file) )

                        return $this->ftp->delete($file);
                if ( !$recursive )
                        return $this->ftp->rmdir($file);
                        return $this->ftp->delete($file);
                if ( !$recursive )
                        return $this->ftp->rmdir($file);


@@ -225,7 +224,11 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
        }
 
        function is_file($file) {
        }
 
        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) {
        }
 
        function is_dir($path) {


@@ -264,6 +267,10 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
        }
 
        function mkdir($path, $chmod = false, $chown = false, $chgrp = false ) {
        }
 
        function mkdir($path, $chmod = false, $chown = false, $chgrp = false ) {

+               $path = untrailingslashit($path);
+               if ( empty($path) )
+                       return false;
+

                if ( ! $this->ftp->mkdir($path) )
                        return false;
                if ( ! $chmod )
                if ( ! $this->ftp->mkdir($path) )
                        return false;
                if ( ! $chmod )


@@ -277,10 +284,7 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
        }
 
        function rmdir($path, $recursive = false ) {
        }
 
        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 ) {
        }
 
        function dirlist($path = '.', $include_hidden = true, $recursive = false ) {


@@ -292,7 +296,7 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
                }
 
                $list = $this->ftp->dirlist($path);
                }
 
                $list = $this->ftp->dirlist($path);

-               if ( ! $list )
+               if ( empty($list) && !$this->exists($path) )

                        return false;
 
                $ret = array();
                        return false;
 
                $ret = array();


@@ -314,6 +318,10 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
                                        $struc['files'] = array();
                        }
 
                                        $struc['files'] = array();
                        }
 

+                       // Replace symlinks formatted as "source -> target" with just the source name
+                       if ( $struc['islink'] )
+                               $struc['name'] = preg_replace( '/(\s*->\s*.*)$/', '', $struc['name'] );
+

                        $ret[ $struc['name'] ] = $struc;
                }
                return $ret;
                        $ret[ $struc['name'] ] = $struc;
                }
                return $ret;


@@ -323,5 +331,3 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
                $this->ftp->quit();
        }
 }
                $this->ftp->quit();
        }
 }

-
-?>