X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/11be8dc178e77d0b46189bbd8e33a216a9b90942..refs/tags/wordpress-2.9:/wp-admin/includes/class-wp-filesystem-ftpext.php

diff --git a/wp-admin/includes/class-wp-filesystem-ftpext.php b/wp-admin/includes/class-wp-filesystem-ftpext.php
index a2805da8..b8d5c9ae 100644
--- a/wp-admin/includes/class-wp-filesystem-ftpext.php
+++ b/wp-admin/includes/class-wp-filesystem-ftpext.php
@@ -16,12 +16,9 @@
  */
 class WP_Filesystem_FTPext extends WP_Filesystem_Base {
 	var $link;
-	var $timeout = 5;
-	var $errors = array();
+	var $errors = null;
 	var $options = array();
 
-	var $permission = null;
-
 	function WP_Filesystem_FTPext($opt='') {
 		$this->method = 'ftpext';
 		$this->errors = new WP_Error();
@@ -33,6 +30,11 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base {
 		}
 
 		// Set defaults:
+		//This Class uses the timeout on a per-connection basis, Others use it on a per-action basis.
+
+		if ( ! defined('FS_TIMEOUT') )
+			define('FS_TIMEOUT', 240);
+
 		if ( empty($opt['port']) )
 			$this->options['port'] = 21;
 		else
@@ -47,28 +49,26 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base {
 			$this->wp_base = $opt['base'];
 
 		// Check if the options provided are OK.
-		if ( empty ($opt['username']) )
+		if ( empty($opt['username']) )
 			$this->errors->add('empty_username', __('FTP username is required'));
 		else
 			$this->options['username'] = $opt['username'];
 
-		if ( empty ($opt['password']) )
+		if ( empty($opt['password']) )
 			$this->errors->add('empty_password', __('FTP password is required'));
 		else
 			$this->options['password'] = $opt['password'];
 
 		$this->options['ssl'] = false;
-		if ( isset($opt['ssl']) )
-			$this->options['ssl'] = ( !empty($opt['ssl']) );
-		elseif ( isset( $opt['connection_type']) )
-			$this->options['ssl'] = ( 'ftps' == $opt['connection_type'] );
+		if ( isset($opt['connection_type']) && 'ftps' == $opt['connection_type'] )
+			$this->options['ssl'] = true;
 	}
 
 	function connect() {
-		if ( $this->options['ssl'] && function_exists('ftp_ssl_connect') )
-			$this->link = @ftp_ssl_connect($this->options['hostname'], $this->options['port'],$this->timeout);
+		if ( isset($this->options['ssl']) && $this->options['ssl'] && function_exists('ftp_ssl_connect') )
+			$this->link = @ftp_ssl_connect($this->options['hostname'], $this->options['port'], FS_CONNECT_TIMEOUT);
 		else
-			$this->link = @ftp_connect($this->options['hostname'], $this->options['port'],$this->timeout);
+			$this->link = @ftp_connect($this->options['hostname'], $this->options['port'], FS_CONNECT_TIMEOUT);
 
 		if ( ! $this->link ) {
 			$this->errors->add('connect', sprintf(__('Failed to connect to FTP Server %1$s:%2$s'), $this->options['hostname'], $this->options['port']));
@@ -82,23 +82,21 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base {
 
 		//Set the Connection to use Passive FTP
 		@ftp_pasv( $this->link, true );
+		if ( @ftp_get_option($this->link, FTP_TIMEOUT_SEC) < FS_TIMEOUT )
+			@ftp_set_option($this->link, FTP_TIMEOUT_SEC, FS_TIMEOUT);
 
 		return true;
 	}
 
-	function setDefaultPermissions($perm) {
-		$this->permission = $perm;
-	}
-
-	function get_contents($file, $type = '', $resumepos = 0 ){
-		if( empty($type) )
+	function get_contents($file, $type = '', $resumepos = 0 ) {
+		if ( empty($type) )
 			$type = FTP_BINARY;
 
 		$temp = tmpfile();
 		if ( ! $temp )
 			return false;
 
-		if( ! @ftp_fget($this->link, $temp, $file, $type, $resumepos) )
+		if ( ! @ftp_fget($this->link, $temp, $file, $type, $resumepos) )
 			return false;
 
 		fseek($temp, 0); //Skip back to the start of the file being written to
@@ -114,7 +112,7 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base {
 		return explode("\n", $this->get_contents($file));
 	}
 	function put_contents($file, $contents, $type = '' ) {
-		if( empty($type) )
+		if ( empty($type) )
 			$type = $this->is_binary($contents) ? FTP_BINARY : FTP_ASCII;
 
 		$temp = tmpfile();
@@ -131,23 +129,29 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base {
 	}
 	function cwd() {
 		$cwd = @ftp_pwd($this->link);
-		if( $cwd )
+		if ( $cwd )
 			$cwd = trailingslashit($cwd);
 		return $cwd;
 	}
 	function chdir($dir) {
-		return @ftp_chdir($dir);
+		return @ftp_chdir($this->link, $dir);
 	}
 	function chgrp($file, $group, $recursive = false ) {
 		return false;
 	}
 	function chmod($file, $mode = false, $recursive = false) {
-		if( ! $mode )
-			$mode = $this->permission;
-		if( ! $mode )
-			return false;
-		if ( ! $this->exists($file) )
+		if ( ! $this->exists($file) && ! $this->is_dir($file) )
 			return false;
+
+		if ( ! $mode ) {
+			if ( $this->is_file($file) )
+				$mode = FS_CHMOD_FILE;
+			elseif ( $this->is_dir($file) )
+				$mode = FS_CHMOD_DIR;
+			else
+				return false;
+		}
+
 		if ( ! $recursive || ! $this->is_dir($file) ) {
 			if ( ! function_exists('ftp_chmod') )
 				return @ftp_site($this->link, sprintf('CHMOD %o %s', $mode, $file));
@@ -155,7 +159,7 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base {
 		}
 		//Is a directory, and we want recursive
 		$filelist = $this->dirlist($file);
-		foreach($filelist as $filename){
+		foreach ( $filelist as $filename ) {
 			$this->chmod($file . '/' . $filename, $mode, $recursive);
 		}
 		return true;
@@ -176,10 +180,10 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base {
 		return $dir[$file]['group'];
 	}
 	function copy($source, $destination, $overwrite = false ) {
-		if( ! $overwrite && $this->exists($destination) )
+		if ( ! $overwrite && $this->exists($destination) )
 			return false;
 		$content = $this->get_contents($source);
-		if( false === $content)
+		if ( false === $content)
 			return false;
 		return $this->put_contents($destination, $content);
 	}
@@ -187,38 +191,39 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base {
 		return ftp_rename($this->link, $source, $destination);
 	}
 
-	function delete($file,$recursive=false) {
+	function delete($file, $recursive = false ) {
+		if ( empty($file) )
+			return false;
 		if ( $this->is_file($file) )
 			return @ftp_delete($this->link, $file);
 		if ( !$recursive )
 			return @ftp_rmdir($this->link, $file);
-		$filelist = $this->dirlist($file);
-		foreach ((array) $filelist as $filename => $fileinfo) {
-			$this->delete($file . '/' . $filename, $recursive);
-		}
+
+		$filelist = $this->dirlist( trailingslashit($file) );
+		if ( !empty($filelist) )
+			foreach ( $filelist as $delete_file )
+				$this->delete( trailingslashit($file) . $delete_file['name'], $recursive);
 		return @ftp_rmdir($this->link, $file);
 	}
 
 	function exists($file) {
-		$list = ftp_rawlist($this->link, $file, false);
-		if( ! $list )
-			return false;
-		return count($list) == 1 ? true : false;
+		$list = @ftp_nlist($this->link, $file);
+		return !empty($list); //empty list = no file, so invert.
 	}
 	function is_file($file) {
-		return $this->is_dir($file) ? false : true;
+		return $this->exists($file) && !$this->is_dir($file);
 	}
 	function is_dir($path) {
 		$cwd = $this->cwd();
-		$result = @ftp_chdir($this->link, $path);
-		if( $result && $path == $this->cwd() || $this->cwd() != $cwd ) {
+		$result = @ftp_chdir($this->link, trailingslashit($path) );
+		if ( $result && $path == $this->cwd() || $this->cwd() != $cwd ) {
 			@ftp_chdir($this->link, $cwd);
 			return true;
 		}
 		return false;
 	}
 	function is_readable($file) {
-		//Get dir list, Check if the file is writable by the current user??
+		//Get dir list, Check if the file is readable by the current user??
 		return true;
 	}
 	function is_writable($file) {
@@ -238,31 +243,29 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base {
 		return false;
 	}
 	function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {
-		if( !@ftp_mkdir($this->link, $path) )
+		if  ( !ftp_mkdir($this->link, $path) )
 			return false;
-		if( $chmod )
-			$this->chmod($path, $chmod);
-		if( $chown )
+		if ( ! $chmod )
+			$chmod = FS_CHMOD_DIR;
+		$this->chmod($path, $chmod);
+		if ( $chown )
 			$this->chown($path, $chown);
-		if( $chgrp )
+		if ( $chgrp )
 			$this->chgrp($path, $chgrp);
 		return true;
 	}
 	function rmdir($path, $recursive = false) {
-		if( ! $recursive )
-			return @ftp_rmdir($this->link, $path);
-
-		//TODO: Recursive Directory delete, Have to delete files from the folder first.
-		//$dir = $this->dirlist($path);
-		//foreach($dir as $file)
-
+		return $this->delete($path, $recursive);
 	}
 
 	function parselisting($line) {
-		$is_windows = ($this->OS_remote == FTP_OS_Windows);
-		if ($is_windows && preg_match("/([0-9]{2})-([0-9]{2})-([0-9]{2}) +([0-9]{2}):([0-9]{2})(AM|PM) +([0-9]+|<DIR>) +(.+)/", $line, $lucifer)) {
+		static $is_windows;
+		if ( is_null($is_windows) )
+			$is_windows = strpos( strtolower(ftp_systype($this->link)), 'win') !== false;
+
+		if ( $is_windows && preg_match("/([0-9]{2})-([0-9]{2})-([0-9]{2}) +([0-9]{2}):([0-9]{2})(AM|PM) +([0-9]+|<DIR>) +(.+)/", $line, $lucifer) ) {
 			$b = array();
-			if ($lucifer[3]<70) { $lucifer[3] +=2000; } else { $lucifer[3]+=1900; } // 4digit year fix
+			if ( $lucifer[3] < 70 ) { $lucifer[3] +=2000; } else { $lucifer[3] += 1900; } // 4digit year fix
 			$b['isdir'] = ($lucifer[7]=="<DIR>");
 			if ( $b['isdir'] )
 				$b['type'] = 'd';
@@ -320,12 +323,12 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base {
 		return $b;
 	}
 
-	function dirlist($path = '.', $incdot = false, $recursive = false) {
-		if( $this->is_file($path) ) {
-			$limitFile = basename($path);
+	function dirlist($path = '.', $include_hidden = true, $recursive = false) {
+		if ( $this->is_file($path) ) {
+			$limit_file = basename($path);
 			$path = dirname($path) . '/';
 		} else {
-			$limitFile = false;
+			$limit_file = false;
 		}
 
 		$list = @ftp_rawlist($this->link, '-a ' . $path, false);
@@ -339,7 +342,13 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base {
 			if ( empty($entry) )
 				continue;
 
-			if ( '.' == $entry["name"] || '..' == $entry["name"] )
+			if ( '.' == $entry['name'] || '..' == $entry['name'] )
+				continue;
+
+			if ( ! $include_hidden && '.' == $entry['name'][0] )
+				continue;
+
+			if ( $limit_file && $entry['name'] != $limit_file)
 				continue;
 
 			$dirlist[ $entry['name'] ] = $entry;
@@ -347,34 +356,23 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base {
 
 		if ( ! $dirlist )
 			return false;
-		if ( empty($dirlist) )
-			return array();
 
 		$ret = array();
-		foreach ( $dirlist as $struc ) {
-
+		foreach ( (array)$dirlist as $struc ) {
 			if ( 'd' == $struc['type'] ) {
-				$struc['files'] = array();
-
-				if ( $incdot ){
-					//We're including the doted starts
-					if( '.' != $struc['name'] && '..' != $struc['name'] ){ //Ok, It isnt a special folder
-						if ($recursive)
-							$struc['files'] = $this->dirlist($path . '/' . $struc['name'], $incdot, $recursive);
-					}
-				} else { //No dots
-					if ($recursive)
-						$struc['files'] = $this->dirlist($path . '/' . $struc['name'], $incdot, $recursive);
-				}
+				if ( $recursive )
+					$struc['files'] = $this->dirlist($path . '/' . $struc['name'], $include_hidden, $recursive);
+				else
+					$struc['files'] = array();
 			}
-			//File
-			$ret[$struc['name']] = $struc;
+
+			$ret[ $struc['name'] ] = $struc;
 		}
 		return $ret;
 	}
 
-	function __destruct(){
-		if( $this->link )
+	function __destruct() {
+		if ( $this->link )
 			ftp_close($this->link);
 	}
 }