diff --git a/inc/display.php b/inc/display.php index be0881fd..3860aa84 100644 --- a/inc/display.php +++ b/inc/display.php @@ -56,6 +56,30 @@ function doBoardListPart($list, $root, &$boards) { return $body; } +function createForeignBoardListSection($configKey){ + $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($configKey)) { + $body .= ' /'; + } + } + + $body .= '] '; + } + + return body; +} + function createBoardlist($mod=false) { global $config; @@ -67,45 +91,11 @@ function createBoardlist($mod=false) { $boards[$val['uri']] = $val['title']; } $body = ''; - if (isset($config['prepended_foreign_boards'])){ - $body .= ' ['; - - // Append links to foreign boards - $i = 0; - foreach ($config['prepended_foreign_boards'] as $fboardname => $fboardurl) { - $i++; - $body .= ' ' . $fboardname . ''; - - // only put slash in between elements - if ($i != count($config['prepended_foreign_boards'])) { - $body .= ' /'; - } - } - - $body .= '] '; - } + $body .= createForeignBoardListSection('prepended_foreign_boards'); $body .= doBoardListPart($config['boards'], $mod?'?/':$config['root'], $boards); - - if (isset($config['foreign_boards'])) { - - $body .= ' ['; - - // Append links to foreign boards - $i = 0; - foreach ($config['foreign_boards'] as $fboardname => $fboardurl) { - $i++; - $body .= ' ' . $fboardname . ''; - - // only put slash in between elements - if ($i != count($config['foreign_boards'])) { - $body .= ' /'; - } - } - - $body .= '] '; - } + $body .= createForeignBoardListSection('foreign_boards'); if ($config['boardlist_wrap_bracket'] && !preg_match('/\] $/', $body)) $body = '[' . $body . ']'; diff --git a/inc/instance-config.php b/inc/instance-config.php index d1f7f966..f4d86604 100644 --- a/inc/instance-config.php +++ b/inc/instance-config.php @@ -25,7 +25,7 @@ $config['boards'] = array( ); $config['prepended_foreign_boards'] = array( - 'overboard' => '/overboard', + 'overboard' => '/overboard/', ); $config['foreign_boards'] = array(