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

Improve handling for multiline newsgroups header in nocemlist.php (thanks Julien_ÉLIE for the suggestions).

This commit is contained in:
Retro_Guy 2024-05-27 03:58:08 -07:00
parent 21dea6d9a7
commit 2cba850cb0
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Rocksolid_Light/tools/nocem/nocemlist.inc.php
View File

@ -35,7 +35,7 @@ $nntppassword = "nntppassword";
$type = "spam";
// Your gpg signing key:
$signing_key = "XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX";
$signing_key = "XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX";
// URL to view/download key:
$key_location = "https://<key_url>";

16
Rocksolid_Light/tools/nocem/nocemlist.php
View File

@ -14,13 +14,21 @@ foreach($newspam as $spam) {
$spam_lines = file($spam);
$lines = 0;
$is_header = 1;
foreach($spam_lines as $response) {
$ng = false;
foreach($spam_lines as $response) {
if (trim($response) == "" && $lines > 0) {
break;
}
if ($is_header == 1) {
$lines ++;
$response = str_replace("\t", " ", $response);
if (stripos($response, ": ") !== false) {
$ng = false;
} else {
if($ng) {
$newsgroups[1] .= $response;
}
}
// Find article date
if (stripos($response, "Date: ") === 0) {
$date = explode(': ', $response);
@ -37,11 +45,15 @@ foreach($newspam as $spam) {
}
if (stripos($response, "Newsgroups: ") === 0) {
$newsgroups = explode('Newsgroups: ', $response);
$ng = true;
}
}
}
$newsgroups = preg_replace("/\s+/", " ", $newsgroups[1]);
$newsgroups = preg_replace("/\,/", " ", $newsgroups);
$newsgroups = preg_replace("/\s+/", " ", $newsgroups);
$nocem_list[] = "# Sender: ".trim($sender[1])."\n# Date: ".trim($date[1])."\n# Subject: ".trim($subject[1])."\n".trim($id[1])." ".trim($newsgroups[1])."\n";;
$nocem_list[] = "# Sender: ".trim($sender[1])."\n# Date: ".trim($date[1])."\n# Subject: ".trim($subject[1])."\n".trim($id[1])." ".trim($newsgroups)."\n";;
$count++;
}
$nocem_file = fopen($nocem, "w+");