WordPress 3.3.2-scripts

[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 538a683e8261c688ea94d29d859c3d1b0e4d05c0..ebd64b3e8236d61e95700c89d66c6624852e1a2f 100644 (file)
--- a/wp-admin/includes/class-wp-filesystem-direct.php
+++ b/wp-admin/includes/class-wp-filesystem-direct.php
@@ -19,9 +19,9 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
        /**
         * constructor
         *
-        * @param $arg mixed ingored argument
+        * @param mixed $arg ignored argument
         */
-       function WP_Filesystem_Direct($arg) {
+       function __construct($arg) {
                $this->method = 'direct';
                $this->errors = new WP_Error();
        }
@@ -36,7 +36,7 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
        /**
         * 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) {
@@ -45,7 +45,7 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
        /**
         * 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) {
@@ -54,9 +54,9 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
        /**
         * Write a string to a file
         *
-        * @param $file string Remote 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 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.
         */
        function put_contents($file, $contents, $mode = false ) {
@@ -78,7 +78,7 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
        /**
         * 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) {
@@ -87,9 +87,9 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
        /**
         * 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 recursively. Defaults to False.
         * @return bool Returns true on success or false on failure.
         */
        function chgrp($file, $group, $recursive = false) {
@@ -110,9 +110,9 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
        /**
         * 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 recursively. Defaults to False.
         * @return bool Returns true on success or false on failure.
         */
        function chmod($file, $mode = false, $recursive = false) {
@@ -138,9 +138,9 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
        /**
         * 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 recursively. Defaults to False.
         * @return bool Returns true on success or false on failure.
         */
        function chown($file, $owner, $recursive = false) {
@@ -160,7 +160,7 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
        /**
         * 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) {
@@ -177,7 +177,7 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
         *
         * 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) {
@@ -193,11 +193,14 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
                return $grouparray['name'];
        }
 
-       function copy($source, $destination, $overwrite = false) {
+       function copy($source, $destination, $overwrite = false, $mode = false) {
                if ( ! $overwrite && $this->exists($destination) )
                        return false;
 
-               return copy($source, $destination);
+               $rtval = copy($source, $destination);
+               if ( $mode )
+                       $this->chmod($destination, $mode);
+               return $rtval;
        }
 
        function move($source, $destination, $overwrite = false) {
@@ -216,12 +219,12 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
                }
        }
 
-       function delete($file, $recursive = false) {
+       function delete($file, $recursive = false, $type = false) {
                if ( empty($file) ) //Some filesystems report this as /, which can cause non-expected recursive deletion of all files in the filesystem.
                        return false;
-               $file = str_replace('\\', '/', $file); //for win32, occasional problems deleteing files otherwise
+               $file = str_replace('\\', '/', $file); //for win32, occasional problems deleting files otherwise
 
-               if ( $this->is_file($file) )
+               if ( 'f' == $type || $this->is_file($file) )
                        return @unlink($file);
                if ( ! $recursive && $this->is_dir($file) )
                        return @rmdir($file);
@@ -233,7 +236,7 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
                $retval = true;
                if ( is_array($filelist) ) //false if no files, So check first.
                        foreach ($filelist as $filename => $fileinfo)
-                               if ( ! $this->delete($file . $filename, $recursive) )
+                               if ( ! $this->delete($file . $filename, $recursive, $fileinfo['type']) )
                                        $retval = false;
 
                if ( file_exists($file) && ! @rmdir($file) )
@@ -284,7 +287,7 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
                // safe mode fails with a trailing slash under certain PHP versions.
                $path = untrailingslashit($path);
                if ( empty($path) )
-                       $path = '/';
+                       return false;
 
                if ( ! $chmod )
                        $chmod = FS_CHMOD_DIR;