Changeset 9117

Timestamp:

10/10/08 10:02:46 (2 months 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

Files:

• 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 {
+    /**
+     * Whether to display debug data for the connection or not.
+     *
+     * @since 2.5
+     * @access public
+     * @var bool
+     */
-    var $verbose = false;
+    /**
+     * Cached list of local filepaths to maped remote filepaths.
+     *
+     * @since 2.7
+     * @access private
+     * @var array
+     */
-    var $cache = array();
-
+    /**
+     * The Access method of the current connection, Set automatically.
+     *
+     * @since 2.5
+     * @access public
+     * @var string
+     */
-    var $method = '';
-
+    /**
+     * Returns the path on the remote filesystem of ABSPATH
+     *
+     * @since 2.7
+     * @access public
+     * @return string The location of the remote path.
+     */
-    function abspath() {
-        if ( defined('FTP_BASE') && strpos($this->method, 'ftp') !== false )
@@ -23 +51 @@
-        return $this->find_folder(ABSPATH);
-    }
+    /**
+     * Returns the path on the remote filesystem of WP_CONTENT_DIR
+     *
+     * @since 2.7
+     * @access public
+     * @return string The location of the remote path.
+     */
-    function wp_content_dir() {
-        if ( defined('FTP_CONTENT_DIR') && strpos($this->method, 'ftp') !== false )
@@ -28 +63 @@
-        return $this->find_folder(WP_CONTENT_DIR);
-    }
+    /**
+     * Returns the path on the remote filesystem of WP_PLUGIN_DIR
+     *
+     * @since 2.7
+     * @access public
+     *
+     * @return string The location of the remote path.
+     */
-    function wp_plugins_dir() {
-        if ( defined('FTP_PLUGIN_DIR') && strpos($this->method, 'ftp') !== false )
@@ -33 +76 @@
-        return $this->find_folder(WP_PLUGIN_DIR);
-    }
+    /**
+     * Returns the path on the remote filesystem of the Themes Directory
+     *
+     * @since 2.7
+     * @access public
+     *
+     * @return string The location of the remote path.
+     */
-    function wp_themes_dir() {
-        return $this->wp_content_dir() . '/themes';
-    }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    function find_base_dir($base = '.', $echo = false) {
+        _deprecated_function(__FUNCTION__, '2.7', 'WP_Filesystem::abspath() or WP_Filesystem::wp_*_dir()' );
-        $this->verbose = $echo;
-        return $this->abspath();
-    }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    function get_base_dir($base = '.', $echo = false) {
+        _deprecated_function(__FUNCTION__, '2.7', 'WP_Filesystem::abspath() or WP_Filesystem::wp_*_dir()' );
-        $this->verbose = $echo;
-        return $this->abspath();
-    }
-
+    /**
+     * Locates a folder on the remote filesystem.
+     *
+     * Assumes that on Windows systems, Stripping off the Drive letter is OK
+     * Sanitizes \\ to / in windows filepaths.
+     *
+     * @since 2.7
+     * @access public
+     * 
+     * @param string $folder the folder to locate
+     * @return string The location of the remote path.
+     */
-    function find_folder($folder) {
-
+
+
+
+
-        if ( isset($this->cache[ $folder ] ) )
-            return $this->cache[ $folder ];
@@ -61 +154 @@
-    }
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    function search_for_folder($folder, $base = '.', $loop = false ) {
-        if ( empty( $base ) || '.' == $base )
-            $base = trailingslashit($this->cwd());
-
-preg_replace('|^([a-z]{1}):|i', '', $folder); //Strip out windows driveletter if its there.
+untrailingslashit($folder);
-
-        $folder_parts = explode('/', $folder);
@@ -105 +209 @@
-    }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-    function gethchmod($file){
-        //From the PHP.net page for ...?
-        $perms = $this->getchmod($file);
-        if (($perms & 0xC000) == 0xC000) // Socket
@@ -148 +262 @@
-        return $info;
-    }
+
+    /**
+     * Converts *nix style file permissions to a octal number.
+     *
+     * Converts '-rw-r--r--' to 0644
+     * From "info at rvgate dot nl"'s comment on the PHP documentation for chmod()
+     *
+     * @link http://docs.php.net/manual/en/function.chmod.php#49614
+     * @since 2.5
+     * @access public
+     *
+     * @param string $mode string *nix style file permission
+     * @return int octal representation
+     */
-    function getnumchmodfromh($mode) {
-""
-"", "w", "r", "x", "-"
-"//"
+''
+'', 'w', 'r', 'x', '-'
+'//'
-
-        for($i=0; $i < count($attarray); $i++)
@@ -169 +297 @@
-
-    /**
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    function is_binary( $text ) {
-        return (bool) preg_match('|[^\x20-\x7E]|', $text); //chr(32)..chr(127)