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

Remove duplicate check of incoming article date.

This commit is contained in:
Retro_Guy 2024-05-30 05:42:07 -07:00
parent 8c259cf695
commit 1ea1ed2132
2 changed files with 6 additions and 10 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.9 0.9.10

14
Rocksolid_Light/rocksolid/newsportal.php
View File

@ -2408,12 +2408,6 @@ function insert_article_from_array($this_article, $check_duplicates = true)
return "441 Insert failed (duplicate)\r\n"; return "441 Insert failed (duplicate)\r\n";
} }
} }
// Allow a message to be approximately 2 minutes in the future, but not more.
if ($this_article['epochdate'] > (time() + 120)) {
echo "\n(newsportal)Article date in future. Skipping: " . $group . ":" . $this_article['mid'];
file_put_contents($logfile, "\n" . format_log_date() . " " . $config_name . " Article date in future. Skipping: " . $group . ":" . $this_article['mid'], FILE_APPEND);
return "441 Insert failed (article date in future)\r\n";
}
// Open articles Database // Open articles Database
if ($CONFIG['article_database'] == '1') { if ($CONFIG['article_database'] == '1') {
@ -2830,7 +2824,7 @@ function delete_message($messageid, $group = null, $overview_dbh = null)
// Else returns a string with reason for failure // Else returns a string with reason for failure
function check_article_integrity($rawmessage) function check_article_integrity($rawmessage)
{ {
global $CONFIG, $logfile; global $CONFIG, $logfile, $config_name;
$returnval = false; $returnval = false;
$count_rawmessage = count($rawmessage); $count_rawmessage = count($rawmessage);
$message = new messageType(); $message = new messageType();
@ -2842,8 +2836,10 @@ function check_article_integrity($rawmessage)
} }
// Parse the Header: // Parse the Header:
$message->header = parse_header($rawheader); $message->header = parse_header($rawheader);
// Check if date is in future
if ($message->header->date > time()) { // Check if date is in future (allow up to 120 seconds in future)
if ($message->header->date > (time() + 120)) {
file_put_contents($logfile, "\n" . format_log_date() . " " . $config_name . " Skipping message (date in future): " . $message->header->id, FILE_APPEND);
$returnval = " Skipping message (date in future): " . $message->header->id; $returnval = " Skipping message (date in future): " . $message->header->id;
return $returnval; return $returnval;
} }