Skip to content
Browse files

Merge branch 'master' into branch_2.4

  • Loading branch information...
2 parents 88fa824 + bfd4dde commit c5aef0faea9f7e25df97003ad32a2475907a8494 @shish committed May 23, 2012
View
24 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);
}
View
2 ext/et/main.php
@@ -54,7 +54,7 @@ private function get_info() {
$info['thumb_quality'] = $config->get_int('thumb_quality');
$info['thumb_width'] = $config->get_int('thumb_width');
$info['thumb_height'] = $config->get_int('thumb_height');
- $info['thumb_mem'] = $config->get_int("thumb_max_memory");
+ $info['thumb_mem'] = $config->get_int("thumb_mem_limit");
$info['stat_images'] = $database->get_one("SELECT COUNT(*) FROM images");
$info['stat_comments'] = $database->get_one("SELECT COUNT(*) FROM comments");
View
4 ext/ext_manager/main.php
@@ -141,10 +141,10 @@ public function onUserBlockBuilding(UserBlockBuildingEvent $event) {
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);
View
2 ext/handle_ico/main.php
@@ -97,7 +97,7 @@ private function create_thumb($hash) {
$w = $config->get_int("thumb_width");
$h = $config->get_int("thumb_height");
$q = $config->get_int("thumb_quality");
- $mem = $config->get_int("thumb_max_memory") / 1024 / 1024; // IM takes memory in MB
+ $mem = $config->get_int("thumb_mem_limit") / 1024 / 1024; // IM takes memory in MB
if($config->get_bool("ico_convert")) {
// "-limit memory $mem" broken?
View
1 ext/handle_pixel/main.php
@@ -90,7 +90,6 @@ private function make_thumb_convert(/*string*/ $inname, /*string*/ $outname) {
$w = $config->get_int("thumb_width");
$h = $config->get_int("thumb_height");
$q = $config->get_int("thumb_quality");
- $mem = $config->get_int("thumb_max_memory") / 1024 / 1024; // IM takes memory in MB
// Windows is a special case
if(in_array("OS", $_SERVER) && $_SERVER["OS"] == 'Windows_NT') {
View
4 ext/home/main.php
@@ -70,8 +70,8 @@ private function get_body() {
}
else {
$main_links = '[url=site://post/list]Posts[/url] [url=site://comment/list]Comments[/url] [url=site://tags]Tags[/url]';
- if(file_exists("ext/pools")) {$main_links .= ' [url=site://pools]Pools[/url]';}
- if(file_exists("ext/wiki")) {$main_links .= ' [url=site://wiki]Wiki[/url]';}
+ if(class_exists("Pools")) {$main_links .= ' [url=site://pools]Pools[/url]';}
+ if(class_exists("Wiki")) {$main_links .= ' [url=site://wiki]Wiki[/url]';}
$main_links .= ' [url=site://ext_doc]>>[/url]';
}
$main_links = format_text($main_links);
View
6 ext/image/main.php
@@ -267,7 +267,9 @@ public function onSetupBuilding(SetupBuildingEvent $event) {
$sb->add_int_option("thumb_quality");
$sb->add_label(" % quality ");
- $sb->add_shorthand_int_option("thumb_mem_limit", "<br>Max memory use: ");
+ if($config->get_string("thumb_engine") == "gd") {
+ $sb->add_shorthand_int_option("thumb_mem_limit", "<br>Max memory use: ");
+ }
$event->panel->add_block($sb);
}
@@ -293,7 +295,7 @@ private function add_image($image) {
if($handler == "merge" || isset($_GET['update'])) {
$merged = array_merge($image->get_tag_array(), $existing->get_tag_array());
send_event(new TagSetEvent($existing, $merged));
- if(isset($_GET['rating']) && isset($_GET['update']) && file_exists("ext/rating")){
+ if(isset($_GET['rating']) && isset($_GET['update']) && class_exists("Ratings")){
send_event(new RatingSetEvent($existing, $user, $_GET['rating']));
}
if(isset($_GET['source']) && isset($_GET['update'])){
View
2 ext/upload/main.php
@@ -329,7 +329,7 @@ private function try_transload($url, $tags, $source, $replace='') {
}
// Checks if url contains rating, also checks if the rating extension is enabled.
- if($config->get_string("transload_engine", "none") != "none" && file_exists("ext/rating") && !empty($_GET['rating'])) {
+ if($config->get_string("transload_engine", "none") != "none" && class_exists("Ratings") && !empty($_GET['rating'])) {
// Rating event will validate that this is s/q/e/u
$rating = strtolower($_GET['rating']);
$rating = $rating[0];
View
8 ext/upload/theme.php
@@ -215,10 +215,10 @@ function() {
// Bookmarklet checks if shimmie supports ext. If not, won't upload to site/shows alert saying not supported.
$supported_ext = "jpg jpeg gif png";
- if(file_exists("ext/handle_flash")){$supported_ext .= " swf";}
- if(file_exists("ext/handle_ico")){$supported_ext .= " ico ani cur";}
- if(file_exists("ext/handle_mp3")){$supported_ext .= " mp3";}
- if(file_exists("ext/handle_svg")){$supported_ext .= " svg";}
+ if(class_exists("FlashFileHandler")){$supported_ext .= " swf";}
+ if(class_exists("ICOFileHandler")){$supported_ext .= " ico ani cur";}
+ if(class_exists("MP3FileHandler")){$supported_ext .= " mp3";}
+ if(class_exists("SVGFileHandler")){$supported_ext .= " svg";}
$title = "Booru to " . $config->get_string('title');
// CA=0: Ask to use current or new tags | CA=1: Always use current tags | CA=2: Always use new tags
$html .= '<p><a href="javascript:
View
8 themes/danbooru/layout.class.php
@@ -140,11 +140,11 @@ public function display_page($page) {
# be nice to be correct
case "post":
case "upload":
- if(file_exists("ext/numeric_score")){ $custom_sublinks .= "<li><b>Popular by </b><a href='".make_link('popular_by_day')."'>Day</a>/<a href='".make_link('popular_by_month')."'>Month</a>/<a href='".make_link('popular_by_year')."'>Year</a></li>";}
+ if(class_exists("NumericScore")){ $custom_sublinks .= "<li><b>Popular by </b><a href='".make_link('popular_by_day')."'>Day</a>/<a href='".make_link('popular_by_month')."'>Month</a>/<a href='".make_link('popular_by_year')."'>Year</a></li>";}
$custom_sublinks .= "<li><a href='".make_link('post/list')."'>All</a></li>";
- if(file_exists("ext/favorites")){ $custom_sublinks .= "<li><a href='".make_link("post/list/favorited_by=$username/1")."'>My Favorites</a></li>";}
- if(file_exists("ext/rss_images")){ $custom_sublinks .= "<li><a href='".make_link('rss/images')."'>Feed</a></li>";}
- if(file_exists("ext/random_image")){ $custom_sublinks .= "<li><a href='".make_link("random_image/view")."'>Random Image</a></li>";}
+ if(class_exists("Favorites")){ $custom_sublinks .= "<li><a href='".make_link("post/list/favorited_by=$username/1")."'>My Favorites</a></li>";}
+ if(class_exists("RSS_Images")){ $custom_sublinks .= "<li><a href='".make_link('rss/images')."'>Feed</a></li>";}
+ if(class_exists("RandomImage")){ $custom_sublinks .= "<li><a href='".make_link("random_image/view")."'>Random Image</a></li>";}
if($hw){ $custom_sublinks .= "<li><a href='".make_link("wiki/posts")."'>Help</a></li>";
}else{ $custom_sublinks .= "<li><a href='".make_link("ext_doc/index")."'>Help</a></li>";}
break;
View
2 themes/danbooru/view.theme.php
@@ -38,7 +38,7 @@ private function build_stats($image) {
$html .= "<br>Source: <a href='$h_source'>link</a>";
}
- if(file_exists("ext/rating")) {
+ if(class_exists("Ratings")) {
if($image->rating == null || $image->rating == "u"){
$image->rating = "u";
}
View
8 themes/lite/layout.class.php
@@ -94,11 +94,11 @@ public function display_page(Page $page) {
# the subnav links aren't shown, but it would
# be nice to be correct
case "post":
- if(file_exists("ext/numeric_score")){ $cs .= "<b>Popular by </b><a href='".make_link('popular_by_day')."'>Day</a><b>/</b><a href='".make_link('popular_by_month')."'>Month</a><b>/</b><a href='".make_link('popular_by_year')."'>Year</a> ";}
+ if(class_exists("NumericScore")){ $cs .= "<b>Popular by </b><a href='".make_link('popular_by_day')."'>Day</a><b>/</b><a href='".make_link('popular_by_month')."'>Month</a><b>/</b><a href='".make_link('popular_by_year')."'>Year</a> ";}
$cs .= "<a class='tab' href='".make_link('post/list')."'>All</a>";
- if(file_exists("ext/favorites")){ $cs .= "<a class='tab' href='".make_link("post/list/favorited_by=$username/1")."'>My Favorites</a>";}
- if(file_exists("ext/rss_images")){ $cs .= "<a class='tab' href='".make_link('rss/images')."'>Feed</a>";}
- if(file_exists("ext/random_image")){ $cs .= "<a class='tab' href='".make_link("random_image/view")."'>Random Image</a>";}
+ if(class_exists("Favorites")){ $cs .= "<a class='tab' href='".make_link("post/list/favorited_by=$username/1")."'>My Favorites</a>";}
+ if(class_exists("RSS_Images")){ $cs .= "<a class='tab' href='".make_link('rss/images')."'>Feed</a>";}
+ if(class_exists("Random_Image")){ $cs .= "<a class='tab' href='".make_link("random_image/view")."'>Random Image</a>";}
if($hw){ $cs .= "<a class='tab' href='".make_link("wiki/posts")."'>Help</a>";
}else{ $cs .= "<a class='tab' href='".make_link("ext_doc/index")."'>Help</a>";}
break;
View
2 themes/lite/view.theme.php
@@ -44,7 +44,7 @@ private function build_stats($image) {
$html .= "<br>Source: <a href='$h_source'>link</a>";
}
- if(file_exists("ext/rating")) {
+ if(class_exists("Ratings")) {
if($image->rating == null || $image->rating == "u"){
$image->rating = "u";
}

0 comments on commit c5aef0f

Please sign in to comment.
Something went wrong with that request. Please try again.