Changeset 1586

Timestamp:

04/28/08 12:21:34 (7 months ago)

Author:

moeffju

Message:

Really fix #182 this time. Thanks lildude for the debugging help.

Files:

• trunk/htdocs/system/classes/utils.php (modified) (2 diffs)

trunk/htdocs/system/classes/utils.php

@@ -734 +734 @@
     public static function glob( $pattern, $flags = 0 )
     {
-        if ( ! defined( 'GLOB_NOBRACE' ) || ! ( ( $flags & GLOB_BRACE ) == GLOB_BRACE ) ) {
-            // this platform supports GLOB_BRACE out of the box
+            if ( ! defined( 'GLOB_NOBRACE' ) || ! ( ( $flags & GLOB_BRACE ) == GLOB_BRACE ) ) {
+            // this platform supports GLOB_BRACE out of the box or GLOB_BRACE wasn't requested
             $results= glob( $pattern, $flags );
         }
         elseif ( ! preg_match_all( '/\{.*?\}/', $pattern, $m ) ) {
-            // this pattern doesn't even use braces
+            // GLOB_BRACE used, but this pattern doesn't even use braces
             $results= glob( $pattern, $flags ^ GLOB_BRACE );
         }
@@ -746 +746 @@
             $braces= array();
             foreach ( $m[0] as $raw_brace ) {
-                $braces[ preg_quote( $raw_brace ) ] = '(' . str_replace( ',', '|', preq_quote( substr( $raw_brace, 1, -1 ) ) ) . ')';
+                $braces[ preg_quote( $raw_brace ) ] = '(?:' . str_replace( ',', '|', preg_quote( substr( $raw_brace, 1, -1 ), '/' ) ) . ')';
             }
             $new_pattern= preg_replace( '/\{.*?\}/', '*', $pattern );
-            $regex= '/' . str_replace( array_keys( $braces ), array_values( $braces ), preg_quote( $pattern ) ) . '/';
-            $results= preg_grep( $regex, glob( $new_pattern, $flags ^ GLOB_BRACE) );
-        }
-
+      $pattern= preg_quote( $pattern, '/' );
+      $pattern= str_replace( '\\*', '.*', $pattern );
+      $pattern= str_replace( '\\?', '.', $pattern );
+            $regex= '/' . str_replace( array_keys( $braces ), array_values( $braces ), $pattern ) . '/';
+            $results= preg_grep( $regex, Utils::glob( $new_pattern, $flags ^ GLOB_BRACE) );
+        }
+        
         if ( $results === false ) $results= array();
         return $results;