From 54ae9071b5906b6b83013705701b111ab265c38e Mon Sep 17 00:00:00 2001
From: Retro_Guy <retro.guy@rocksolidbbs.com>
Date: Sun, 17 Sep 2023 05:56:24 -0700
Subject: [PATCH] Rename import-db3.php to maintenance.php, and allow it to
 pause cron.php.

---
 Rocksolid_Light/rslight/scripts/cron.php                    | 2 +-
 .../scripts/tools/{import-db3.php => maintenance.php}       | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)
 rename Rocksolid_Light/rslight/scripts/tools/{import-db3.php => maintenance.php} (99%)
 mode change 100755 => 100644

diff --git a/Rocksolid_Light/rslight/scripts/cron.php b/Rocksolid_Light/rslight/scripts/cron.php
index 333d4f3..0ffabbb 100644
--- a/Rocksolid_Light/rslight/scripts/cron.php
+++ b/Rocksolid_Light/rslight/scripts/cron.php
@@ -7,7 +7,7 @@ include $config_dir . "/gpg.conf";
 
 $pid = getmypid();
 $logfile = $logdir . '/cron.log';
-if (file_exists($config_dir . '/cron.disable')) {
+if (file_exists($config_dir . '/cron.disable') || file_exists($spooldir . '/cron.disable')) {
     file_put_contents($logfile, "\n" . date('M d H:i:s') . " " . $config_name . " cron.php disabled by semaphore: " . $config_dir . "/cron.disable Exiting...", FILE_APPEND);
     chown($logfile, $CONFIG['webserver_user']);
     exit();
diff --git a/Rocksolid_Light/rslight/scripts/tools/import-db3.php b/Rocksolid_Light/rslight/scripts/tools/maintenance.php
old mode 100755
new mode 100644
similarity index 99%
rename from Rocksolid_Light/rslight/scripts/tools/import-db3.php
rename to Rocksolid_Light/rslight/scripts/tools/maintenance.php
index fa7d326..b65dfce
--- a/Rocksolid_Light/rslight/scripts/tools/import-db3.php
+++ b/Rocksolid_Light/rslight/scripts/tools/maintenance.php
@@ -26,6 +26,8 @@ include ("$file_newsportal");
 $logfile = $logdir . '/import.log';
 
 $lockfile = $lockdir . '/' . $config_name . '-spoolnews.lock';
+$cronfile = $spooldir.'/cron.disable';
+
 $pid = file_get_contents($lockfile);
 if (posix_getsid($pid) === false || ! is_file($lockfile)) {
     print "Starting Import...\n";
@@ -35,6 +37,8 @@ if (posix_getsid($pid) === false || ! is_file($lockfile)) {
     exit();
 }
 
+touch ($cronfile);
+
 if (! isset($argv[1])) {
     $argv[1] = "-help";
 }
@@ -74,8 +78,10 @@ if ($argv[1][0] == '-') {
             echo "-reset: Reset a group to restart from zero messages (-reset alt.test)\n";
             break;
     }
+    unlink($cronfile);
     exit();
 } else {
+    unlink($cronfile);
     exit();
 }