From 000be193b9dcca0959dc874e106f8ed23dcbdef1 Mon Sep 17 00:00:00 2001
From: Retro_Guy <retro.guy@rocksolidbbs.com>
Date: Sun, 6 Aug 2023 09:24:29 -0700
Subject: [PATCH] Fix expire.php to skip non-group lines in group list.

---
 Rocksolid_Light/rslight/scripts/expire.php | 37 +++++++++++-----------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/Rocksolid_Light/rslight/scripts/expire.php b/Rocksolid_Light/rslight/scripts/expire.php
index e123574..43f0e40 100755
--- a/Rocksolid_Light/rslight/scripts/expire.php
+++ b/Rocksolid_Light/rslight/scripts/expire.php
@@ -21,26 +21,25 @@
 
   $grouplist = file($config_dir.'/'.$config_name.'/groups.txt', FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
   foreach($grouplist as $groupline) {
-    $expireme = 0;
-    if($CONFIG['expire_days'] > 0) {
-    	$expireme=time() - ($CONFIG['expire_days'] * 86400);
-    }
-    $groupname=explode(' ', $groupline);
-    $group=$groupname[0];
-    if(($days = get_config_value('expire.conf', $group)) !== false) {
-      if(is_numeric($days)) {
-          if($days == 0) {
-              continue;
-          } else {
-	          $expireme = time() - ($days * 86400);
-          }
+      $groupname=explode(' ', $groupline);
+      $group=$groupname[0];
+      if($group[0] == ':') {
+          continue;
       }
-    }
-    if($expireme < 1) {
-	   continue;
-    }
-    $showme = date('d M, Y', $expireme);
-
+      $expire_conf = $CONFIG['expire_days'];
+      $expire_user = get_config_value('expire.conf', $group);
+      
+      if($expire_user !== false) {
+          $expire = $expire_user;
+      } else {
+          $expire = $expire_conf;
+      }
+      if($expire < 1) {
+          continue;
+      }
+      $expireme = time() - ($expire * 86400);
+      $showme = date('d M, Y', $expireme);
+      
 echo "Expire $group articles before $showme\n";
 file_put_contents($logfile, "\n".format_log_date()." ".$config_name." ".$group." Expiring: articles before ".$showme, FILE_APPEND);