From c69821c5e044bb6db33f2cf9de59aaae4cb38db5 Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Fri, 21 Mar 2008 05:15:21 +0000
Subject: [PATCH] FTP find_base_dir fixes from DD32. see #5586

git-svn-id: http://svn.automattic.com/wordpress/trunk@7443 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/class-wp-filesystem-ftpext.php     | 11 +++++++----
 wp-admin/includes/class-wp-filesystem-ftpsockets.php | 11 +++++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/wp-admin/includes/class-wp-filesystem-ftpext.php b/wp-admin/includes/class-wp-filesystem-ftpext.php
index 12d56aa33b..32ccd07d60 100644
--- a/wp-admin/includes/class-wp-filesystem-ftpext.php
+++ b/wp-admin/includes/class-wp-filesystem-ftpext.php
@@ -84,7 +84,7 @@ class WP_Filesystem_FTPext{
 		$this->permission = $perm;
 	}
 
-	function find_base_dir($base = '.',$echo = false) {
+	function find_base_dir($base = '.',$echo = false, $loop = false) {
 		//Sanitize the Windows path formats, This allows easier conparison and aligns it to FTP output.
 		$abspath = str_replace('\\','/',ABSPATH); //windows: Straighten up the paths..
 		if( strpos($abspath, ':') ){ //Windows, Strip out the driveletter
@@ -98,7 +98,7 @@ class WP_Filesystem_FTPext{
 
 		//Can we see the Current directory as part of the ABSPATH?
 		$location = strpos($abspath, $base);
-		if( false !== $location ){
+		if( false !== $location ) {
 			$newbase = path_join($base, substr($abspath, $location + strlen($base)));
 
 			if( false !== $this->chdir($newbase) ){ //chdir sometimes returns null under certain circumstances, even when its changed correctly, FALSE will be returned if it doesnt change correctly.
@@ -126,7 +126,7 @@ class WP_Filesystem_FTPext{
 				//Lets try that folder:
 				$folder = path_join($base, $key);
 				if($echo) printf( __('Changing to %s') . '<br/>', $folder );
-				$ret = $this->find_base_dir( $folder, $echo);
+				$ret = $this->find_base_dir( $folder, $echo, $loop);
 				if( $ret )
 					return $ret;
 			}
@@ -136,7 +136,10 @@ class WP_Filesystem_FTPext{
 			if($echo) printf( __('Found %s'),  $base . 'wp-settings.php<br/>' );
 			return $base;
 		}
-		return false;
+		if( $loop )
+			return false;//Prevent tihs function looping again.
+		//As an extra last resort, Change back to / if the folder wasnt found. This comes into effect when the CWD is /home/user/ but WP is at /var/www/.... mainly dedicated setups.
+		return $this->find_base_dir('/', $echo, true); 
 	}
 
 	function get_base_dir($base = '.', $echo = false){
diff --git a/wp-admin/includes/class-wp-filesystem-ftpsockets.php b/wp-admin/includes/class-wp-filesystem-ftpsockets.php
index 11d4e83c22..53656236ac 100644
--- a/wp-admin/includes/class-wp-filesystem-ftpsockets.php
+++ b/wp-admin/includes/class-wp-filesystem-ftpsockets.php
@@ -86,7 +86,7 @@ class WP_Filesystem_ftpsockets{
 		$this->permission = $perm;
 	}
 
-	function find_base_dir($base = '.',$echo = false) {
+	function find_base_dir($base = '.',$echo = false, $loop = false) {
 		//Sanitize the Windows path formats, This allows easier conparison and aligns it to FTP output.
 		$abspath = str_replace('\\','/',ABSPATH); //windows: Straighten up the paths..
 		if( strpos($abspath, ':') ){ //Windows, Strip out the driveletter
@@ -100,7 +100,7 @@ class WP_Filesystem_ftpsockets{
 
 		//Can we see the Current directory as part of the ABSPATH?
 		$location = strpos($abspath, $base);
-		if( false !== $location ){
+		if( false !== $location ) {
 			$newbase = path_join($base, substr($abspath, $location + strlen($base)));
 
 			if( false !== $this->chdir($newbase) ){ //chdir sometimes returns null under certain circumstances, even when its changed correctly, FALSE will be returned if it doesnt change correctly.
@@ -128,7 +128,7 @@ class WP_Filesystem_ftpsockets{
 				//Lets try that folder:
 				$folder = path_join($base, $key);
 				if($echo) printf( __('Changing to %s') . '<br/>', $folder );
-				$ret = $this->find_base_dir( $folder, $echo);
+				$ret = $this->find_base_dir( $folder, $echo, $loop);
 				if( $ret )
 					return $ret;
 			}
@@ -138,7 +138,10 @@ class WP_Filesystem_ftpsockets{
 			if($echo) printf( __('Found %s'),  $base . 'wp-settings.php<br/>' );
 			return $base;
 		}
-		return false;
+		if( $loop )
+			return false;//Prevent tihs function looping again.
+		//As an extra last resort, Change back to / if the folder wasnt found. This comes into effect when the CWD is /home/user/ but WP is at /var/www/.... mainly dedicated setups.
+		return $this->find_base_dir('/', $echo, true); 
 	}
 
 	function get_base_dir($base = '.', $echo = false){