diff --git a/Rocksolid_Light/rocksolid/overboard.php b/Rocksolid_Light/rocksolid/overboard.php index 66e64a9..26e9b7e 100644 --- a/Rocksolid_Light/rocksolid/overboard.php +++ b/Rocksolid_Light/rocksolid/overboard.php @@ -354,8 +354,8 @@ function display_threads($threads, $oldest) if ($result_count > 1 && isset($target_head['date'])) { $poster = get_poster_name(mb_decode_mimeheader($target_head['name'])); $block = false; - foreach ($blocked_user_config as $key => $value) { - $blockme = '/' . addslashes($key) . '/'; + foreach ($blocked_user_config as $bkey => $bvalue) { + $blockme = '/' . addslashes($bkey) . '/'; if (preg_match($blockme, $target_head['name'])) { $block = true; break; @@ -484,34 +484,33 @@ function display_flat($threads, $oldest) $display .= ''; } $block = false; - foreach ($blocked_user_config as $key => $value) { - $blockme = '/' . addslashes($key) . '/'; + foreach ($blocked_user_config as $bkey => $bvalue) { + $blockme = '/' . addslashes($bkey) . '/'; if (preg_match($blockme, $target['name'])) { $block = true; break; } } if ($block) { - // $display .= '

'; $display .= '

'; $display .= '(message #' . $target['number'] . ' hidden by your blocklist)'; } else { $url = $thissite . "/article-flat.php?id=" . $target['number'] . "&group=" . _rawurlencode($target['newsgroup']) . "#" . $target['number']; $display .= '

'; $display .= '' . headerDecode($target['subject']) . ''; - + $display .= '

'; + $display .= 'by: ' . create_name_link($poster['name'], $poster['from']) . ''; + + $display .= '

'; // link for (thread), if possible if (isset($this_overboard['threadlink'][$value])) { $thread = get_data_from_msgid($this_overboard['threadlink'][$value], $target['newsgroup']); if ($thread !== false) { - $display .= ' (thread)'; + $display .= ' (full thread)'; } } $display .= '

'; - $display .= '

'; - $display .= '' . $target['newsgroup'] . ''; - $display .= '

'; - $display .= '

Posted: ' . get_date_interval(date("D, j M Y H:i T", $target['date'])) . ' by: ' . create_name_link($poster['name'], $poster['from']) . '

'; + $display .= '

Posted: ' . get_date_interval(date("D, j M Y H:i T", $target['date'])) . ' in: ' . $target['newsgroup'] . '

'; if ($CONFIG['article_database'] == '1') { $article = get_db_data_from_msgid($target['msgid'], $target['newsgroup'], 1); $display .= htmlentities(substr($article['search_snippet'], 0, $snippetlength));