WordPress 4.7.1-scripts

[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 ec85d36b7b81ba0ee527baffc75fe8226b3e79ea..ff0b882414be3c22453a6eed50adb7fb1711039e 100644 (file)
--- a/wp-admin/includes/class-wp-filesystem-ftpsockets.php
+++ b/wp-admin/includes/class-wp-filesystem-ftpsockets.php
@@ -16,11 +16,17 @@
  */
 class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
        /**
  */
 class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
        /**

+        * @access public

         * @var ftp
         */
        public $ftp;
 
         * @var ftp
         */
        public $ftp;
 

-       public function __construct($opt = '') {
+       /**
+        * @access public
+        *
+        * @param array $opt
+        */
+       public function __construct( $opt  = '' ) {

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


@@ -33,7 +39,7 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
                if ( empty($opt['port']) )
                        $this->options['port'] = 21;
                else
                if ( empty($opt['port']) )
                        $this->options['port'] = 21;
                else

-                       $this->options['port'] = $opt['port'];
+                       $this->options['port'] = (int) $opt['port'];

 
                if ( empty($opt['hostname']) )
                        $this->errors->add('empty_hostname', __('FTP hostname is required'));
 
                if ( empty($opt['hostname']) )
                        $this->errors->add('empty_hostname', __('FTP hostname is required'));


@@ -52,24 +58,44 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
                        $this->options['password'] = $opt['password'];
        }
 
                        $this->options['password'] = $opt['password'];
        }
 

+       /**
+        * @access public
+        *
+        * @return bool
+        */

        public function connect() {
                if ( ! $this->ftp )
                        return false;
 
                $this->ftp->setTimeout(FS_CONNECT_TIMEOUT);
 
        public function connect() {
                if ( ! $this->ftp )
                        return false;
 
                $this->ftp->setTimeout(FS_CONNECT_TIMEOUT);
 

-               if ( ! $this->ftp->SetServer($this->options['hostname'], $this->options['port']) ) {
-                       $this->errors->add('connect', sprintf(__('Failed to connect to FTP Server %1$s:%2$s'), $this->options['hostname'], $this->options['port']));
+               if ( ! $this->ftp->SetServer( $this->options['hostname'], $this->options['port'] ) ) {
+                       $this->errors->add( 'connect',
+                               /* translators: %s: hostname:port */
+                               sprintf( __( 'Failed to connect to FTP Server %s' ),
+                                       $this->options['hostname'] . ':' . $this->options['port']
+                               )
+                       );

                        return false;
                }
 
                if ( ! $this->ftp->connect() ) {
                        return false;
                }
 
                if ( ! $this->ftp->connect() ) {

-                       $this->errors->add('connect', sprintf(__('Failed to connect to FTP Server %1$s:%2$s'), $this->options['hostname'], $this->options['port']));
+                       $this->errors->add( 'connect',
+                               /* translators: %s: hostname:port */
+                               sprintf( __( 'Failed to connect to FTP Server %s' ),
+                                       $this->options['hostname'] . ':' . $this->options['port']
+                               )
+                       );

                        return false;
                }
 
                        return false;
                }
 

-               if ( ! $this->ftp->login($this->options['username'], $this->options['password']) ) {
-                       $this->errors->add('auth', sprintf(__('Username/Password incorrect for %s'), $this->options['username']));
+               if ( ! $this->ftp->login( $this->options['username'], $this->options['password'] ) ) {
+                       $this->errors->add( 'auth',
+                               /* translators: %s: username */
+                               sprintf( __( 'Username/Password incorrect for %s' ),
+                                       $this->options['username']
+                               )
+                       );

                        return false;
                }
 
                        return false;
                }
 


@@ -80,8 +106,14 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
        }
 
        /**
        }
 
        /**

-        * @param string $file
-        * @return false|string
+        * Retrieves the file contents.
+        *
+        * @since 2.5.0
+        * @access public
+        *
+        * @param string $file Filename.
+        * @return string|false File contents on success, false if no temp file could be opened,
+        *                      or if the file doesn't exist.

         */
        public function get_contents( $file ) {
                if ( ! $this->exists($file) )
         */
        public function get_contents( $file ) {
                if ( ! $this->exists($file) )


@@ -89,8 +121,10 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
 
                $temp = wp_tempnam( $file );
 
 
                $temp = wp_tempnam( $file );
 

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

                        return false;
                        return false;

+               }

 
                mbstring_binary_safe_encoding();
 
 
                mbstring_binary_safe_encoding();
 


@@ -115,7 +149,10 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
                unlink($temp);
                return $contents;
        }
                unlink($temp);
                return $contents;
        }

+

        /**
        /**

+        * @access public
+        *

         * @param string $file
         * @return array
         */
         * @param string $file
         * @return array
         */


@@ -124,6 +161,8 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
        }
 
        /**
        }
 
        /**

+        * @access public
+        *

         * @param string $file
         * @param string $contents
         * @param int|bool $mode
         * @param string $file
         * @param string $contents
         * @param int|bool $mode


@@ -163,6 +202,11 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
                return $ret;
        }
 
                return $ret;
        }
 

+       /**
+        * @access public
+        *
+        * @return string
+        */

        public function cwd() {
                $cwd = $this->ftp->pwd();
                if ( $cwd )
        public function cwd() {
                $cwd = $this->ftp->pwd();
                if ( $cwd )


@@ -170,11 +214,19 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
                return $cwd;
        }
 
                return $cwd;
        }
 

