james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

enhance zglob to allow really long patterns

Browse Source
This commit is contained in:
Shish 2012-05-22 12:46:56 +01:00
parent cb8b4f3329
commit 2e76add61b
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
core/util.inc.php
View File

@ -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);
}

4
ext/ext_manager/main.php
View File

@ -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);