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

stick the tag list paging option in the right place, and PDO/PG compat

Browse Source
This commit is contained in:
Shish 2011-12-25 23:14:13 +00:00
parent 082730f29a
commit 009b7ccbbb
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ext/tag_list/main.php
View File

@ -84,6 +84,7 @@ class TagList implements Extension {
if($event instanceof SetupBuildingEvent) { if($event instanceof SetupBuildingEvent) {
$sb = new SetupBlock("Tag Map Options"); $sb = new SetupBlock("Tag Map Options");
$sb->add_int_option("tags_min", "Only show tags used at least "); $sb->add_label(" times"); $sb->add_int_option("tags_min", "Only show tags used at least "); $sb->add_label(" times");
$sb->add_bool_option("tag_list_pages", "<br>Paged tag lists: ");
$event->panel->add_block($sb); $event->panel->add_block($sb);
$sb = new SetupBlock("Popular / Related Tag List"); $sb = new SetupBlock("Popular / Related Tag List");
@ -95,7 +96,6 @@ class TagList implements Extension {
"Show related" => "related" "Show related" => "related"
), "<br>Image tag list: "); ), "<br>Image tag list: ");
$sb->add_bool_option("tag_list_numbers", "<br>Show tag counts: "); $sb->add_bool_option("tag_list_numbers", "<br>Show tag counts: ");
$sb->add_bool_option("tag_list_pages", "<br>Paged tag lists: ");
$event->panel->add_block($sb); $event->panel->add_block($sb);
} }
} }
@ -144,7 +144,7 @@ class TagList implements Extension {
substr(tag, 1, 1) substr(tag, 1, 1)
FROM tags FROM tags
WHERE count >= :tags_min WHERE count >= :tags_min
ORDER BY tag ORDER BY substr(tag, 1, 1)
", array("tags_min"=>$tags_min)); ", array("tags_min"=>$tags_min));
$html = ""; $html = "";
@ -177,15 +177,16 @@ class TagList implements Extension {
$cache_key = "data/tag_cloud-" . md5("tc" . $tags_min . $starts_with) . ".html"; $cache_key = "data/tag_cloud-" . md5("tc" . $tags_min . $starts_with) . ".html";
if(file_exists($cache_key)) {return file_get_contents($cache_key);} if(file_exists($cache_key)) {return file_get_contents($cache_key);}
// SHIT: PDO/pgsql has problems using the same named param twice -_-;;
$tag_data = $database->get_all(" $tag_data = $database->get_all("
SELECT SELECT
tag, tag,
FLOOR(LOG(2.7, LOG(2.7, count - :tags_min + 1)+1)*1.5*100)/100 AS scaled FLOOR(LOG(2.7, LOG(2.7, count - :tags_min2 + 1)+1)*1.5*100)/100 AS scaled
FROM tags FROM tags
WHERE count >= :tags_min WHERE count >= :tags_min
AND tag LIKE :starts_with AND tag LIKE :starts_with
ORDER BY tag ORDER BY tag
", array("tags_min"=>$tags_min, "starts_with"=>$starts_with)); ", array("tags_min"=>$tags_min, "tags_min2"=>$tags_min, "starts_with"=>$starts_with));
$html = ""; $html = "";
if($config->get_bool("tag_list_pages")) $html .= $this->build_az(); if($config->get_bool("tag_list_pages")) $html .= $this->build_az();