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

Merge branch 'devel'

This commit is contained in:
Retro_Guy 2024-05-31 01:18:06 -07:00
parent c0a7f8584b 11ccd228c6
commit f1be2aa42f
3 changed files with 6 additions and 14 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

15
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";
}
}
// 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
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
function check_article_integrity($rawmessage)
{
global $CONFIG, $logfile;
global $CONFIG, $logfile, $config_name;
$returnval = false;
$count_rawmessage = count($rawmessage);
$message = new messageType();
@ -2842,9 +2836,10 @@ function check_article_integrity($rawmessage)
}
// Parse the Header:
$message->header = parse_header($rawheader);
// Check if date is in future
if ($message->header->date > time()) {
$returnval = " Skipping message (date in future): " . $message->header->id;
// Check if date is in future (allow up to 60 seconds in future)
if ($message->header->date > (time() + 60)) {
$returnval = " Skipping message (date in future): " . $message->header->id . " (" . date('M d H:i:s', $message->header->date) . ")";
return $returnval;
}
// Now we know if the message is a mime-multipart message:

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

@ -464,9 +464,6 @@ function get_articles($ns, $group)
// CREATE SEARCH SNIPPET
$this_snippet = get_search_snippet($body, $content_type[1], $content_transfer_encoding);
} else {
if ($article_date > time()) {
$article_date = time();
}
touch($articleHandle, $article_date);
}
$current_article['mid'] = $mid[1];