adrian/tcm-in-guestrow-tpl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix wrong order of _tpl_action() items, return instead of echo (fixes #9)

Browse source
This commit is contained in:
Anika Henke 2015-08-01 19:23:36 +01:00
parent d5181379cb
commit 5da0b4f572
1 changed files with 40 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

58
tpl_functions.php
View file

@ -16,29 +16,40 @@ if (!defined('DOKU_INC')) die();
* *
* @author Anika Henke <anika@selfthinker.org> * @author Anika Henke <anika@selfthinker.org>
*/ */
function _tpl_discussion($discussionPage, $title, $backTitle, $link=0, $wrapper=0) { function _tpl_discussion($discussionPage, $title, $backTitle, $link=0, $wrapper=0, $return=0) {
global $ID; global $ID;
$output = '';
$discussPage = str_replace('@ID@', $ID, $discussionPage); $discussPage = str_replace('@ID@', $ID, $discussionPage);
$discussPageRaw = str_replace('@ID@', '', $discussionPage); $discussPageRaw = str_replace('@ID@', '', $discussionPage);
$isDiscussPage = strpos($ID, $discussPageRaw) !== false; $isDiscussPage = strpos($ID, $discussPageRaw) !== false;
$backID = ':'.str_replace($discussPageRaw, '', $ID); $backID = ':'.str_replace($discussPageRaw, '', $ID);
if ($wrapper) echo "<$wrapper>"; if ($wrapper) $output .= "<$wrapper>";
if ($isDiscussPage) { if ($isDiscussPage) {
if ($link) if ($link) {
ob_start();
tpl_pagelink($backID, $backTitle); tpl_pagelink($backID, $backTitle);
else $output .= ob_get_contents();
echo html_btn('back2article', $backID, '', array(), 'get', 0, $backTitle); ob_end_clean();
} else { } else {
if ($link) $output .= html_btn('back2article', $backID, '', array(), 'get', 0, $backTitle);
}
} else {
if ($link) {
ob_start();
tpl_pagelink($discussPage, $title); tpl_pagelink($discussPage, $title);
else $output .= ob_get_contents();
echo html_btn('discussion', $discussPage, '', array(), 'get', 0, $title); ob_end_clean();
} else {
$output .= html_btn('discussion', $discussPage, '', array(), 'get', 0, $title);
}
} }
if ($wrapper) echo "</$wrapper>"; if ($wrapper) $output .= "</$wrapper>";
if ($return) return $output;
echo $output;
} }
/** /**
@ -46,20 +57,27 @@ function _tpl_discussion($discussionPage, $title, $backTitle, $link=0, $wrapper=
* *
* @author Anika Henke <anika@selfthinker.org> * @author Anika Henke <anika@selfthinker.org>
*/ */
function _tpl_userpage($userPage, $title, $link=0, $wrapper=0) { function _tpl_userpage($userPage, $title, $link=0, $wrapper=0, $return=0) {
if (empty($_SERVER['REMOTE_USER'])) return; if (empty($_SERVER['REMOTE_USER'])) return;
global $conf; global $conf;
$output = '';
$userPage = str_replace('@USER@', $_SERVER['REMOTE_USER'], $userPage); $userPage = str_replace('@USER@', $_SERVER['REMOTE_USER'], $userPage);
if ($wrapper) echo "<$wrapper>"; if ($wrapper) $output .= "<$wrapper>";
if ($link) if ($link) {
ob_start();
tpl_pagelink($userPage, $title); tpl_pagelink($userPage, $title);
else $output .= ob_get_contents();
echo html_btn('userpage', $userPage, '', array(), 'get', 0, $title); ob_end_clean();
} else {
$output .= html_btn('userpage', $userPage, '', array(), 'get', 0, $title);
}
if ($wrapper) echo "</$wrapper>"; if ($wrapper) $output .= "</$wrapper>";
if ($return) return $output;
echo $output;
} }
/** /**
@ -67,16 +85,20 @@ function _tpl_userpage($userPage, $title, $link=0, $wrapper=0) {
* *
* @author Anika Henke <anika@selfthinker.org> * @author Anika Henke <anika@selfthinker.org>
*/ */
function _tpl_action($type, $link=0, $wrapper=0) { function _tpl_action($type, $link=0, $wrapper=0, $return=0) {
switch ($type) { switch ($type) {
case 'discussion': case 'discussion':
if (tpl_getConf('discussionPage')) { if (tpl_getConf('discussionPage')) {
_tpl_discussion(tpl_getConf('discussionPage'), tpl_getLang('discussion'), tpl_getLang('back_to_article'), $link, $wrapper); $output = _tpl_discussion(tpl_getConf('discussionPage'), tpl_getLang('discussion'), tpl_getLang('back_to_article'), $link, $wrapper, 1);
if ($return) return $output;
echo $output;
} }
break; break;
case 'userpage': case 'userpage':
if (tpl_getConf('userPage')) { if (tpl_getConf('userPage')) {
_tpl_userpage(tpl_getConf('userPage'), tpl_getLang('userpage'), $link, $wrapper); $output = _tpl_userpage(tpl_getConf('userPage'), tpl_getLang('userpage'), $link, $wrapper, 1);
if ($return) return $output;
echo $output;
} }
break; break;
} }