Wordpress 3.1.1

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

diff --git a/wp-admin/includes/class-wp-filesystem-direct.php b/wp-admin/includes/class-wp-filesystem-direct.php
index 88e4a902a5982eb92b7d35a8a0e65f9c08b15d6e..94319bce0d3a7f2134eda1e68cfd45d4a4632858 100644 (file)
--- a/wp-admin/includes/class-wp-filesystem-direct.php
+++ b/wp-admin/includes/class-wp-filesystem-direct.php
@@ -19,7 +19,7 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
        /**
         * constructor
         *
        /**
         * constructor
         *

-        * @param $arg mixed ingored argument
+        * @param mixed $arg ingored argument

         */
        function WP_Filesystem_Direct($arg) {
                $this->method = 'direct';
         */
        function WP_Filesystem_Direct($arg) {
                $this->method = 'direct';


@@ -36,7 +36,7 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
        /**
         * Reads entire file into a string
         *
        /**
         * Reads entire file into a string
         *

-        * @param $file string Name of the file to read.
+        * @param string $file Name of the file to read.

         * @return string|bool The function returns the read data or false on failure.
         */
        function get_contents($file) {
         * @return string|bool The function returns the read data or false on failure.
         */
        function get_contents($file) {


@@ -45,7 +45,7 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
        /**
         * Reads entire file into an array
         *
        /**
         * Reads entire file into an array
         *

-        * @param $file string Path to the file.
+        * @param string $file Path to the file.

         * @return array|bool the file contents in an array or false on failure.
         */
        function get_contents_array($file) {
         * @return array|bool the file contents in an array or false on failure.
         */
        function get_contents_array($file) {


@@ -54,14 +54,13 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
        /**
         * Write a string to a file
         *
        /**
         * Write a string to a file
         *

-        * @param $file string Path to the file where to write the data.
-        * @param $contents string The data to write.
-        * @param $mode int (optional) The file permissions as octal number, usually 0644.
-        * @param $type string (optional) Specifies additional type of access you require to the file.
+        * @param string $file Remote path to the file where to write the data.
+        * @param string $contents The data to write.
+        * @param int $mode (optional) The file permissions as octal number, usually 0644.

         * @return bool False upon failure.
         */
         * @return bool False upon failure.
         */

-       function put_contents($file, $contents, $mode = false, $type = '') {
-               if ( ! ($fp = @fopen($file, 'w' . $type)) )
+       function put_contents($file, $contents, $mode = false ) {
+               if ( ! ($fp = @fopen($file, 'w')) )

                        return false;
                @fwrite($fp, $contents);
                @fclose($fp);
                        return false;
                @fwrite($fp, $contents);
                @fclose($fp);


@@ -79,7 +78,7 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
        /**
         * Change directory
         *
        /**
         * Change directory
         *

-        * @param $dir string The new current directory.
+        * @param string $dir The new current directory.

         * @return bool Returns true on success or false on failure.
         */
        function chdir($dir) {
         * @return bool Returns true on success or false on failure.
         */
        function chdir($dir) {


@@ -88,9 +87,9 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
        /**
         * Changes file group
         *
        /**
         * Changes file group
         *

-        * @param $file string Path to the file.
-        * @param $group mixed A group name or number.
-        * @param $recursive bool (optional) If set True changes file group recursivly. Defaults to False.
+        * @param string $file Path to the file.
+        * @param mixed $group A group name or number.
+        * @param bool $recursive (optional) If set True changes file group recursivly. Defaults to False.

         * @return bool Returns true on success or false on failure.
         */
        function chgrp($file, $group, $recursive = false) {
         * @return bool Returns true on success or false on failure.
         */
        function chgrp($file, $group, $recursive = false) {


@@ -111,15 +110,12 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
        /**
         * Changes filesystem permissions
         *
        /**
         * Changes filesystem permissions
         *

-        * @param $file string Path to the file.
-        * @param $mode int (optional) The permissions as octal number, usually 0644 for files, 0755 for dirs.
-        * @param $recursive bool (optional) If set True changes file group recursivly. Defaults to False.
+        * @param string $file Path to the file.
+        * @param int $mode (optional) The permissions as octal number, usually 0644 for files, 0755 for dirs.
+        * @param bool $recursive (optional) If set True changes file group recursivly. Defaults to False.

         * @return bool Returns true on success or false on failure.
         */
        function chmod($file, $mode = false, $recursive = false) {
         * @return bool Returns true on success or false on failure.
         */
        function chmod($file, $mode = false, $recursive = false) {

-               if ( ! $this->exists($file) )
-                       return false;
-

                if ( ! $mode ) {
                        if ( $this->is_file($file) )
                                $mode = FS_CHMOD_FILE;
                if ( ! $mode ) {
                        if ( $this->is_file($file) )
                                $mode = FS_CHMOD_FILE;


@@ -129,14 +125,12 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
                                return false;
                }
 
                                return false;
                }
 

-               if ( ! $recursive )
-                       return @chmod($file, $mode);
-               if ( ! $this->is_dir($file) )
+               if ( ! $recursive || ! $this->is_dir($file) )

                        return @chmod($file, $mode);
                //Is a directory, and we want recursive
                $file = trailingslashit($file);
                $filelist = $this->dirlist($file);
                        return @chmod($file, $mode);
                //Is a directory, and we want recursive
                $file = trailingslashit($file);
                $filelist = $this->dirlist($file);

-               foreach ($filelist as $filename)
+               foreach ( (array)$filelist as $filename => $filemeta)

                        $this->chmod($file . $filename, $mode, $recursive);
 
                return true;
                        $this->chmod($file . $filename, $mode, $recursive);
 
                return true;


@@ -144,9 +138,9 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
        /**
         * Changes file owner
         *
        /**
         * Changes file owner
         *

-        * @param $file string Path to the file.
-        * @param $owner mixed A user name or number.
-        * @param $recursive bool (optional) If set True changes file owner recursivly. Defaults to False.
+        * @param string $file Path to the file.
+        * @param mixed $owner A user name or number.
+        * @param bool $recursive (optional) If set True changes file owner recursivly. Defaults to False.

         * @return bool Returns true on success or false on failure.
         */
        function chown($file, $owner, $recursive = false) {
         * @return bool Returns true on success or false on failure.
         */
        function chown($file, $owner, $recursive = false) {


@@ -166,7 +160,7 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
        /**
         * Gets file owner
         *
        /**
         * Gets file owner
         *

-        * @param $file string Path to the file.
+        * @param string $file Path to the file.

         * @return string Username of the user.
         */
        function owner($file) {
         * @return string Username of the user.
         */
        function owner($file) {


@@ -183,7 +177,7 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
         *
         * FIXME does not handle errors in fileperms()
         *
         *
         * FIXME does not handle errors in fileperms()
         *

-        * @param $file string Path to the file.
+        * @param string $file Path to the file.

         * @return string Mode of the file (last 4 digits).
         */
        function getchmod($file) {
         * @return string Mode of the file (last 4 digits).
         */
        function getchmod($file) {


@@ -202,11 +196,18 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
        function copy($source, $destination, $overwrite = false) {
                if ( ! $overwrite && $this->exists($destination) )
                        return false;
        function copy($source, $destination, $overwrite = false) {
                if ( ! $overwrite && $this->exists($destination) )
                        return false;

+

                return copy($source, $destination);
        }
 
        function move($source, $destination, $overwrite = false) {
                return copy($source, $destination);
        }
 
        function move($source, $destination, $overwrite = false) {

-               //Possible to use rename()?
+               if ( ! $overwrite && $this->exists($destination) )
+                       return false;
+
+               // try using rename first.  if that fails (for example, source is read only) try copy
+               if ( @rename($source, $destination) )
+                       return true;
+

                if ( $this->copy($source, $destination, $overwrite) && $this->exists($destination) ) {
                        $this->delete($source);
                        return true;
                if ( $this->copy($source, $destination, $overwrite) && $this->exists($destination) ) {
                        $this->delete($source);
                        return true;


@@ -280,6 +281,11 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
        }
 
        function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {
        }
 
        function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {

+               // safe mode fails with a trailing slash under certain PHP versions.
+               $path = untrailingslashit($path);
+               if ( empty($path) )
+                       $path = '/';
+

                if ( ! $chmod )
                        $chmod = FS_CHMOD_DIR;
 
                if ( ! $chmod )
                        $chmod = FS_CHMOD_DIR;
 


@@ -294,17 +300,7 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
        }
 
        function rmdir($path, $recursive = false) {
        }
 
        function rmdir($path, $recursive = false) {

-               //Currently unused and untested, Use delete() instead.
-               if ( ! $recursive )
-                       return @rmdir($path);
-               //recursive:
-               $filelist = $this->dirlist($path);
-               foreach ($filelist as $filename => $det) {
-                       if ( '/' == substr($filename, -1, 1) )
-                               $this->rmdir($path . '/' . $filename, $recursive);
-                       @rmdir($filename);
-               }
-               return @rmdir($path);
+               return $this->delete($path, $recursive);

        }
 
        function dirlist($path, $include_hidden = true, $recursive = false) {
        }
 
        function dirlist($path, $include_hidden = true, $recursive = false) {