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

backports~

Browse Source 
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@881 7f39781d-f577-437e-ae19-be835c7a54ca
This commit is contained in:
shish 2008-05-25 23:06:10 +00:00
parent bea09d836d
commit 0c334f05ed
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/page.class.php
View File

@ -16,11 +16,16 @@ class GenericPage {
// data // data
var $data = ""; var $data = "";
var $filename = null;
public function set_data($data) { public function set_data($data) {
$this->data = $data; $this->data = $data;
} }
public function set_filename($filename) {
$this->filename = $filename;
}
// ============================================== // ==============================================
@ -78,6 +83,9 @@ class GenericPage {
$layout->display_page($this); $layout->display_page($this);
break; break;
case "data": case "data":
if(!is_null($this->filename)) {
header('Content-Disposition: attachment; filename='.$this->filename);
}
print $this->data; print $this->data;
break; break;
case "redirect": case "redirect":

8
ext/tag_list/main.php
View File

@ -63,7 +63,7 @@ class TagList extends Extension {
if(is_a($event, 'SetupBuildingEvent')) { if(is_a($event, 'SetupBuildingEvent')) {
$sb = new SetupBlock("Tag Map Options"); $sb = new SetupBlock("Tag Map Options");
$sb->add_int_option("tags_min", "Ignore tags used fewer than "); $sb->add_label(" times"); $sb->add_int_option("tags_min", "Only show tags used at least "); $sb->add_label(" times");
$event->panel->add_block($sb); $event->panel->add_block($sb);
$sb = new SetupBlock("Popular / Related Tag List"); $sb = new SetupBlock("Popular / Related Tag List");
@ -103,7 +103,7 @@ class TagList extends Extension {
tag, tag,
FLOOR(LOG(LOG(count - ? + 1)+1)*1.5*100)/100 AS scaled FLOOR(LOG(LOG(count - ? + 1)+1)*1.5*100)/100 AS scaled
FROM tags FROM tags
WHERE count > ? WHERE count >= ?
ORDER BY tag ORDER BY tag
", array($tags_min, $tags_min)); ", array($tags_min, $tags_min));
$tag_data = $result->GetArray(); $tag_data = $result->GetArray();
@ -124,7 +124,7 @@ class TagList extends Extension {
$tags_min = $config->get_int('tags_min'); $tags_min = $config->get_int('tags_min');
$result = $database->execute( $result = $database->execute(
"SELECT tag,count FROM tags WHERE count > ? ORDER BY tag", "SELECT tag,count FROM tags WHERE count >= ? ORDER BY tag",
array($tags_min)); array($tags_min));
$tag_data = $result->GetArray(); $tag_data = $result->GetArray();
@ -150,7 +150,7 @@ class TagList extends Extension {
$tags_min = $config->get_int('tags_min'); $tags_min = $config->get_int('tags_min');
$result = $database->execute( $result = $database->execute(
"SELECT tag,count,FLOOR(LOG(count)) AS scaled FROM tags WHERE count > ? ORDER BY count DESC, tag ASC", "SELECT tag,count,FLOOR(LOG(count)) AS scaled FROM tags WHERE count >= ? ORDER BY count DESC, tag ASC",
array($tags_min)); array($tags_min));
$tag_data = $result->GetArray(); $tag_data = $result->GetArray();