Changeset 13136

Timestamp:

01/22/2024 05:31:04 AM (3 years ago)

Author:

dd32

Message:

Plugin Directory: Add the 2nd half of [13135] allowing for directories to be listed.

See #7415.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/tools/class-filesystem.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/tools/class-filesystem.php

@@ -87 +87 @@
          */
         public static function list_files( $directory, $recursive = false, $pattern = null, $depth = -1 ) {
+                return self::list( $directory, 'files', $recursive, $pattern, $depth );
+        }
+
+        /**
+         * Returns all (usable) files/directories of a given directory.
+         *
+         * @static
+         * 
+         * @param string $directory Path to directory to search.
+         * @param bool   $type      Optional. Whether to return 'files', 'directories', or 'all'. Default: 'all'.
+         * @param bool   $recursive Optional. Whether to recurse into subdirectories. Default: false.
+         * @param string $pattern   Optional. A regular expression to match files against. Default: null.
+         * @param int    $depth     Optional. Recursion depth. Default: -1 (infinite).
+         * @return array All files within the passed directory.
+         */
+        public static function list( $directory, $type = 'all', $recursive = false, $pattern = null, $depth = -1 ) {
                 if ( $recursive ) {
                         $iterator = new \RecursiveIteratorIterator(
@@ -105 +121 @@
                 $files = array();
                 foreach ( $filtered as $file ) {
-                        if ( ! $file->isFile() ) {
+                        if ( in_array( $file->getFilename(), [ '.', '..' ] ) ) {
+                                continue;
+                        } elseif ( 'files' === $type && ! $file->isFile() ) {
+                                continue;
+                        } elseif ( 'directories' === $type && ! $file->isDir() ) {
                                 continue;
                         } elseif ( stristr( $file->getPathname(), '__MACOSX' ) ) {