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

main.php shouldn't be generating HTML..

Browse Source
This commit is contained in:
Daku 2014-05-30 11:55:53 +01:00
parent f228a8eb4f
commit 1dc668ca41
2 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ext/pools/main.php
View File

@ -267,29 +267,19 @@ class Pools extends Extension {
$show_nav = $config->get_bool("poolsShowNavLinks", false); $show_nav = $config->get_bool("poolsShowNavLinks", false);
$linksPools = array(); $navInfo = array();
foreach($poolsIDs as $poolID) { foreach($poolsIDs as $poolID) {
$pools = $this->get_pool($poolID['pool_id']); $pool = $this->get_single_pool($poolID['pool_id']);
foreach ($pools as $pool){
$linksPools[] = "<a href='".make_link("pool/view/".$pool['id'])."'>".html_escape($pool['title'])."</a>"; $navInfo[$pool['id']] = array();
$navInfo[$pool['id']]['info'] = $pool;
// Optionally show a link the Prev/Next image in the Pool.
if ($show_nav) { // Optionally show a link the Prev/Next image in the Pool.
$nav = $this->get_nav_posts($pool, $imageID); if ($show_nav) {
$navlinks = ""; $navInfo[$pool['id']]['nav'] = $this->get_nav_posts($pool, $imageID);
if (!empty($nav['prev'])) {
$navlinks .= '<a href="'.make_link('post/view/'.$nav['prev']).'" class="pools_prev_img">Prev</a>';
}
if (!empty($nav['next'])) {
$navlinks .= '<a href="'.make_link('post/view/'.$nav['next']).'" class="pools_next_img">Next</a>';
}
if(!empty($navlinks)){
$linksPools[] = $navlinks;
}
}
} }
} }
$this->theme->pool_info($linksPools); $this->theme->pool_info($navInfo);
} }
} }

22
ext/pools/theme.php
View File

@ -3,9 +3,29 @@
class PoolsTheme extends Themelet { class PoolsTheme extends Themelet {
/** /**
* Adds a block to the panel with information on the pool(s) the image is in. * Adds a block to the panel with information on the pool(s) the image is in.
* @param array Multidimensional array containing pool id, info & nav IDs.
*/ */
public function pool_info($linksPools) { public function pool_info(/*array*/ $navIDs) {
global $page; global $page;
$linksPools = array();
foreach($navIDs as $poolID => $pool){
$linksPools[] = "<a href='".make_link("pool/view/".$poolID)."'>".html_escape($pool['info']['title'])."</a>";
if (array_key_exists('nav', $pool)){
$navlinks = "";
if (!empty($pool['nav']['prev'])) {
$navlinks .= '<a href="'.make_link('post/view/'.$pool['nav']['prev']).'" class="pools_prev_img">Prev</a>';
}
if (!empty($pool['nav']['next'])) {
$navlinks .= '<a href="'.make_link('post/view/'.$pool['nav']['next']).'" class="pools_next_img">Next</a>';
}
if(!empty($navlinks)){
$linksPools[] = $navlinks;
}
}
}
if(count($linksPools) > 0) { if(count($linksPools) > 0) {
$page->add_block(new Block("Pools", implode("<br>", $linksPools), "left")); $page->add_block(new Block("Pools", implode("<br>", $linksPools), "left"));
} }