+       /**
+        * @access public
+        *
+        * @param string $file
+        * @return bool
+        */

        public function chdir($file) {
                return $this->ftp->chdir($file);
        }
 
        /**
        public function chdir($file) {
                return $this->ftp->chdir($file);
        }
 
        /**

+        * @access public
+        *

         * @param string $file
         * @param int|bool $mode
         * @param bool $recursive
         * @param string $file
         * @param int|bool $mode
         * @param bool $recursive


@@ -202,6 +254,8 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
        }
 
        /**
        }
 
        /**

+        * @access public
+        *

         * @param string $file
         * @return string
         */
         * @param string $file
         * @return string
         */


@@ -209,7 +263,10 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
                $dir = $this->dirlist($file);
                return $dir[$file]['owner'];
        }
                $dir = $this->dirlist($file);
                return $dir[$file]['owner'];
        }

+

        /**
        /**

+        * @access public
+        *

         * @param string $file
         * @return string
         */
         * @param string $file
         * @return string
         */


@@ -217,7 +274,10 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
                $dir = $this->dirlist($file);
                return $dir[$file]['permsn'];
        }
                $dir = $this->dirlist($file);
                return $dir[$file]['permsn'];
        }

+

        /**
        /**

+        * @access public
+        *

         * @param string $file
         * @return string
         */
         * @param string $file
         * @return string
         */


@@ -225,10 +285,13 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
                $dir = $this->dirlist($file);
                return $dir[$file]['group'];
        }
                $dir = $this->dirlist($file);
                return $dir[$file]['group'];
        }

+

        /**
        /**

-        * @param string $source
-        * @param string $destination
-        * @param bool $overwrite
+        * @access public
+        *
+        * @param string   $source
+        * @param string   $destination
+        * @param bool     $overwrite

         * @param int|bool $mode
         * @return bool
         */
         * @param int|bool $mode
         * @return bool
         */


@@ -242,18 +305,24 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
 
                return $this->put_contents($destination, $content, $mode);
        }
 
                return $this->put_contents($destination, $content, $mode);
        }

+

        /**
        /**

+        * @access public
+        *

         * @param string $source
         * @param string $destination
         * @param string $source
         * @param string $destination

-        * @param bool $overwrite
+        * @param bool   $overwrite

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

+

        /**
        /**

+        * @access public
+        *

         * @param string $file
         * @param string $file

-        * @param bool $recursive
+        * @param bool   $recursive

         * @param string $type
         * @return bool
         */
         * @param string $type
         * @return bool
         */


@@ -269,6 +338,8 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
        }
 
        /**
        }
 
        /**

+        * @access public
+        *

         * @param string $file
         * @return bool
         */
         * @param string $file
         * @return bool
         */


@@ -284,6 +355,8 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
        }
 
        /**
        }
 
        /**

+        * @access public
+        *

         * @param string $file
         * @return bool
         */
         * @param string $file
         * @return bool
         */


@@ -296,6 +369,8 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
        }
 
        /**
        }
 
        /**

+        * @access public
+        *

         * @param string $path
         * @return bool
         */
         * @param string $path
         * @return bool
         */


@@ -309,6 +384,8 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
        }
 
        /**
        }
 
        /**

+        * @access public
+        *

         * @param string $file
         * @return bool
         */
         * @param string $file
         * @return bool
         */


@@ -317,6 +394,8 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
        }
 
        /**
        }
 
        /**

+        * @access public
+        *

         * @param string $file
         * @return bool
         */
         * @param string $file
         * @return bool
         */


@@ -325,6 +404,8 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
        }
 
        /**
        }
 
        /**

+        * @access public
+        *

         * @param string $file
         * @return bool
         */
         * @param string $file
         * @return bool
         */


@@ -333,6 +414,8 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
        }
 
        /**
        }
 
        /**

+        * @access public
+        *

         * @param string $file
         * @return int
         */
         * @param string $file
         * @return int
         */


@@ -347,7 +430,10 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
        public function size($file) {
                return $this->ftp->filesize($file);
        }
        public function size($file) {
                return $this->ftp->filesize($file);
        }

+

        /**
        /**

+        * @access public
+        *

         * @param string $file
         * @param int $time
         * @param int $atime
         * @param string $file
         * @param int $time
         * @param int $atime


@@ -358,10 +444,12 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
        }
 
        /**
        }
 
        /**

+        * @access public
+        *

         * @param string $path
         * @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 ) {
         * @return bool
         */
        public function mkdir($path, $chmod = false, $chown = false, $chgrp = false ) {


@@ -378,7 +466,9 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
        }
 
        /**
        }
 
        /**

-        * @param sting $path
+        * @access public
+        *
+        * @param string $path

         * @param bool $recursive
         */
        public function rmdir($path, $recursive = false ) {
         * @param bool $recursive
         */
        public function rmdir($path, $recursive = false ) {


@@ -386,9 +476,11 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
        }
 
        /**
        }
 
        /**

+        * @access public
+        *

         * @param string $path
         * @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 ) {
         * @return bool|array
         */
        public function dirlist($path = '.', $include_hidden = true, $recursive = false ) {


@@ -432,6 +524,9 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
                        if ( $struc['islink'] )
                                $struc['name'] = preg_replace( '/(\s*->\s*.*)$/', '', $struc['name'] );
 
                        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;
                }
 
                        $ret[ $struc['name'] ] = $struc;
                }
 


@@ -440,6 +535,9 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
                return $ret;
        }
 
                return $ret;
        }
 

+       /**
+        * @access public
+        */

        public function __destruct() {
                $this->ftp->quit();
        }
        public function __destruct() {
                $this->ftp->quit();
        }