diff --git a/inc/display.php b/inc/display.php index 6de187a3..0666056c 100644 --- a/inc/display.php +++ b/inc/display.php @@ -50,37 +50,11 @@ function doBoardListPart($list, $root, &$boards) { } } } - $body = preg_replace('/\/$/', '', $body); return $body; } -function createForeignBoardListSection($configKey){ - global $config; - $body = ''; - - if (isset($config[$configKey])){ - $body .= ' ['; - - // Append links to foreign boards - $i = 0; - foreach ($config[$configKey] as $fboardname => $fboardurl) { - $i++; - $body .= ' ' . $fboardname . ''; - - // only put slash in between elements - if ($i != count($config[$configKey])) { - $body .= ' /'; - } - } - - $body .= '] '; - } - - return $body; -} - function createBoardlist($mod=false) { global $config; @@ -91,10 +65,8 @@ function createBoardlist($mod=false) { foreach ($xboards as $val) { $boards[$val['uri']] = $val['title']; } - $body = ''; - $body .= createForeignBoardListSection('prepended_foreign_boards'); - $body .= doBoardListPart($config['boards'], $mod?'?/':$config['root'], $boards); - $body .= createForeignBoardListSection('foreign_boards'); + + $body = doBoardListPart($config['boards'], $mod?'?/':$config['root'], $boards); if ($config['boardlist_wrap_bracket'] && !preg_match('/\] $/', $body)) $body = '[' . $body . ']'; @@ -110,7 +82,6 @@ function createBoardlist($mod=false) { ); } - function loginForm($error=false, $username=false, $redirect=false) { global $config;