site_iri: comparison web/wp-admin/includes/class-wp-filesystem-ftpext.php

equal deleted inserted replaced

-:2f6f6f7551ca
+:32102edaa81b
 class WP_Filesystem_FTPext extends WP_Filesystem_Base {
 	var $link;
 	var $errors = null;
 	var $options = array();
-	function WP_Filesystem_FTPext($opt='') {
+	function __construct($opt='') {
 		$this->method = 'ftpext';
 		$this->errors = new WP_Error();
 		//Check if possible to use ftp functions.
 		if ( ! extension_loaded('ftp') ) {
 		if ( empty($opt['hostname']) )
 			$this->errors->add('empty_hostname', __('FTP hostname is required'));
 		else
 			$this->options['hostname'] = $opt['hostname'];
-		if ( isset($opt['base']) && ! empty($opt['base']) )
+		if ( ! empty($opt['base']) )
 			$this->wp_base = $opt['base'];
 		// Check if the options provided are OK.
 		if ( empty($opt['username']) )
 			$this->errors->add('empty_username', __('FTP username is required'));
 	function get_contents($file, $type = '', $resumepos = 0 ) {
 		if ( empty($type) )
 			$type = FTP_BINARY;
-		$temp = tmpfile();
+		$tempfile = wp_tempnam($file);
+		$temp = fopen($tempfile, 'w+');
 		if ( ! $temp )
 			return false;
 		if ( ! @ftp_fget($this->link, $temp, $file, $type, $resumepos) )
 			return false;
 		while ( ! feof($temp) )
 			$contents .= fread($temp, 8192);
 		fclose($temp);
+		unlink($tempfile);
 		return $contents;
 	}
 	function get_contents_array($file) {
 		return explode("\n", $this->get_contents($file));
 	}
-	function put_contents($file, $contents, $type = '' ) {
-		if ( empty($type) )
+	function put_contents($file, $contents, $mode = false ) {
-			$type = $this->is_binary($contents) ? FTP_BINARY : FTP_ASCII;
+		$tempfile = wp_tempnam($file);
+		$temp = fopen($tempfile, 'w+');
-		$temp = tmpfile();
 		if ( ! $temp )
 			return false;
 		fwrite($temp, $contents);
 		fseek($temp, 0); //Skip back to the start of the file being written to
+		$type = $this->is_binary($contents) ? FTP_BINARY : FTP_ASCII;
 		$ret = @ftp_fput($this->link, $file, $temp, $type);
 		fclose($temp);
+		unlink($tempfile);
+		$this->chmod($file, $mode);
 		return $ret;
 	}
 	function cwd() {
 		$cwd = @ftp_pwd($this->link);
 		if ( $cwd )
 	}
 	function chgrp($file, $group, $recursive = false ) {
 		return false;
 	}
 	function chmod($file, $mode = false, $recursive = false) {
-		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) ) {
+		// chmod any sub-objects if recursive.
-			if ( ! function_exists('ftp_chmod') )
+		if ( $recursive && $this->is_dir($file) ) {
-				return @ftp_site($this->link, sprintf('CHMOD %o %s', $mode, $file));
+			$filelist = $this->dirlist($file);
-			return @ftp_chmod($this->link, $mode, $file);
+			foreach ( (array)$filelist as $filename => $filemeta )
-		}
+				$this->chmod($file . '/' . $filename, $mode, $recursive);
-		//Is a directory, and we want recursive
+		}
-		$filelist = $this->dirlist($file);
-		foreach ( $filelist as $filename ) {
+		// chmod the file or directory
-			$this->chmod($file . '/' . $filename, $mode, $recursive);
+		if ( ! function_exists('ftp_chmod') )
-		}
+			return (bool)@ftp_site($this->link, sprintf('CHMOD %o %s', $mode, $file));
-		return true;
+		return (bool)@ftp_chmod($this->link, $mode, $file);
 	}
 	function chown($file, $owner, $recursive = false ) {
 		return false;
 	}
 	function owner($file) {
 	}
 	function group($file) {
 		$dir = $this->dirlist($file);
 		return $dir[$file]['group'];
 	}
-	function copy($source, $destination, $overwrite = false ) {
+	function copy($source, $destination, $overwrite = false, $mode = false) {
 		if ( ! $overwrite && $this->exists($destination) )
 			return false;
 		$content = $this->get_contents($source);
 		if ( false === $content)
 			return false;
-		return $this->put_contents($destination, $content);
+		return $this->put_contents($destination, $content, $mode);
 	}
 	function move($source, $destination, $overwrite = false) {
 		return ftp_rename($this->link, $source, $destination);
 	}
-	function delete($file, $recursive = false ) {
+	function delete($file, $recursive = false, $type = false) {
 		if ( empty($file) )
 			return false;
-		if ( $this->is_file($file) )
+		if ( 'f' == $type || $this->is_file($file) )
 			return @ftp_delete($this->link, $file);
 		if ( !$recursive )
 			return @ftp_rmdir($this->link, $file);
 		$filelist = $this->dirlist( trailingslashit($file) );
 		if ( !empty($filelist) )
 			foreach ( $filelist as $delete_file )
-				$this->delete( trailingslashit($file) . $delete_file['name'], $recursive);
+				$this->delete( trailingslashit($file) . $delete_file['name'], $recursive, $delete_file['type'] );
 		return @ftp_rmdir($this->link, $file);
 	}
 	function exists($file) {
 		$list = @ftp_nlist($this->link, $file);
 	}
 	function touch($file, $time = 0, $atime = 0) {
 		return false;
 	}
 	function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {
-		if  ( !ftp_mkdir($this->link, $path) )
+		$path = untrailingslashit($path);
-			return false;
+		if ( empty($path) )
-		if ( ! $chmod )
+			return false;
-			$chmod = FS_CHMOD_DIR;
+		if ( !@ftp_mkdir($this->link, $path) )
+			return false;
 		$this->chmod($path, $chmod);
 		if ( $chown )
 			$this->chown($path, $chown);
 		if ( $chgrp )
 			$this->chgrp($path, $chgrp);
 	}
 	function parselisting($line) {
 		static $is_windows;
 		if ( is_null($is_windows) )
-			$is_windows = strpos( strtolower(ftp_systype($this->link)), 'win') !== false;
+			$is_windows = stripos( 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) ) {
+		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 )
-			$b['isdir'] = ($lucifer[7]=="<DIR>");
+				$lucifer[3] +=2000;
+			else
+				$lucifer[3] += 1900; // 4digit year fix
+			$b['isdir'] = ( $lucifer[7] == '<DIR>');
 			if ( $b['isdir'] )
 				$b['type'] = 'd';
 			else
 				$b['type'] = 'f';
 			$b['size'] = $lucifer[7];
 			$b['month'] = $lucifer[1];
 			$b['day'] = $lucifer[2];
 			$b['year'] = $lucifer[3];
 			$b['hour'] = $lucifer[4];
 			$b['minute'] = $lucifer[5];
-			$b['time'] = @mktime($lucifer[4]+(strcasecmp($lucifer[6],"PM")==0?12:0),$lucifer[5],0,$lucifer[1],$lucifer[2],$lucifer[3]);
+			$b['time'] = @mktime($lucifer[4] + (strcasecmp($lucifer[6], "PM") == 0 ? 12 : 0), $lucifer[5], 0, $lucifer[1], $lucifer[2], $lucifer[3]);
 			$b['am/pm'] = $lucifer[6];
 			$b['name'] = $lucifer[8];
-		} else if (!$is_windows && $lucifer=preg_split("/[ ]/",$line,9,PREG_SPLIT_NO_EMPTY)) {
+		} elseif ( !$is_windows && $lucifer = preg_split('/[ ]/', $line, 9, PREG_SPLIT_NO_EMPTY)) {
 			//echo $line."\n";
-			$lcount=count($lucifer);
+			$lcount = count($lucifer);
-			if ($lcount<8) return '';
+			if ( $lcount < 8 )
+				return '';
 			$b = array();
-			$b['isdir'] = $lucifer[0]{0} === "d";
+			$b['isdir'] = $lucifer[0]{0} === 'd';
-			$b['islink'] = $lucifer[0]{0} === "l";
+			$b['islink'] = $lucifer[0]{0} === 'l';
 			if ( $b['isdir'] )
 				$b['type'] = 'd';
 			elseif ( $b['islink'] )
 				$b['type'] = 'l';
 			else
 			$b['perms'] = $lucifer[0];
 			$b['number'] = $lucifer[1];
 			$b['owner'] = $lucifer[2];
 			$b['group'] = $lucifer[3];
 			$b['size'] = $lucifer[4];
-			if ($lcount==8) {
+			if ( $lcount == 8 ) {
-				sscanf($lucifer[5],"%d-%d-%d",$b['year'],$b['month'],$b['day']);
+				sscanf($lucifer[5], '%d-%d-%d', $b['year'], $b['month'], $b['day']);
-				sscanf($lucifer[6],"%d:%d",$b['hour'],$b['minute']);
+				sscanf($lucifer[6], '%d:%d', $b['hour'], $b['minute']);
-				$b['time'] = @mktime($b['hour'],$b['minute'],0,$b['month'],$b['day'],$b['year']);
+				$b['time'] = @mktime($b['hour'], $b['minute'], 0, $b['month'], $b['day'], $b['year']);
 				$b['name'] = $lucifer[7];
 			} else {
 				$b['month'] = $lucifer[5];
 				$b['day'] = $lucifer[6];
-				if (preg_match("/([0-9]{2}):([0-9]{2})/",$lucifer[7],$l2)) {
+				if ( preg_match('/([0-9]{2}):([0-9]{2})/', $lucifer[7], $l2) ) {
 					$b['year'] = date("Y");
 					$b['hour'] = $l2[1];
 					$b['minute'] = $l2[2];
 				} else {
 					$b['year'] = $lucifer[7];
 					$b['hour'] = 0;
 					$b['minute'] = 0;
 				}
-				$b['time'] = strtotime(sprintf("%d %s %d %02d:%02d",$b['day'],$b['month'],$b['year'],$b['hour'],$b['minute']));
+				$b['time'] = strtotime( sprintf('%d %s %d %02d:%02d', $b['day'], $b['month'], $b['year'], $b['hour'], $b['minute']) );
 				$b['name'] = $lucifer[8];
 			}
 		}
 		return $b;
 			$path = dirname($path) . '/';
 		} else {
 			$limit_file = false;
 		}
-		$list = @ftp_rawlist($this->link, '-a ' . $path, false);
+		$pwd = @ftp_pwd($this->link);
+		if ( ! @ftp_chdir($this->link, $path) ) // Cant change to folder = folder doesn't exist
-		if ( $list === false )
+			return false;
+		$list = @ftp_rawlist($this->link, '-a', false);
+		@ftp_chdir($this->link, $pwd);
+		if ( empty($list) ) // Empty array = non-existent folder (real folder will show . at least)
 			return false;
 		$dirlist = array();
 		foreach ( $list as $k => $v ) {
 			$entry = $this->parselisting($v);
 			if ( $limit_file && $entry['name'] != $limit_file)
 				continue;
 			$dirlist[ $entry['name'] ] = $entry;
 		}
-		if ( ! $dirlist )
-			return false;
 		$ret = array();
 		foreach ( (array)$dirlist as $struc ) {
 			if ( 'd' == $struc['type'] ) {
 				if ( $recursive )
 	function __destruct() {
 		if ( $this->link )
 			ftp_close($this->link);
 	}
 }
-?>

changeset 194	32102edaa81b
parent 136	bde1974c263b
child 204	09a1c134465b