Changeset 41806 for trunk/src/wp-admin/includes/file.php

Timestamp:

10/10/2017 05:33:57 AM (7 years ago)

Author:

pento

Message:

File Editor: Add support for more than one sub-directory level.

The theme and plugin editors now list all files in the selected theme or plugin, recursing through subdirectories as necessary.

Props WraithKenny, schlessera, chsxf, MikeHansenMe, Daedalon, valendesigns, westonruter, pento.
Fixes #6531.

File:

• trunk/src/wp-admin/includes/file.php (modified) (1 diff)

trunk/src/wp-admin/includes/file.php

@@ -121 +121 @@
  *
  * @since 2.6.0
+ * @since 4.9.0 Added the `$exclusions` parameter.
  *
  * @param string $folder Optional. Full path to folder. Default empty.
  * @param int    $levels Optional. Levels of folders to follow, Default 100 (PHP Loop limit).
+ * @param array  $exclusions Optional. List of folders and files to skip.
  * @return bool|array False on failure, Else array of files
  */
-function list_files( $folder = '', $levels = 100 ) {
-    if ( empty($folder) )
+function list_files( $folder = '', $levels = 100, $exclusions = array() ) {
+    if ( empty( $folder ) ) {
         return false;
-
-    if ( ! $levels )
+    }
+
+    $folder = trailingslashit( $folder );
+
+    if ( ! $levels ) {
         return false;
+    }
 
     $files = array();
-    if ( $dir = @opendir( $folder ) ) {
-        while (($file = readdir( $dir ) ) !== false ) {
-            if ( in_array($file, array('.', '..') ) )
+
+    $dir = @opendir( $folder );
+    if ( $dir ) {
+        while ( ( $file = readdir( $dir ) ) !== false ) {
+            // Skip current and parent folder links.
+            if ( in_array( $file, array( '.', '..' ), true ) ) {
                 continue;
-            if ( is_dir( $folder . '/' . $file ) ) {
-                $files2 = list_files( $folder . '/' . $file, $levels - 1);
-                if ( $files2 )
+            }
+
+            // Skip hidden and excluded files.
+            if ( '.' === $file[0] || in_array( $file, $exclusions, true ) ) {
+                continue;
+            }
+
+            if ( is_dir( $folder . $file ) ) {
+                $files2 = list_files( $folder . $file, $levels - 1 );
+                if ( $files2 ) {
                     $files = array_merge($files, $files2 );
-                else
-                    $files[] = $folder . '/' . $file . '/';
+                } else {
+                    $files[] = $folder . $file . '/';
+                }
             } else {
-                $files[] = $folder . '/' . $file;
+                $files[] = $folder . $file;
             }
         }
     }
     @closedir( $dir );
+
     return $files;
 }