novabbs
/
rocksolid-light
3
0
Fork 1
Code Issues 22 Pull Requests Releases Wiki Activity

Merge branch 'devel'

This commit is contained in:
Retro_Guy 2024-09-12 04:43:27 -07:00
parent 7dd998fae7 b22afff5cb
commit 8052fe0674
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Rocksolid_Light/common/version.txt
View File

@ -1 +1 @@
0.9.15 0.9.151

14
Rocksolid_Light/rocksolid/overboard.php
View File

@ -312,6 +312,9 @@ function display_threads($threads, $oldest)
$style = 0; $style = 0;
$results = 0; $results = 0;
foreach ($nicole as $key => $value) { foreach ($nicole as $key => $value) {
if(isset($target_head)) {
unset($target_head);
}
if (isset($this_overboard['msgids'][$key])) { if (isset($this_overboard['msgids'][$key])) {
$target_head = $this_overboard['msgids'][$key]; $target_head = $this_overboard['msgids'][$key];
} }
@ -509,7 +512,7 @@ function display_flat($threads, $oldest)
} }
if ($target['date'] < $expireme) { if ($target['date'] < $expireme) {
unset($this_overboard['threads'][$target['date']]); unset($this_overboard['threads'][$target['date']]);
unset($this_overboard['threadlink'][$new]); unset($this_overboard['threadlink'][$value]);
file_put_contents($logfile, "\n" . format_log_date() . " " . $config_name . " Pruning: " . $target['newsgroup'] . ":" . $target['number'], FILE_APPEND); file_put_contents($logfile, "\n" . format_log_date() . " " . $config_name . " Pruning: " . $target['newsgroup'] . ":" . $target['number'], FILE_APPEND);
} }
$poster = get_poster_name(mb_decode_mimeheader($target['name'])); $poster = get_poster_name(mb_decode_mimeheader($target['name']));
@ -539,9 +542,14 @@ function display_flat($threads, $oldest)
$display .= '</p>'; $display .= '</p>';
// link for (thread), if possible // link for (thread), if possible
if(isset($target_head)) {
unset($target_head);
}
// Display 'full thread' link if available
if (isset($this_overboard['threadlink'][$value])) { if (isset($this_overboard['threadlink'][$value])) {
if ($target !== false) { $target_head = get_data_from_msgid($this_overboard['threadlink'][$value]);
$display .= '<font class="np_ob_group"><a href="article-flat.php?id=' . $target['number'] . '&group=' . rawurlencode($target['newsgroup']) . '#' . $target['number'] . '"> (full thread)</a></font>'; if ($target_head !== false) {
$display .= '<font class="np_ob_group"><a href="article-flat.php?id=' . $target_head['number'] . '&group=' . rawurlencode($target_head['newsgroup']) . '#' . $target_head['number'] . '"> (full thread)</a></font>';
} }
} }
$display .= '</p>'; $display .= '</p>';