From 2e76add61bf1f8c3746939eb330fe608e73b315b Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Tue, 22 May 2012 12:46:56 +0100
Subject: [PATCH] enhance zglob to allow really long patterns

---
 core/util.inc.php        | 24 +++++++++++++++++++-----
 ext/ext_manager/main.php |  4 ++--
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/core/util.inc.php b/core/util.inc.php
index b7b0baec..4bf59033 100644
--- a/core/util.inc.php
+++ b/core/util.inc.php
@@ -386,10 +386,24 @@ function mtimefile($file) {
 	return "$data_href/$file?$mtime";
 }
 
+/*
+ * like glob, with support for matching very long patterns with braces
+ */
 function zglob($pattern) {
-	$r = glob($pattern);
-	if($r) return $r;
-	else return array();
+	$results = array();
+	if(preg_match('/(.*)\{(.*)\}(.*)/', $pattern, $matches)) {
+		$braced = explode(",", $matches[2]);
+		foreach($braced as $b) {
+			$sub_pattern = $matches[1].$b.$matches[3];
+			$results = array_merge($results, zglob($sub_pattern));
+		}
+		return $results;
+	}
+	else {
+		$r = glob($pattern);
+		if($r) return $r;
+		else return array();
+	}
 }
 
 
@@ -1088,8 +1102,8 @@ function _get_themelet_files($_theme) {
 	$base_themelets[] = 'themes/'.$_theme.'/layout.class.php';
 	$base_themelets[] = 'themes/'.$_theme.'/themelet.class.php';
 
-	$ext_themelets = glob("ext/{".ENABLED_EXTS."}/theme.php", GLOB_BRACE);
-	$custom_themelets = glob('themes/'.$_theme.'/{'.ENABLED_EXTS.'}.theme.php', GLOB_BRACE);
+	$ext_themelets = zglob("ext/{".ENABLED_EXTS."}/theme.php");
+	$custom_themelets = zglob('themes/'.$_theme.'/{'.ENABLED_EXTS.'}.theme.php');
 
 	return array_merge($base_themelets, $ext_themelets, $custom_themelets);
 }
diff --git a/ext/ext_manager/main.php b/ext/ext_manager/main.php
index 696f5046..851ebdbf 100644
--- a/ext/ext_manager/main.php
+++ b/ext/ext_manager/main.php
@@ -141,10 +141,10 @@ class ExtManager extends Extension {
 	private function get_extensions(/*bool*/ $all) {
 		$extensions = array();
 		if($all) {
-			$exts = glob("ext/*/main.php", GLOB_BRACE);
+			$exts = zglob("ext/*/main.php");
 		}
 		else {
-			$exts = glob("ext/{".ENABLED_EXTS."}/main.php", GLOB_BRACE);
+			$exts = zglob("ext/{".ENABLED_EXTS."}/main.php");
 		}
 		foreach($exts as $main) {
 			$extensions[] = new ExtensionInfo($main);