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

Improve spoolnews.php to handle local groups in non-local section.

This commit is contained in:
Retro_Guy 2023-05-13 10:10:09 -07:00
parent 7f3bf1b416
commit 8cb989a440
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Rocksolid_Light/rslight/scripts/spoolnews.php
View File

@ -83,7 +83,7 @@ $enable_rslight=0;
if(($menuitem[0] == $config_name) && ($menuitem[1] == '1')) { if(($menuitem[0] == $config_name) && ($menuitem[1] == '1')) {
groups_read($server,$port,1); groups_read($server,$port,1);
$enable_rslight = 1; $enable_rslight = 1;
echo "Loaded groups\n"; echo "\nLoaded groups";
} }
} }
$ns=nntp2_open($CONFIG['remote_server'], $CONFIG['remote_port']); $ns=nntp2_open($CONFIG['remote_server'], $CONFIG['remote_port']);
@ -99,7 +99,7 @@ foreach($grouplist as $findgroup) {
} }
$name = preg_split("/( |\t)/", $findgroup, 2); $name = preg_split("/( |\t)/", $findgroup, 2);
file_put_contents($logfile, "\n".format_log_date()." ".$config_name." Retrieving articles for: ".$name[0]."...", FILE_APPEND); file_put_contents($logfile, "\n".format_log_date()." ".$config_name." Retrieving articles for: ".$name[0]."...", FILE_APPEND);
echo "\nRetrieving articles for: ".$name[0]."... \r\n"; echo "\nRetrieving articles for: ".$name[0]."...";
get_articles($ns, $name[0]); get_articles($ns, $name[0]);
if($enable_rslight == 1) { if($enable_rslight == 1) {
@ -113,7 +113,7 @@ nntp_close($ns2);
nntp_close($ns); nntp_close($ns);
#expire_overview(); #expire_overview();
unlink($lockfile); unlink($lockfile);
echo "\nSpoolnews Done\r\n"; echo "\nSpoolnews Done\n";
function get_articles($ns, $group) { function get_articles($ns, $group) {
global $enable_rslight, $spooldir, $CONFIG, $maxarticles_per_run, $maxfirstrequest, $workpath, $path, $remote_groupfile, $local_groupfile, $local, $logdir, $config_name, $logfile; global $enable_rslight, $spooldir, $CONFIG, $maxarticles_per_run, $maxfirstrequest, $workpath, $path, $remote_groupfile, $local_groupfile, $local, $logdir, $config_name, $logfile;
@ -131,8 +131,8 @@ function get_articles($ns, $group) {
# Check if group exists. Open it if it does # Check if group exists. Open it if it does
fputs($ns, "group ".$group."\r\n"); fputs($ns, "group ".$group."\r\n");
$response = line_read($ns); $response = line_read($ns);
if (strcmp(substr($response,0,3),"411") == 0) { if (strcmp(substr($response,0,3),"211") != 0) {
echo "\n".$response."\n"; echo "\n".$response;
return(1); return(1);
} }
@ -188,6 +188,13 @@ function get_articles($ns, $group) {
$article_sql = 'INSERT OR IGNORE INTO articles(newsgroup, number, msgid, date, name, subject, article, search_snippet) VALUES(?,?,?,?,?,?,?,?)'; $article_sql = 'INSERT OR IGNORE INTO articles(newsgroup, number, msgid, date, name, subject, article, search_snippet) VALUES(?,?,?,?,?,?,?,?)';
$article_stmt = $article_dbh->prepare($article_sql); $article_stmt = $article_dbh->prepare($article_sql);
} }
// Create list of message-ids
$group_overviewfile = $spooldir."/".$group."-overview";
$gover = file($group_overviewfile);
foreach($gover as $group_overview) {
$overview_msgid = explode("\t", $group_overview);
$msgids[trim($overview_msgid[4])] = true;
}
# Pull articles and save them in our spool # Pull articles and save them in our spool
@mkdir($grouppath,0755,'recursive'); @mkdir($grouppath,0755,'recursive');
$i=0; $i=0;
@ -204,25 +211,20 @@ function get_articles($ns, $group) {
fputs($ns, "stat ".$article."\r\n"); fputs($ns, "stat ".$article."\r\n");
$response = line_read($ns); $response = line_read($ns);
$this_msgid = explode(' ', $response); $this_msgid = explode(' ', $response);
$group_overviewfile = $spooldir."/".$group."-overview"; if($msgids[trim($this_msgid[2])] == true) {
$gover = file($group_overviewfile); echo "\nDuplicate Message-ID for: ".$group.":".$article;
foreach($gover as $group_overview) { file_put_contents($logfile, "\n".format_log_date()." ".$config_name." Duplicate Message-ID for: ".$group.":".$article, FILE_APPEND);
$overview_msgid = explode("\t", $group_overview);
if(strpos($overview_msgid[4], $this_msgid[2]) !== false) {
echo "\nDuplicate Message-ID for: ".$CONFIG['remote_server']." ".$group.":".$article."\n";
file_put_contents($logfile, "\n".format_log_date()." ".$config_name." Duplicate Message-ID for: ".$CONFIG['remote_server']." ".$group.":".$article, FILE_APPEND);
$article++; $article++;
$duplicate = 1; $duplicate = 1;
break; break;
} }
}
if($duplicate == 1) { if($duplicate == 1) {
continue; continue;
} }
fputs($ns, "article ".$article."\r\n"); fputs($ns, "article ".$article."\r\n");
$response = line_read($ns); $response = line_read($ns);
if (strcmp(substr($response,0,3),"220") != 0) { if (strcmp(substr($response,0,3),"220") != 0) {
echo "\n".$response."\n"; echo "\n".$response;
file_put_contents($logfile, "\n".format_log_date()." ".$config_name." Unexpected response to ARTICLE command: ".$response, FILE_APPEND); file_put_contents($logfile, "\n".format_log_date()." ".$config_name." Unexpected response to ARTICLE command: ".$response, FILE_APPEND);
$article++; $article++;
continue; continue;
@ -346,7 +348,7 @@ function get_articles($ns, $group) {
$article_date = time(); $article_date = time();
touch($grouppath."/".$local, $article_date); touch($grouppath."/".$local, $article_date);
} }
echo "\nRetrieved: ".$group." ".$article."\n"; echo "\nRetrieved: ".$group." ".$article;
file_put_contents($logfile, "\n".format_log_date()." ".$config_name." Wrote to spool: ".$CONFIG['remote_server']." ".$group.":".$article, FILE_APPEND); file_put_contents($logfile, "\n".format_log_date()." ".$config_name." Wrote to spool: ".$CONFIG['remote_server']." ".$group.":".$article, FILE_APPEND);
$i++; $i++;
$article++; $article++;