From d66f90e528a0bb3a61a2047e1e247db8523b1b9a Mon Sep 17 00:00:00 2001 From: Retro_Guy Date: Mon, 14 Aug 2023 05:34:27 -0700 Subject: [PATCH] Remove articles from np during expire. --- Rocksolid_Light/rslight/scripts/expire.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Rocksolid_Light/rslight/scripts/expire.php b/Rocksolid_Light/rslight/scripts/expire.php index c6512e4..9ed95a2 100755 --- a/Rocksolid_Light/rslight/scripts/expire.php +++ b/Rocksolid_Light/rslight/scripts/expire.php @@ -61,14 +61,17 @@ file_put_contents($logfile, "\n".format_log_date()." ".$config_name." ".$group." $articles_query->execute([':newsgroup' => $group, ':expireme' => $expireme]); $articles_dbh = null; } - } else { // Expire tradspool + } else { // Expire tradspool and remove from newsportal $database = $spooldir.'/articles-overview.db3'; $dbh = overview_db_open($database); $query = $dbh->prepare('SELECT FROM overview WHERE newsgroup=:newsgroup AND date<:expireme'); $query->execute([':newsgroup' => $group, ':expireme' => $expireme]); $grouppath = preg_replace('/\./', '/', $group); while($row = $query->fetch()) { - unlink($spooldir.'/articles/'.$grouppath.'/'.$row['number']); + if(is_file($spooldir.'/articles/'.$grouppath.'/'.$row['number'])) { + unlink($spooldir.'/articles/'.$grouppath.'/'.$row['number']); + } + thread_cache_removearticle($group,$row['number']); } $dbh = null; }