WP Merge with revision 8075

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1328 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 56 insertions, 134 deletions

diff --git a/wp-admin/includes/class-wp-filesystem-direct.php b/wp-admin/includes/class-wp-filesystem-direct.php
index 45972a3..77a7582 100644
--- a/wp-admin/includes/class-wp-filesystem-direct.php
+++ b/wp-admin/includes/class-wp-filesystem-direct.php
@@ -1,51 +1,46 @@
 <?php
 
-class WP_Filesystem_Direct{
+class WP_Filesystem_Direct  extends WP_Filesystem_Base {
 	var $permission = null;
 	var $errors = array();
-	function WP_Filesystem_Direct($arg){
+	function WP_Filesystem_Direct($arg) {
+		$this->method = 'direct';
 		$this->errors = new WP_Error();
 		$this->permission = umask();
 	}
-	function connect(){
+	function connect() {
 		return true;
 	}
-	function setDefaultPermissions($perm){
+	function setDefaultPermissions($perm) {
 		$this->permission = $perm;
 	}
-	function find_base_dir($base = '.', $echo = false){
-		return str_replace('\\','/',ABSPATH);
-	}
-	function get_base_dir($base = '.', $echo = false){
-		return $this->find_base_dir($base, $echo);
-	}
-	function get_contents($file){
+	function get_contents($file) {
 		return @file_get_contents($file);
 	}
-	function get_contents_array($file){
+	function get_contents_array($file) {
 		return @file($file);
 	}
-	function put_contents($file,$contents,$mode=false,$type=''){
-		if ( ! ($fp = @fopen($file,'w'.$type)) )
+	function put_contents($file, $contents, $mode = false, $type = '') {
+		if ( ! ($fp = @fopen($file, 'w' . $type)) )
 			return false;
-		@fwrite($fp,$contents);
+		@fwrite($fp, $contents);
 		@fclose($fp);
 		$this->chmod($file,$mode);
 		return true;
 	}
-	function cwd(){
+	function cwd() {
 		return @getcwd();
 	}
-	function chdir($dir){
+	function chdir($dir) {
 		return @chdir($dir);
 	}
-	function chgrp($file,$group,$recursive=false){
+	function chgrp($file, $group, $recursive = false) {
 		if( ! $this->exists($file) )
 			return false;
 		if( ! $recursive )
-			return @chgrp($file,$group);
+			return @chgrp($file, $group);
 		if( ! $this->is_dir($file) )
-			return @chgrp($file,$group);
+			return @chgrp($file, $group);
 		//Is a directory, and we want recursive
 		$file = trailingslashit($file);
 		$filelist = $this->dirlist($file);
@@ -54,7 +49,7 @@ class WP_Filesystem_Direct{
 
 		return true;
 	}
-	function chmod($file,$mode=false,$recursive=false){
+	function chmod($file, $mode = false, $recursive = false) {
 		if( ! $mode )
 			$mode = $this->permission;
 		if( ! $this->exists($file) )
@@ -62,7 +57,7 @@ class WP_Filesystem_Direct{
 		if( ! $recursive )
 			return @chmod($file,$mode);
 		if( ! $this->is_dir($file) )
-			return @chmod($file,$mode);
+			return @chmod($file, $mode);
 		//Is a directory, and we want recursive
 		$file = trailingslashit($file);
 		$filelist = $this->dirlist($file);
@@ -71,120 +66,51 @@ class WP_Filesystem_Direct{
 
 		return true;
 	}
-	function chown($file,$owner,$recursive=false){
+	function chown($file, $owner, $recursive = false) {
 		if( ! $this->exists($file) )
 			return false;
 		if( ! $recursive )
-			return @chown($file,$owner);
+			return @chown($file, $owner);
 		if( ! $this->is_dir($file) )
-			return @chown($file,$owner);
+			return @chown($file, $owner);
 		//Is a directory, and we want recursive
 		$filelist = $this->dirlist($file);
 		foreach($filelist as $filename){
-			$this->chown($file.'/'.$filename,$owner,$recursive);
+			$this->chown($file . '/' . $filename, $owner, $recursive);
 		}
 		return true;
 	}
-	function owner($file){
+	function owner($file) {
 		$owneruid = @fileowner($file);
 		if( ! $owneruid )
 			return false;
-		if( !function_exists('posix_getpwuid') )
+		if( ! function_exists('posix_getpwuid') )
 			return $owneruid;
 		$ownerarray = posix_getpwuid($owneruid);
 		return $ownerarray['name'];
 	}
-	function getchmod($file){
+	function getchmod($file) {
 		return @fileperms($file);
 	}
-	function gethchmod($file){
-		//From the PHP.net page for ...?
-		$perms = $this->getchmod($file);
-		if (($perms & 0xC000) == 0xC000) {
-			// Socket
-			$info = 's';
-		} elseif (($perms & 0xA000) == 0xA000) {
-			// Symbolic Link
-			$info = 'l';
-		} elseif (($perms & 0x8000) == 0x8000) {
-			// Regular
-			$info = '-';
-		} elseif (($perms & 0x6000) == 0x6000) {
-			// Block special
-			$info = 'b';
-		} elseif (($perms & 0x4000) == 0x4000) {
-			// Directory
-			$info = 'd';
-		} elseif (($perms & 0x2000) == 0x2000) {
-			// Character special
-			$info = 'c';
-		} elseif (($perms & 0x1000) == 0x1000) {
-			// FIFO pipe
-			$info = 'p';
-		} else {
-			// Unknown
-			$info = 'u';
-		}
-
-		// Owner
-		$info .= (($perms & 0x0100) ? 'r' : '-');
-		$info .= (($perms & 0x0080) ? 'w' : '-');
-		$info .= (($perms & 0x0040) ?
-					(($perms & 0x0800) ? 's' : 'x' ) :
-					(($perms & 0x0800) ? 'S' : '-'));
-
-		// Group
-		$info .= (($perms & 0x0020) ? 'r' : '-');
-		$info .= (($perms & 0x0010) ? 'w' : '-');
-		$info .= (($perms & 0x0008) ?
-					(($perms & 0x0400) ? 's' : 'x' ) :
-					(($perms & 0x0400) ? 'S' : '-'));
-
-		// World
-		$info .= (($perms & 0x0004) ? 'r' : '-');
-		$info .= (($perms & 0x0002) ? 'w' : '-');
-		$info .= (($perms & 0x0001) ?
-					(($perms & 0x0200) ? 't' : 'x' ) :
-					(($perms & 0x0200) ? 'T' : '-'));
-		return $info;
-	}
-	function getnumchmodfromh($mode) {
-		$realmode = "";
-		$legal =  array("","w","r","x","-");
-		$attarray = preg_split("//",$mode);
-		for($i=0;$i<count($attarray);$i++){
-		   if($key = array_search($attarray[$i],$legal)){
-			   $realmode .= $legal[$key];
-		   }
-		}
-		$mode = str_pad($realmode,9,'-');
-		$trans = array('-'=>'0','r'=>'4','w'=>'2','x'=>'1');
-		$mode = strtr($mode,$trans);
-		$newmode = '';
-		$newmode .= $mode[0]+$mode[1]+$mode[2];
-		$newmode .= $mode[3]+$mode[4]+$mode[5];
-		$newmode .= $mode[6]+$mode[7]+$mode[8];
-		return $newmode;
-	}
-	function group($file){
+	function group($file) {
 		$gid = @filegroup($file);
 		if( ! $gid )
 			return false;
-		if( !function_exists('posix_getgrgid') )
+		if( ! function_exists('posix_getgrgid') )
 			return $gid;
 		$grouparray = posix_getgrgid($gid);
 		return $grouparray['name'];
 	}
 
-	function copy($source,$destination,$overwrite=false){
+	function copy($source, $destination, $overwrite = false) {
 		if( ! $overwrite && $this->exists($destination) )
 			return false;
-		return copy($source,$destination);
+		return copy($source, $destination);
 	}
 
-	function move($source,$destination,$overwrite=false){
+	function move($source, $destination, $overwrite = false) {
 		//Possible to use rename()?
-		if( $this->copy($source,$destination,$overwrite) && $this->exists($destination) ){
+		if( $this->copy($source, $destination, $overwrite) && $this->exists($destination) ){
 			$this->delete($source);
 			return true;
 		} else {
@@ -192,12 +118,12 @@ class WP_Filesystem_Direct{
 		}
 	}
 
-	function delete($file, $recursive=false){
-		$file = str_replace('\\','/',$file); //for win32, occasional problems deleteing files otherwise
+	function delete($file, $recursive = false) {
+		$file = str_replace('\\', '/', $file); //for win32, occasional problems deleteing files otherwise
 
 		if( $this->is_file($file) )
 			return @unlink($file);
-		if( !$recursive && $this->is_dir($file) )
+		if( ! $recursive && $this->is_dir($file) )
 			return @rmdir($file);
 
 		//At this point its a folder, and we're in recursive mode
@@ -206,7 +132,7 @@ class WP_Filesystem_Direct{
 
 		$retval = true;
 		if( is_array($filelist) ) //false if no files, So check first.
-			foreach($filelist as $filename=>$fileinfo)
+			foreach($filelist as $filename => $fileinfo)
 				if( ! $this->delete($file . $filename, $recursive) )
 					$retval = false;
 
@@ -215,34 +141,34 @@ class WP_Filesystem_Direct{
 		return $retval;
 	}
 
-	function exists($file){
+	function exists($file) {
 		return @file_exists($file);
 	}
 
-	function is_file($file){
+	function is_file($file) {
 		return @is_file($file);
 	}
 
-	function is_dir($path){
+	function is_dir($path) {
 		return @is_dir($path);
 	}
 
-	function is_readable($file){
+	function is_readable($file) {
 		return @is_readable($file);
 	}
 
-	function is_writable($file){
+	function is_writable($file) {
 		return @is_writable($file);
 	}
 
-	function atime($file){
+	function atime($file) {
 		return @fileatime($file);
 	}
 
-	function mtime($file){
+	function mtime($file) {
 		return @filemtime($file);
 	}
-	function size($file){
+	function size($file) {
 		return @filesize($file);
 	}
 
@@ -251,38 +177,38 @@ class WP_Filesystem_Direct{
 			$time = time();
 		if($atime == 0)
 			$atime = time();
-		return @touch($file,$time,$atime);
+		return @touch($file, $time, $atime);
 	}
 
 	function mkdir($path, $chmod = false, $chown = false, $chgrp = false){
 		if( ! $chmod)
 			$chmod = $this->permission;
 
-		if( !@mkdir($path,$chmod) )
+		if( ! @mkdir($path, $chmod) )
 			return false;
 		if( $chown )
-			$this->chown($path,$chown);
+			$this->chown($path, $chown);
 		if( $chgrp )
-			$this->chgrp($path,$chgrp);
+			$this->chgrp($path, $chgrp);
 		return true;
 	}
 
-	function rmdir($path,$recursive=false){
+	function rmdir($path, $recursive = false) {
 		//Currently unused and untested, Use delete() instead.
 		if( ! $recursive )
 			return @rmdir($path);
 		//recursive:
 		$filelist = $this->dirlist($path);
-		foreach($filelist as $filename=>$det){
-			if ( '/' == substr($filename,-1,1) )
-				$this->rmdir($path.'/'.$filename,$recursive);
+		foreach($filelist as $filename => $det) {
+			if ( '/' == substr($filename, -1, 1) )
+				$this->rmdir($path . '/' . $filename, $recursive);
 			@rmdir($filename);
 		}
 		return @rmdir($path);
 	}
 
-	function dirlist($path,$incdot=false,$recursive=false){
-		if( $this->is_file($path) ){
+	function dirlist($path, $incdot = false, $recursive = false) {
+		if( $this->is_file($path) ) {
 			$limitFile = basename($path);
 			$path = dirname($path);
 		} else {
@@ -293,9 +219,9 @@ class WP_Filesystem_Direct{
 
 		$ret = array();
 		$dir = dir($path);
-		while (false !== ($entry = $dir->read())) {
+		while (false !== ($entry = $dir->read()) ) {
 			$struc = array();
-			$struc['name'] 		= $entry;
+			$struc['name'] = $entry;
 
 			if( '.' == $struc['name'] || '..' == $struc['name'] )
 				continue; //Do not care about these folders.
@@ -315,9 +241,9 @@ class WP_Filesystem_Direct{
 			$struc['time']    	= date('h:i:s',$struc['lastmodunix']);
 			$struc['type']		= $this->is_dir($path.'/'.$entry) ? 'd' : 'f';
 
-			if ('d' == $struc['type'] ){
+			if ( 'd' == $struc['type'] ) {
 				if( $recursive )
-					$struc['files'] = $this->dirlist($path.'/'.$struc['name'], $incdot, $recursive);
+					$struc['files'] = $this->dirlist($path . '/' . $struc['name'], $incdot, $recursive);
 				else
 					$struc['files'] = array();
 			}
@@ -328,9 +254,5 @@ class WP_Filesystem_Direct{
 		unset($dir);
 		return $ret;
 	}
-
-	function __destruct(){
-		return;
-	}
 }
 ?>