Changeset 11934 for trunk/wp-admin/includes/class-wp-filesystem-ftpsockets.php

Timestamp:

09/15/2009 02:21:00 AM (17 years ago)

Author:

azaozz

Message:

Include 'hidden' directories in filesystem dirlist by default, props dd32, fixes #10774

File:

• trunk/wp-admin/includes/class-wp-filesystem-ftpsockets.php (modified) (4 diffs)

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

@@ -123 +123 @@
 
         $temp = wp_tempnam( $file );
-        if ( ! $temphandle = fopen($temp, 'w+') ){
+        if ( ! $temphandle = fopen($temp, 'w+') ) {
             unlink($temp);
             return false;
@@ -167 +167 @@
             return $this->ftp->chmod($file, $mode);
         }
+
         //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;
     }
@@ -283 +284 @@
     }
 
-    function dirlist($path = '.', $incdot = false, $recursive = false ) {
+    function dirlist($path = '.', $include_hidden = true, $recursive = false ) {
         if ( $this->is_file($path) ) {
-            $limitFile = basename($path);
+            $limit_file = basename($path);
             $path = dirname($path) . '/';
         } else {
-            $limitFile = false;
+            $limit_file = false;
         }
 
@@ -294 +295 @@
         if ( ! $list )
             return false;
-        if ( empty($list) )
-            return array();
 
         $ret = array();
         foreach ( $list as $struc ) {
 
+            if ( '.' == $struct['name'] || '..' == $struc['name'] )
+                continue;
+
+            if ( ! $include_hidden && '.' == $struc['name'][0] )
+                continue;
+
+            if ( $limit_file && $srtuc['name'] != $limit_file )
+                continue;
+
             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;