novabbs
/
rocksolid-light
2
0
Fork 1
Code Issues 16 Pull Requests Releases Wiki Activity

Move checking user's subscription array to a function in overboard.php.

This commit is contained in:
Retro_Guy 2024-04-30 03:42:10 -07:00
parent 6f62f72a1b
commit 61e1fedfc7
1 changed files with 36 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
Rocksolid_Light/rocksolid/overboard.php
View File

@ -313,11 +313,8 @@ function display_threads($threads, $oldest)
} }
// Skip if not in registered users sub list // Skip if not in registered users sub list
$checkgroup = $target_head['newsgroup']; if (! check_group_for_user($target_head['newsgroup'], $userdata, $user_config)) {
if (! isset($userdata[$checkgroup])) { continue;
if (isset($user_config['hide_unsub']) && $user_config['hide_unsub'] == 'hide') {
continue;
}
} }
// Check if only displaying new posts in section // Check if only displaying new posts in section
@ -344,11 +341,8 @@ function display_threads($threads, $oldest)
continue; continue;
} }
// Skip if not in registered users sub list // Skip if not in registered users sub list
$checkgroup = $target['newsgroup']; if (! check_group_for_user($target['newsgroup'], $userdata, $user_config)) {
if (! isset($userdata[$checkgroup])) { continue;
if (isset($user_config['hide_unsub']) && $user_config['hide_unsub'] == 'hide') {
continue;
}
} }
// Check if only displaying new posts in section // Check if only displaying new posts in section
if ($newonly) { if ($newonly) {
@ -377,10 +371,10 @@ function display_threads($threads, $oldest)
$display .= '<a href="thread.php?group=' . _rawurlencode($target_head['newsgroup']) . '">' . $target_head['newsgroup'] . '</a>'; $display .= '<a href="thread.php?group=' . _rawurlencode($target_head['newsgroup']) . '">' . $target_head['newsgroup'] . '</a>';
// Do better than !isset($value[$target_head['msgid']]) // Do better than !isset($value[$target_head['msgid']])
$timetest = $oldest; $timetest = $oldest;
if($newonly) { if ($newonly) {
$timetest = $userdata[$target_head['newsgroup']]; $timetest = $userdata[$target_head['newsgroup']];
} }
if((($target_head['date'] < $timetest) || $result_count > 10) && isset($target_head['date'])) { if ((($target_head['date'] < $timetest) || $result_count > 10) && isset($target_head['date'])) {
$poster = get_poster_name(mb_decode_mimeheader($target_head['name'])); $poster = get_poster_name(mb_decode_mimeheader($target_head['name']));
$block = false; $block = false;
foreach ($blocked_user_config as $bkey => $bvalue) { foreach ($blocked_user_config as $bkey => $bvalue) {
@ -493,14 +487,11 @@ function display_flat($threads, $oldest)
$results = 0; $results = 0;
foreach ($threads as $key => $value) { foreach ($threads as $key => $value) {
$target = $this_overboard['msgids'][$value]; $target = $this_overboard['msgids'][$value];
$checkgroup = $target['newsgroup'];
if (! isset($target['msgid'])) { if (! isset($target['msgid'])) {
$target = get_data_from_msgid($value); $target = get_data_from_msgid($value);
} }
if (! isset($userdata[$checkgroup])) { if (! check_group_for_user($target['newsgroup'], $userdata, $user_config)) {
if (isset($user_config['hide_unsub']) && $user_config['hide_unsub'] == 'hide') { continue;
continue;
}
} }
if ($target['date'] < $oldest) { if ($target['date'] < $oldest) {
continue; continue;
@ -631,15 +622,41 @@ function show_overboard_header($grouplist)
} }
echo '</div><td></td>'; echo '</div><td></td>';
echo '<td class="np_ob_style_toggle">'; echo '<td class="np_ob_style_toggle">';
echo '<div style="float:right;">'; echo '<div style="float:right;">';
show_overboard_style_toggle(); show_overboard_style_toggle();
echo '</div>'; echo '</div>';
echo '</td>'; echo '</td>';
echo '</tr></table>'; echo '</tr></table>';
} }
// Return TRUE unless group is not subscribed by user
// It is assumed $newsgroups to check are verified to be in SECTION
function check_group_for_user($newsgroups, $userdata, $user_config)
{
if(!is_array($userdata)) {
// No logged in user
return true;
}
$testgroup = preg_split("/\ |\,/", $newsgroups);
$ok = true;
foreach ($testgroup as $checkgroup) {
if (! isset($userdata[$checkgroup])) {
if (isset($user_config['hide_unsub']) && $user_config['hide_unsub'] == 'hide') {
$ok = false;
} else {
$ok = true;
break;
}
} else {
$ok = true;
break;
}
}
return $ok;
}
function show_overboard_style_toggle() function show_overboard_style_toggle()
{ {
echo '<form method="post" action="' . $_SERVER['REQUEST_URI'] . '">'; echo '<form method="post" action="' . $_SERVER['REQUEST_URI'] . '">';