Changeset 25305 for trunk/src/wp-admin/includes/class-wp-filesystem-base.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-base.php (modified) (10 diffs)

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

@@ -21 +21 @@
      */
     var $verbose = false;
+
     /**
      * Cached list of local filepaths to mapped remote filepaths.
@@ -48 +49 @@
     function abspath() {
         $folder = $this->find_folder(ABSPATH);
-        //Perhaps the FTP folder is rooted at the WordPress install, Check for wp-includes folder in root, Could have some false positives, but rare.
+        // Perhaps the FTP folder is rooted at the WordPress install, Check for wp-includes folder in root, Could have some false positives, but rare.
         if ( ! $folder && $this->is_dir('/wp-includes') )
             $folder = '/';
         return $folder;
     }
+
     /**
      * Returns the path on the remote filesystem of WP_CONTENT_DIR
@@ -63 +65 @@
         return $this->find_folder(WP_CONTENT_DIR);
     }
+
     /**
      * Returns the path on the remote filesystem of WP_PLUGIN_DIR
@@ -74 +77 @@
         return $this->find_folder(WP_PLUGIN_DIR);
     }
+
     /**
      * Returns the path on the remote filesystem of the Themes Directory
@@ -92 +96 @@
         return $this->find_folder( $theme_root );
     }
+
     /**
      * Returns the path on the remote filesystem of WP_LANG_DIR
@@ -122 +127 @@
         return $this->abspath();
     }
+
     /**
      * Locates a folder on the remote filesystem.
@@ -189 +195 @@
             }
         } elseif ( 'direct' == $this->method ) {
-            $folder = str_replace('\\', '/', $folder); //Windows path sanitisation
+            $folder = str_replace('\\', '/', $folder); // Windows path sanitisation
             return trailingslashit($folder);
         }
 
-        $folder = preg_replace('|^([a-z]{1}):|i', '', $folder); //Strip out windows drive letter if it's there.
-        $folder = str_replace('\\', '/', $folder); //Windows path sanitisation
+        $folder = preg_replace('|^([a-z]{1}):|i', '', $folder); // Strip out windows drive letter if it's there.
+        $folder = str_replace('\\', '/', $folder); // Windows path sanitisation
 
         if ( isset($this->cache[ $folder ] ) )
             return $this->cache[ $folder ];
 
-        if ( $this->exists($folder) ) { //Folder exists at that absolute path.
+        if ( $this->exists($folder) ) { // Folder exists at that absolute path.
             $folder = trailingslashit($folder);
             $this->cache[ $folder ] = $folder;
@@ -240 +246 @@
         foreach ( $folder_parts as $index => $key ) {
             if ( $index == $last_index )
-                continue; //We want this to be caught by the next code block.
-
-            //Working from /home/ to /user/ to /wordpress/ see if that file exists within the current folder,
+                continue; // We want this to be caught by the next code block.
+
+            // Working from /home/ to /user/ to /wordpress/ see if that file exists within the current folder,
             // If it's found, change into it and follow through looking for it.
             // If it cant find WordPress down that route, it'll continue onto the next folder level, and see if that matches, and so on.
             // If it reaches the end, and still cant find it, it'll return false for the entire function.
             if ( isset($files[ $key ]) ){
-                //Lets try that folder:
+                // Lets try that folder:
                 $newdir = trailingslashit(path_join($base, $key));
                 if ( $this->verbose )
@@ -258 +264 @@
         }
 
-        //Only check this as a last resort, to prevent locating the incorrect install. All above procedures will fail quickly if this is the right branch to take.
+        // Only check this as a last resort, to prevent locating the incorrect install. All above procedures will fail quickly if this is the right branch to take.
         if (isset( $files[ $last_path ] ) ) {
             if ( $this->verbose )
@@ -373 +379 @@
      */
     function is_binary( $text ) {
-        return (bool) preg_match('|[^\x20-\x7E]|', $text); //chr(32)..chr(127)
+        return (bool) preg_match( '|[^\x20-\x7E]|', $text ); // chr(32)..chr(127)
     }
 }