From 2eeb873a4569453b93ed701bd7dafb869934b272 Mon Sep 17 00:00:00 2001
From: Retro_Guy <retro.guy@rocksolidbbs.com>
Date: Fri, 29 Nov 2024 11:14:11 -0700
Subject: [PATCH] Cleanup changing user code in maintenance.php and
 account_manager.php.

---
 .../rslight/scripts/account_manager.php        | 17 ++++++++++++++---
 .../rslight/scripts/maintenance.php            | 18 ++++++++++++------
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/Rocksolid_Light/rslight/scripts/account_manager.php b/Rocksolid_Light/rslight/scripts/account_manager.php
index ee7ad4e..1465fa3 100644
--- a/Rocksolid_Light/rslight/scripts/account_manager.php
+++ b/Rocksolid_Light/rslight/scripts/account_manager.php
@@ -4,17 +4,28 @@ chdir($spoolnews_path);
 include "config.inc.php";
 include "newsportal.php";
 
+$processUser = posix_getpwuid(posix_geteuid());
+echo "You are running as user: " . $processUser['name'] . "\n";
+
 // Change to webserver user if root
 $uinfo = posix_getpwnam($CONFIG['webserver_user']);
 /* Change to non root user */
 change_identity($uinfo["uid"], $uinfo["gid"]);
 $processUser = posix_getpwuid(posix_geteuid());
 if ($processUser['name'] != $CONFIG['webserver_user']) {
-    echo "You are running as: " . $processUser['name'] . "\n";
-    echo 'Please run this scripts as: ' . $CONFIG['webserver_user'] . "\n";
+    echo "You are running as user: " . $processUser['name'] . "\n";
+    echo 'Please run this script as: ' . $CONFIG['webserver_user'] . "\n";
     exit();
 }
 /* Everything below runs as $CONFIG['webserver_user'] */
+echo "You are running as user: " . $processUser['name'] . "\n";
+
+$processUser = posix_getpwuid(posix_geteuid());
+if ($processUser['name'] != $CONFIG['webserver_user']) {
+    echo "You are running as user: " . $processUser['name'] . "\n";
+    echo 'Please run this script as: ' . $CONFIG['webserver_user'] . "\n";
+    exit();
+}
 
 $keyfile = $spooldir . '/keys.dat';
 $keys = unserialize(file_get_contents($keyfile));
@@ -128,7 +139,7 @@ function get_user_by_hash($postinghash)
         echo "Hash file not found\n";
         return;
     }
-    if(isset($posthash[$postinghash])) {
+    if (isset($posthash[$postinghash])) {
         echo $posthash[$postinghash] . ' : ' . $postinghash . "\n";
     } else {
         echo "$postinghash not found in database\n";
diff --git a/Rocksolid_Light/rslight/scripts/maintenance.php b/Rocksolid_Light/rslight/scripts/maintenance.php
index 1aa4282..d34f2e0 100644
--- a/Rocksolid_Light/rslight/scripts/maintenance.php
+++ b/Rocksolid_Light/rslight/scripts/maintenance.php
@@ -28,14 +28,18 @@ if (! isset($argv[1])) {
 }
 
 if ($argv[1] != '-newsection') {
+    $processUser = posix_getpwuid(posix_geteuid());
+    echo "You are running as user: " . $processUser['name'] . "\n";
+
     // Change to webserver user if root
     $uinfo = posix_getpwnam($CONFIG['webserver_user']);
     /* Change to non root user */
     change_identity($uinfo["uid"], $uinfo["gid"]);
     $processUser = posix_getpwuid(posix_geteuid());
+    
     if ($processUser['name'] != $CONFIG['webserver_user']) {
-        echo "You are running as: " . $processUser['name'] . "\n";
-        echo 'Please run this scripts as: ' . $CONFIG['webserver_user'] . "\n";
+        echo "You are running as user: " . $processUser['name'] . "\n";
+        echo 'Please run this script as: ' . $CONFIG['webserver_user'] . "\n";
         exit();
     }
     /* Everything below runs as $CONFIG['webserver_user'] */
@@ -43,13 +47,12 @@ if ($argv[1] != '-newsection') {
 
     $processUser = posix_getpwuid(posix_geteuid());
     if ($processUser['name'] != $CONFIG['webserver_user']) {
-        echo "You are running as: " . $processUser['name'] . "\n";
-        echo 'Please run this scripts as: ' . $CONFIG['webserver_user'] . "\n";
+        echo "You are running as user: " . $processUser['name'] . "\n";
+        echo 'Please run this script as: ' . $CONFIG['webserver_user'] . "\n";
         exit();
     }
 
     $logfile = $logdir . '/import.log';
-
     $lockfile = $lockdir . '/' . $config_name . '-spoolnews.lock';
 
     $pid = file_get_contents($lockfile);
@@ -57,9 +60,12 @@ if ($argv[1] != '-newsection') {
         print "Starting Import...\n";
         file_put_contents($lockfile, getmypid()); // create lockfile
     } else {
-        print "Import currently running\n";
+        print "Spoolnews currently running\n";
         exit();
     }
+} else {
+    $processUser = posix_getpwuid(posix_geteuid());
+    echo "You are running as user: " . $processUser['name'] . "\n";
 }
 
 if ($argv[1][0] == '-') {