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

Some bug cleanup in overboard and creating .db3 files.

This commit is contained in:
Retro_Guy 2024-05-02 05:45:29 -07:00
parent 087e26ca6a
commit bbdf946dca
2 changed files with 61 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Rocksolid_Light/rocksolid/newsportal.php
View File

@ -369,7 +369,7 @@ function testGroup($groupname)
}
}
function get_section_by_group($groupname)
function get_section_by_group($groupname, $all_sections = false)
{
global $CONFIG, $config_dir;
$menulist = file($config_dir . "menu.conf", FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
@ -382,7 +382,9 @@ function get_section_by_group($groupname)
}
$menuitem = explode(':', $menu);
if ($menuitem[1] == '0') {
continue;
if (! $all_sections) {
continue;
}
}
$section = "";
$gldata = file($config_dir . $menuitem[0] . "/groups.txt");
@ -1538,6 +1540,29 @@ function get_date_interval($value)
return $variance;
}
function get_newsgroups_by_msgid($msgid)
{
global $spooldir, $CONFIG;
$database = $spooldir . '/articles-overview.db3';
$table = 'overview';
$overview_dbh = overview_db_open($database, $table);
$overview_stmt = $overview_dbh->prepare("SELECT newsgroup FROM overview WHERE msgid=:msgid");
$overview_stmt->bindParam(':msgid', $msgid);
$overview_stmt->execute();
$found = false;
$groups = array();
while ($row = $overview_stmt->fetch()) {
$groups[] = $row['newsgroup'];
$found = true;
}
if (! $found) {
$groups = null;
}
$overview_dbh = null;
return ($groups);
}
function create_xref_from_msgid($msgid, $thisgroup = null, $thisnumber = null)
{
global $spooldir, $CONFIG;
@ -1713,7 +1738,7 @@ function article_db_open($database, $table = 'articles')
$group = preg_replace("/\-articles\.db3/", "", $database);
$group = preg_replace($spoolpath, "", $group);
$group = preg_replace("/\//", "", $group);
if(!get_section_by_group($group)) {
if (! get_section_by_group($group, true)) {
file_put_contents($logfile, "\n" . format_log_date() . " " . $config_name . " Attempt to create: " . $database . " for: " . $group, FILE_APPEND);
return false;
}
@ -2050,7 +2075,8 @@ function verify_gpg_signature($res, $signed_text)
}
}
function mb_wordwrap($string, $width = 75, $break = "\n", $cut = false) {
function mb_wordwrap($string, $width = 75, $break = "\n", $cut = false)
{
$string = (string) $string;
if ($string === '') {
return '';
@ -2070,7 +2096,7 @@ function mb_wordwrap($string, $width = 75, $break = "\n", $cut = false) {
$breakWidth = mb_strlen($break);
$result = '';
$lastStart = $lastSpace = 0;
for ($current = 0; $current < $stringWidth; $current++) {
for ($current = 0; $current < $stringWidth; $current ++) {
$char = mb_substr($string, $current, 1);
$possibleBreak = $char;
if ($breakWidth !== 1) {
@ -2239,7 +2265,7 @@ function insert_article_from_array($this_article, $check_duplicates = true)
// Open articles Database
if ($CONFIG['article_database'] == '1') {
$article_dbh = article_db_open($spooldir . '/' . $group . '-articles.db3');
if(!$article_dbh) {
if (! $article_dbh) {
return "441 Cannot open " . $spooldir . '/' . $group . "-articles.db3\r\n";
}
$article_sql = 'INSERT OR IGNORE INTO articles(newsgroup, number, msgid, date, name, subject, article, search_snippet) VALUES(?,?,?,?,?,?,?,?)';
@ -2249,7 +2275,7 @@ function insert_article_from_array($this_article, $check_duplicates = true)
$database = $spooldir . '/articles-overview.db3';
$table = 'overview';
$overview_dbh = overview_db_open($database, $table);
if(!$overview_dbh) {
if (! $overview_dbh) {
$article_dbh = null;
return "441 Cannot open " . $database . "\r\n";
}

53
Rocksolid_Light/rocksolid/overboard.php
View File

@ -308,16 +308,15 @@ function display_threads($threads, $oldest)
$style = 0;
$results = 0;
foreach ($nicole as $key => $value) {
// Skip if not in registered users sub list
if (! check_group_for_user($key, $userdata, $user_config)) {
continue;
}
$target_head = $this_overboard['msgids'][$key];
if (! isset($target_head['msgid'])) {
$target_head = get_data_from_msgid($key);
}
// Skip if not in registered users sub list
if (! check_group_for_user($target_head['newsgroup'], $userdata, $user_config)) {
continue;
}
// Check if only displaying new posts in section
if ($newonly) {
$allgroups = get_group_array_from_msgid($key);
@ -334,6 +333,10 @@ function display_threads($threads, $oldest)
$nohead = true;
$result_count = count($value);
foreach ($value as $new) {
// Skip if not in registered users sub list
if (! check_group_for_user($new, $userdata, $user_config)) {
continue;
}
$target = $this_overboard['msgids'][$new];
if (! isset($target['msgid'])) {
$target = get_data_from_msgid($new);
@ -341,10 +344,7 @@ function display_threads($threads, $oldest)
if ($target['date'] < $oldest) {
continue;
}
// Skip if not in registered users sub list
if (! check_group_for_user($target['newsgroup'], $userdata, $user_config)) {
continue;
}
// Check if only displaying new posts in section
if ($newonly) {
$allgroups = get_group_array_from_msgid($new);
@ -488,18 +488,19 @@ function display_flat($threads, $oldest)
$results = 0;
$shown = array();
foreach ($threads as $key => $value) {
if (! check_group_for_user($value, $userdata, $user_config)) {
continue;
}
$target = $this_overboard['msgids'][$value];
if (! isset($target['msgid'])) {
$target = get_data_from_msgid($value);
}
if(isset($shown[$value.$target['newsgroup']])) {
if (isset($shown[$value . $target['newsgroup']])) {
continue;
} else {
$shown[$value.$target['newsgroup']] = $value;
}
if (! check_group_for_user($target['newsgroup'], $userdata, $user_config)) {
continue;
$shown[$value . $target['newsgroup']] = $value;
}
if ($target['date'] < $oldest) {
continue;
}
@ -640,7 +641,7 @@ function show_overboard_header($grouplist)
// 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($newsgroup, $userdata, $user_config)
function check_group_for_user($msgid, $userdata, $user_config)
{
global $logdir, $config_name;
$logfile = $logdir . '/overboard.log';
@ -648,17 +649,19 @@ function check_group_for_user($newsgroup, $userdata, $user_config)
// No logged in user
return true;
}
$ok = true;
if (! isset($userdata[$newsgroup])) {
if (isset($user_config['hide_unsub']) && $user_config['hide_unsub'] == 'hide') {
$ok = false;
} else {
$ok = true;
}
} else {
$ok = true;
if (! isset($user_config['hide_unsub']) || $user_config['hide_unsub'] != 'hide') {
return true;
}
return $ok;
$newsgroups = get_newsgroups_by_msgid($msgid);
if ($newsgroups == false) {
return false;
}
foreach ($newsgroups as $newsgroup) {
if (isset($userdata[$newsgroup])) {
return true;
}
}
return false;
}
function show_overboard_style_toggle()