Changeset 7641

Timestamp:

04/13/2008 04:04:57 AM (16 years ago)

Author:

matt

Message:

Direct file system manip fixes, should fix .svn upgrade problem. Hat tip: DD32.

File:

• trunk/wp-admin/includes/class-wp-filesystem-direct.php (modified) (13 diffs)

trunk/wp-admin/includes/class-wp-filesystem-direct.php

@@ -27 +27 @@
     }
     function put_contents($file,$contents,$mode=false,$type=''){
-        $fp=@fopen($file,'w'.$type);
-        if (!$fp)
+        if ( ! ($fp = @fopen($file,'w'.$type)) )
             return false;
         @fwrite($fp,$contents);
@@ -37 +36 @@
     function cwd(){
         return @getcwd();
+    }
+    function chdir($dir){
+        return @chdir($dir);
     }
     function chgrp($file,$group,$recursive=false){
@@ -46 +48 @@
             return @chgrp($file,$group);
         //Is a directory, and we want recursive
+        $file = trailingshashit($file);
         $filelist = $this->dirlist($file);
-        foreach($filelist as $filename){
-            $this->chgrp($file.'/'.$filename,$group,$recursive);
-        }
+        foreach($filelist as $filename)
+            $this->chgrp($file . $filename, $group, $recursive);
+
         return true;
     }
@@ -62 +65 @@
             return @chmod($file,$mode);
         //Is a directory, and we want recursive
+        $file = trailingshashit($file);
         $filelist = $this->dirlist($file);
-        foreach($filelist as $filename){
-            $this->chmod($file.'/'.$filename,$mode,$recursive);
-        }
+        foreach($filelist as $filename)
+            $this->chmod($file . $filename, $mode, $recursive);
+
         return true;
     }
@@ -83 +87 @@
     }
     function owner($file){
-        $owneruid=@fileowner($file);
+        $owneruid = @fileowner($file);
         if( ! $owneruid )
             return false;
         if( !function_exists('posix_getpwuid') )
             return $owneruid;
-        $ownerarray=posix_getpwuid($owneruid);
+        $ownerarray = posix_getpwuid($owneruid);
         return $ownerarray['name'];
     }
@@ -164 +168 @@
     }
     function group($file){
-        $gid=@filegroup($file);
+        $gid = @filegroup($file);
         if( ! $gid )
             return false;
         if( !function_exists('posix_getgrgid') )
             return $gid;
-        $grouparray=posix_getgrgid($gid);
+        $grouparray = posix_getgrgid($gid);
         return $grouparray['name'];
     }
@@ -180 +184 @@
 
     function move($source,$destination,$overwrite=false){
-        //Possible to use rename()
+        //Possible to use rename()?
         if( $this->copy($source,$destination,$overwrite) && $this->exists($destination) ){
             $this->delete($source);
@@ -189 +193 @@
     }
 
-    function delete($file,$recursive=false){
+    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) )
             return @rmdir($file);
 
-        $filelist = $this->dirlist($file);
-        if( ! $filelist )
-            return true; //No files exist, Say we've deleted them
+        //At this point its a folder, and we're in recursive mode
+        $file = trailingslashit($file);
+        $filelist = $this->dirlist($file, true);
 
         $retval = true;
-        foreach($filelist as $filename=>$fileinfo){
-            if( ! $this->delete($file.'/'.$filename,$recursive) )
-                $retval = false;
-        }
+        if( is_array($filelist) ) //false if no files, So check first.
+            foreach($filelist as $filename=>$fileinfo)
+                if( ! $this->delete($file . $filename, $recursive) )
+                    $retval = false;
+
         if( ! @rmdir($file) )
             return false;
@@ -225 +229 @@
 
     function is_readable($file){
-            return @is_readable($file);
+        return @is_readable($file);
     }
 
@@ -243 +247 @@
     }
 
-    function touch($file,$time=0,$atime=0){
-        if($time==0)
+    function touch($file, $time = 0, $atime = 0){
+        if($time == 0)
             $time = time();
-        if($atime==0)
+        if($atime == 0)
             $atime = time();
         return @touch($file,$time,$atime);
     }
 
-    function mkdir($path,$chmod=false,$chown=false,$chgrp=false){
+    function mkdir($path, $chmod = false, $chown = false, $chgrp = false){
         if( ! $chmod)
             $chmod = $this->permission;
@@ -265 +269 @@
 
     function rmdir($path,$recursive=false){
+        //Currently unused and untested, Use delete() instead.
         if( ! $recursive )
             return @rmdir($path);
@@ -293 +298 @@
             $struc['name']      = $entry;
 
+            if( '.' == $struc['name'] || '..' == $struc['name'] )
+                continue; //Do not care about these folders.
             if( '.' == $struc['name'][0] && !$incdot)
                 continue;
@@ -308 +315 @@
             $struc['time']      = date('h:i:s',$struc['lastmodunix']);
             $struc['type']      = $this->is_dir($path.'/'.$entry) ? 'd' : 'f';
+
             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'], $incdot, $recursive);
+                else
+                    $struc['files'] = array();
             }
-            //File
-            $ret[$struc['name']] = $struc;
+
+            $ret[ $struc['name'] ] = $struc;
         }
         $dir->close();