Reapply "CRITICAL FIXES: Apply essential improvements from beta branch to production"

This reverts commit e5979a501e.
This commit is contained in:
cschantz
2026-03-20 15:45:24 -04:00
parent e5979a501e
commit 3126944905
3 changed files with 51 additions and 19 deletions
+1 -2
View File
@@ -169,8 +169,7 @@ show_terminal_info() {
# Create temporary session directory
create_temp_session() {
export SESSION_ID=$$
export TEMP_SESSION_DIR="/tmp/server-toolkit-${SESSION_ID}"
mkdir -p "$TEMP_SESSION_DIR"
export TEMP_SESSION_DIR=$(mktemp -d -t server-toolkit.XXXXXX)
# Cleanup on exit
trap '[ -n "$TEMP_SESSION_DIR" ] && rm -rf "$TEMP_SESSION_DIR" 2>/dev/null' EXIT INT TERM
+6 -3
View File
@@ -162,8 +162,8 @@ build_databases_section() {
# Build MySQL command with credentials if needed
local mysql_cmd="mysql"
if [ "$SYS_CONTROL_PANEL" = "plesk" ] && [ -f /etc/psa/.psa.shadow ]; then
local plesk_mysql_pass=$(cat /etc/psa/.psa.shadow)
mysql_cmd="mysql -uadmin -p${plesk_mysql_pass}"
export MYSQL_PWD=$(cat /etc/psa/.psa.shadow)
mysql_cmd="mysql -uadmin"
fi
local total_dbs=$($mysql_cmd -Ns -e "SHOW DATABASES" 2>/dev/null | grep -v "^information_schema$\|^mysql$\|^performance_schema$\|^sys$" | wc -l)
@@ -180,7 +180,7 @@ build_databases_section() {
local size_mb=$($mysql_cmd -Ns -e "SELECT ROUND(SUM(data_length + index_length) / 1024 / 1024, 2)
FROM information_schema.TABLES
WHERE table_schema='$db'" 2>/dev/null)
WHERE table_schema=\`$db\`" 2>/dev/null)
[ -z "$size_mb" ] && size_mb=0
local table_count=$($mysql_cmd -Ns "$db" -e "SHOW TABLES" 2>/dev/null | wc -l)
@@ -190,6 +190,9 @@ build_databases_section() {
finish_progress
echo "" >> "$SYSREF_DB"
# Clean up password environment variable
unset MYSQL_PWD
}
# Check domain HTTP/HTTPS status codes