WordPress 4.3

[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 bb7e0c2e6293ad1fcc22a8f06be46cd7962c17a1..879a2e8ca8542e25d0881a4f98bbda7a26fae916 100644 (file)
--- a/wp-admin/includes/class-wp-filesystem-ftpsockets.php
+++ b/wp-admin/includes/class-wp-filesystem-ftpsockets.php
@@ -15,17 +15,22 @@
  * @uses WP_Filesystem_Base Extends class
  */
 class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
-       public $ftp = false;
-       public $errors = null;
-       public $options = array();
+       /**
+        * @var ftp
+        */
+       public $ftp;
 
-       public function __construct($opt = '') {
+       /**
+        *
+        * @param array $opt
+        */
+       public function __construct( $opt  = '' ) {
                $this->method = 'ftpsockets';
                $this->errors = new WP_Error();
 
                // Check if possible to use ftp functions.
                if ( ! @include_once( ABSPATH . 'wp-admin/includes/class-ftp.php' ) ) {
-                       return false;
+                       return;
                }
                $this->ftp = new ftp();
 
@@ -39,9 +44,6 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
                else
                        $this->options['hostname'] = $opt['hostname'];
 
-               if ( ! empty($opt['base']) )
-                       $this->wp_base = $opt['base'];
-
                // Check if the options provided are OK.
                if ( empty ($opt['username']) )
                        $this->errors->add('empty_username', __('FTP username is required'));
@@ -54,6 +56,10 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
                        $this->options['password'] = $opt['password'];
        }
 
+       /**
+        *
+        * @return bool
+        */
        public function connect() {
                if ( ! $this->ftp )
                        return false;
@@ -83,7 +89,7 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
 
        /**
         * @param string $file
-        * @return bool|string
+        * @return false|string
         */
        public function get_contents( $file ) {
                if ( ! $this->exists($file) )
@@ -165,6 +171,10 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
                return $ret;
        }
 
+       /**
+        *
+        * @return string
+        */
        public function cwd() {
                $cwd = $this->ftp->pwd();
                if ( $cwd )
@@ -172,17 +182,13 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
                return $cwd;
        }
 
-       public function chdir($file) {
-               return $this->ftp->chdir($file);
-       }
-
        /**
+        *
         * @param string $file
-        * @param bool $group
-        * @param bool $recursive
+        * @return bool
         */
-       public function chgrp($file, $group, $recursive = false ) {
-               return false;
+       public function chdir($file) {
+               return $this->ftp->chdir($file);
        }
 
        /**
@@ -237,9 +243,9 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
                return $dir[$file]['group'];
        }
        /**
-        * @param string $source
-        * @param string $destination
-        * @param bool $overwrite
+        * @param string   $source
+        * @param string   $destination
+        * @param bool     $overwrite
         * @param int|bool $mode
         * @return bool
         */
@@ -256,7 +262,7 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
        /**
         * @param string $source
         * @param string $destination
-        * @param bool $overwrite
+        * @param bool   $overwrite
         * @return bool
         */
        public function move($source, $destination, $overwrite = false ) {
@@ -264,7 +270,7 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
        }
        /**
         * @param string $file
-        * @param bool $recursive
+        * @param bool   $recursive
         * @param string $type
         * @return bool
         */
@@ -285,6 +291,11 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
         */
        public function exists( $file ) {
                $list = $this->ftp->nlist( $file );
+
+               if ( empty( $list ) && $this->is_dir( $file ) ) {
+                       return true; // File is an empty directory.
+               }
+
                return !empty( $list ); //empty list = no file, so invert.
                // Return $this->ftp->is_exists($file); has issues with ABOR+426 responses on the ncFTPd server.
        }
@@ -365,9 +376,9 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
 
        /**
         * @param string $path
-        * @param mixed $chmod
-        * @param mixed $chown
-        * @param mixed $chgrp
+        * @param mixed  $chmod
+        * @param mixed  $chown
+        * @param mixed  $chgrp
         * @return bool
         */
        public function mkdir($path, $chmod = false, $chown = false, $chgrp = false ) {
@@ -380,10 +391,6 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
                if ( ! $chmod )
                        $chmod = FS_CHMOD_DIR;
                $this->chmod($path, $chmod);
-               if ( $chown )
-                       $this->chown($path, $chown);
-               if ( $chgrp )
-                       $this->chgrp($path, $chgrp);
                return true;
        }
 
@@ -397,8 +404,8 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
 
        /**
         * @param string $path
-        * @param bool $include_hidden
-        * @param bool $recursive
+        * @param bool   $include_hidden
+        * @param bool   $recursive
         * @return bool|array
         */
        public function dirlist($path = '.', $include_hidden = true, $recursive = false ) {
@@ -442,6 +449,9 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
                        if ( $struc['islink'] )
                                $struc['name'] = preg_replace( '/(\s*->\s*.*)$/', '', $struc['name'] );
 
+                       // Add the Octal representation of the file permissions
+                       $struc['permsn'] = $this->getnumchmodfromh( $struc['perms'] );
+
                        $ret[ $struc['name'] ] = $struc;
                }
 
@@ -450,6 +460,9 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
                return $ret;
        }
 
+       /**
+        * @access public
+        */
        public function __destruct() {
                $this->ftp->quit();
        }