diff --git a/Rocksolid_Light/common/version.txt b/Rocksolid_Light/common/version.txt index 7e310ba..56f3151 100644 --- a/Rocksolid_Light/common/version.txt +++ b/Rocksolid_Light/common/version.txt @@ -1 +1 @@ -0.9.9 +0.9.10 diff --git a/Rocksolid_Light/rocksolid/newsportal.php b/Rocksolid_Light/rocksolid/newsportal.php index c804a22..ead0e17 100644 --- a/Rocksolid_Light/rocksolid/newsportal.php +++ b/Rocksolid_Light/rocksolid/newsportal.php @@ -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: diff --git a/Rocksolid_Light/rslight/scripts/spoolnews.php b/Rocksolid_Light/rslight/scripts/spoolnews.php index b5c6bfe..4e5b5c6 100644 --- a/Rocksolid_Light/rslight/scripts/spoolnews.php +++ b/Rocksolid_Light/rslight/scripts/spoolnews.php @@ -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];