Changeset 25305 for trunk/src/wp-admin/includes/class-wp-filesystem-direct.php

Timestamp:

09/09/2013 02:54:50 AM (12 years ago)

Author:

dd32

Message:

WP_Filesystem: Let the code breathe, add some additional whitespace between method definitions and comments.

File:

• trunk/src/wp-admin/includes/class-wp-filesystem-direct.php (modified) (18 diffs)

trunk/src/wp-admin/includes/class-wp-filesystem-direct.php

@@ -26 +26 @@
         $this->errors = new WP_Error();
     }
+
     /**
      * connect filesystem.
@@ -34 +35 @@
         return true;
     }
+
     /**
      * Reads entire file into a string
@@ -43 +45 @@
         return @file_get_contents($file);
     }
+
     /**
      * Reads entire file into an array
@@ -52 +55 @@
         return @file($file);
     }
+
     /**
      * Write a string to a file
@@ -76 +80 @@
         return true;
     }
+
     /**
      * Gets the current working directory
@@ -84 +89 @@
         return @getcwd();
     }
+
     /**
      * Change directory
@@ -93 +99 @@
         return @chdir($dir);
     }
+
     /**
      * Changes file group
@@ -108 +115 @@
         if ( ! $this->is_dir($file) )
             return @chgrp($file, $group);
-        //Is a directory, and we want recursive
+        // Is a directory, and we want recursive
         $file = trailingslashit($file);
         $filelist = $this->dirlist($file);
@@ -116 +123 @@
         return true;
     }
+
     /**
      * Changes filesystem permissions
@@ -136 +144 @@
         if ( ! $recursive || ! $this->is_dir($file) )
             return @chmod($file, $mode);
-        //Is a directory, and we want recursive
+        // Is a directory, and we want recursive
         $file = trailingslashit($file);
         $filelist = $this->dirlist($file);
@@ -144 +152 @@
         return true;
     }
+
     /**
      * Changes file owner
@@ -159 +168 @@
         if ( ! $this->is_dir($file) )
             return @chown($file, $owner);
-        //Is a directory, and we want recursive
+        // Is a directory, and we want recursive
         $filelist = $this->dirlist($file);
         foreach ($filelist as $filename) {
@@ -166 +175 @@
         return true;
     }
+
     /**
      * Gets file owner
@@ -181 +191 @@
         return $ownerarray['name'];
     }
+
     /**
      * Gets file permissions
@@ -192 +203 @@
         return substr(decoct(@fileperms($file)),3);
     }
+
     function group($file) {
         $gid = @filegroup($file);
@@ -229 +241 @@
 
     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 deleting files otherwise
+        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 deleting files otherwise
 
         if ( 'f' == $type || $this->is_file($file) )
@@ -238 +250 @@
             return @rmdir($file);
 
-        //At this point it's a folder, and we're in recursive mode
+        // At this point it's a folder, and we're in recursive mode
         $file = trailingslashit($file);
         $filelist = $this->dirlist($file, true);
 
         $retval = true;
-        if ( is_array($filelist) ) //false if no files, So check first.
-            foreach ($filelist as $filename => $fileinfo)
+        if ( is_array( $filelist ) ) {
+            foreach ( $filelist as $filename => $fileinfo ) {
                 if ( ! $this->delete($file . $filename, $recursive, $fileinfo['type']) )
                     $retval = false;
+            }
+        }
 
         if ( file_exists($file) && ! @rmdir($file) )
             $retval = false;
+
         return $retval;
     }
@@ -280 +295 @@
         return @filemtime($file);
     }
+
     function size($file) {
         return @filesize($file);