Changeset 9117

Timestamp:

10/10/2008 10:02:46 AM (16 years ago)

Author:

azaozz

Message:

Fix for "Unable to locate WordPress directory" on core update and PHPDoc for class-wp-filesystem-base.php, props DD32, fixes #7861

File:

• trunk/wp-admin/includes/class-wp-filesystem-base.php (modified) (8 diffs)

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

@@ -13 +13 @@
  */
 class WP_Filesystem_Base {
+
+
+
+
+
+
+
     var $verbose = false;
+
+
+
+
+
+
+
     var $cache = array();
 
+
+
+
+
+
+
+
     var $method = '';
 
+
+
+
+
+
+
+
     function abspath() {
         if ( defined('FTP_BASE') && strpos($this->method, 'ftp') !== false )
@@ -23 +51 @@
         return $this->find_folder(ABSPATH);
     }
+
+
+
+
+
+
+
     function wp_content_dir() {
         if ( defined('FTP_CONTENT_DIR') && strpos($this->method, 'ftp') !== false )
@@ -28 +63 @@
         return $this->find_folder(WP_CONTENT_DIR);
     }
+
+
+
+
+
+
+
+
     function wp_plugins_dir() {
         if ( defined('FTP_PLUGIN_DIR') && strpos($this->method, 'ftp') !== false )
@@ -33 +76 @@
         return $this->find_folder(WP_PLUGIN_DIR);
     }
+
+
+
+
+
+
+
+
     function wp_themes_dir() {
         return $this->wp_content_dir() . '/themes';
     }
-    //Back compat: use abspath() or wp_*_dir
+    
+    /**
+     * Locates a folder on the remote filesystem.
+     *
+     * Deprecated; use WP_Filesystem::abspath() or WP_Filesystem::wp_*_dir() methods instead.
+     *
+     * @since 2.5
+     * @deprecated 2.7
+     * @access public
+     *
+     * @param string $base The folder to start searching from
+     * @param bool $echo True to display debug information
+     * @return string The location of the remote path.
+     */
     function find_base_dir($base = '.', $echo = false) {
+
         $this->verbose = $echo;
         return $this->abspath();
     }
-    //Back compat: use ::abspath() or ::wp_*_dir
+    /**
+     * Locates a folder on the remote filesystem.
+     *
+     * Deprecated; use WP_Filesystem::abspath() or WP_Filesystem::wp_*_dir() methods instead.
+     *
+     * @since 2.5
+     * @deprecated 2.7
+     * @access public
+     *
+     * @param string $base The folder to start searching from
+     * @param bool $echo True to display debug information
+     * @return string The location of the remote path.
+     */
     function get_base_dir($base = '.', $echo = false) {
+
         $this->verbose = $echo;
         return $this->abspath();
     }
 
+
+
+
+
+
+
+
+
+
+
+
+
     function find_folder($folder) {
-        $folder = str_replace('\\', '/', $folder); //Windows Sanitiation
+
+        $folder = preg_replace('|^([a-z]{1}):|i', '', $folder); //Strip out windows driveletter if its there.
+        $folder = str_replace('\\', '/', $folder); //Windows path sanitiation
+
         if ( isset($this->cache[ $folder ] ) )
             return $this->cache[ $folder ];
@@ -61 +154 @@
     }
 
-    // Assumes $folder is windows sanitized;
-    // Assumes that the drive letter is safe to be stripped off, Should not be a problem for windows servers.
+    /**
+     * Locates a folder on the remote filesystem.
+     *
+     * Expects Windows sanitized path
+     *
+     * @since 2.7
+     * @access private
+     * 
+     * @param string $folder the folder to locate
+     * @param string $base the folder to start searching from
+     * @param bool $loop if the function has recursed, Internal use only
+     * @return string The location of the remote path.
+     */
     function search_for_folder($folder, $base = '.', $loop = false ) {
         if ( empty( $base ) || '.' == $base )
             $base = trailingslashit($this->cwd());
 
-        $folder = preg_replace('|^([a-z]{1}):|i', '', $folder); //Strip out windows driveletter if its there.
+        $folder = 
 
         $folder_parts = explode('/', $folder);
@@ -105 +209 @@
     }
 
-    //Common Helper functions.
+    /**
+     * Returns the *nix style file permissions for a file
+     *
+     * From the PHP documentation page for fileperms()
+     *
+     * @link http://docs.php.net/fileperms
+     * @since 2.5
+     * @access public
+     *
+     * @param string $file string filename
+     * @return int octal representation of permissions
+     */
     function gethchmod($file){
-        //From the PHP.net page for ...?
         $perms = $this->getchmod($file);
         if (($perms & 0xC000) == 0xC000) // Socket
@@ -148 +262 @@
         return $info;
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     function getnumchmodfromh($mode) {
-        $realmode = "";
-        $legal =  array("", "w", "r", "x", "-");
-        $attarray = preg_split("//", $mode);
+        $realmode = ;
+        $legal =  array();
+        $attarray = preg_split(, $mode);
 
         for($i=0; $i < count($attarray); $i++)
@@ -169 +297 @@
 
     /**
-    * Determines if the string provided contains binary characters.
-    *
-    * @since 2.7
-    * @package WordPress
-    * @subpackage WP_Filesystem
-    *
-    * @param string $text String to test against
-    *
-    */
+     * Determines if the string provided contains binary characters.
+     *
+     * @since 2.7
+     * @access private
+     *
+     * @param string $text String to test against
+     * @return bool true if string is binary, false otherwise
+     */
     function is_binary( $text ) {
         return (bool) preg_match('|[^\x20-\x7E]|', $text); //chr(32)..chr(127)