From 9b3be77bac1a60f55ac20b4e63905fc382e38d72 Mon Sep 17 00:00:00 2001
From: Chris Koeritz <fred@gruntose.com>
Date: Fri, 7 Mar 2025 21:30:27 +0000
Subject: [PATCH] fixed sanitized username again...

...so it doesn't think it can reset USER variable if it's broken.
also fixed safedel to not loudly complain if its attempted chmod
doesn't work right, which will always happen when, for example, the
www-data user is using feisty meow code, but it cannot chmod the linked
customize directory since that's linked to the real feisty meow
code which www-data has no perms on.
---
 scripts/core/variables.sh | 21 +++++++++++----------
 scripts/files/safedel.pl  |  7 +++++--
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh
index a586eebe..4b3b3b7d 100644
--- a/scripts/core/variables.sh
+++ b/scripts/core/variables.sh
@@ -42,17 +42,18 @@ return 0
   # a nice clean one (by removing email domains).
   export SANITIZED_USER
   function sanitized_username() {
-    if [ -z "$USER" ]; then
-      # this isn't quite normal, but maybe we have a cron user variable.
-      USER=$CRONUSER
-      if [ -z "$USER" ]; then
-        # well, now we're just baffled at the lack of a user, but don't want
-        # a blank coming back from this function.
-        USER="unknown-user"
-      fi
-    fi
     if [ -z "$SANITIZED_USER" ]; then
-      export SANITIZED_USER="${USER//@*/}"
+      local ouruser="$USER"
+      if [ -z "$ouruser" ]; then
+        # this isn't quite normal, but maybe we have a cron user variable.
+        ouruser="$CRONUSER"
+        if [ -z "$ouruser" ]; then
+          # well, now we're just baffled at the lack of a user, but don't want
+          # a blank coming back from this function.
+          ouruser="unknown-user"
+        fi
+      fi
+      export SANITIZED_USER="${ouruser//@*/}"
     fi
     echo -n "$SANITIZED_USER"
   }
diff --git a/scripts/files/safedel.pl b/scripts/files/safedel.pl
index ae1cc8e9..a4b81f39 100644
--- a/scripts/files/safedel.pl
+++ b/scripts/files/safedel.pl
@@ -76,7 +76,10 @@ sub safedel {
 
     if (-d $file) {
       # ensure there aren't any read only files.
-      system("chmod -R u+rw '$file'");
+      system("chmod -R u+rw '$file' 2>/dev/null");
+        # we hide our errors from this, since we cannot do anything about
+	# them in certain scenarios, like when we really don't have
+	# permission on the directory.
       # store the directory in the trash storage.
       system("$zip -rm $archive_file '$file' $DEV_NULL");
         # zip up the files into the safekeeper directory.
@@ -90,7 +93,7 @@ sub safedel {
 #print "about to chmod file\n";
       # make the file writable by our user if possible (which resets any
       # prior permissions as long as we're the owner).
-      system("chmod u+rw '$file'");
+      system("chmod u+rw '$file' 2>/dev/null");
       # store the file in the trash storage.
 #print "about to run: system [$zip -m $archive_file '$file' $DEV_NULL]";
       system("$zip -m $archive_file '$file' $DEV_NULL");
-- 
2.34.1