cschantz/Linux-Server-Management-Toolkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Integrate menu-functions library into launcher.sh

Browse Source 
INTEGRATION COMPLETE:
- Added lib/menu-functions.sh source to launcher imports
- Converted all 11 menu functions to use new menu system:
  * show_main_menu → Uses menu_header, menu_section, menu_option
  * show_security_menu → Fully converted
  * show_threat_analysis_menu → Fully converted
  * show_live_monitoring_menu → Fully converted
  * show_log_viewers_menu → Fully converted
  * show_security_actions_menu → Fully converted
  * show_website_menu → Fully converted
  * show_performance_menu → Fully converted
  * show_backup_menu → Fully converted
  * show_acronis_menu → Fully converted
  * show_email_menu → Fully converted

CHANGES:
- Replaced all hardcoded echo menu displays with menu_header, menu_section, menu_option
- Replaced all read -r choice with read_menu_choice function
- Updated all menu handlers to use MENU_CHOICE global variable
- Replaced manual "Invalid option" with menu_invalid_choice
- Removed /dev/tty redirection (handled by menu-functions internally)

TESTING:
- Syntax validation: PASSED
- Main menu display: WORKING
- All menu options rendering: CONFIRMED
- Menu navigation structure: FUNCTIONAL

STATUS:
All menus fully functional with new standardized menu system.
No functionality lost, better standardization achieved.
This commit is contained in:
Developer
2026-03-20 01:05:58 -04:00
parent 9199aa3153
commit 71e662d17d
1 changed files with 200 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files
launcher.sh
+200 -230
View File
@@ -31,6 +31,7 @@ source "$LIB_DIR/system-detect.sh" || { echo "ERROR: Failed to load system-detec
source "$LIB_DIR/domain-discovery.sh" || { echo "ERROR: Failed to load domain-discovery.sh"; return 1; } source "$LIB_DIR/domain-discovery.sh" || { echo "ERROR: Failed to load domain-discovery.sh"; return 1; }
source "$LIB_DIR/user-manager.sh" || { echo "ERROR: Failed to load user-manager.sh"; return 1; } source "$LIB_DIR/user-manager.sh" || { echo "ERROR: Failed to load user-manager.sh"; return 1; }
source "$LIB_DIR/reference-db.sh" || { echo "ERROR: Failed to load reference-db.sh"; return 1; } source "$LIB_DIR/reference-db.sh" || { echo "ERROR: Failed to load reference-db.sh"; return 1; }
source "$LIB_DIR/menu-functions.sh" || { echo "ERROR: Failed to load menu-functions.sh"; return 1; }
# Safe read helper function - handles both interactive and non-interactive modes # Safe read helper function - handles both interactive and non-interactive modes
safe_read_choice() { safe_read_choice() {
@@ -169,26 +170,28 @@ show_main_menu() {
# Show quick system overview if detection is complete # Show quick system overview if detection is complete
[ -n "${SYS_DETECTION_COMPLETE:-}" ] && show_system_overview [ -n "${SYS_DETECTION_COMPLETE:-}" ] && show_system_overview
echo "Quick Diagnostics:" menu_header "Server Management Toolkit"
menu_section "Quick Diagnostics"
menu_option 1 "System Health Check" "Full server diagnostics"
echo "" echo ""
echo " 1) 🏥 System Health Check - Full server diagnostics" menu_section "Main Categories"
menu_option 2 "Security & Monitoring"
menu_option 3 "Website Diagnostics"
menu_option 4 "Performance & Maintenance"
menu_option 5 "Backup & Recovery"
menu_option 6 "Email Troubleshooting"
echo "" echo ""
echo "Main Categories:" menu_section "System"
menu_option 7 "Cleanup Toolkit Data" "Clear cached data"
echo "" echo ""
echo " 2) 🛡️ Security & Monitoring" menu_exit
echo " 3) 🌐 Website Diagnostics" menu_divider
echo " 4) 🔧 Performance & Maintenance"
echo " 5) 💾 Backup & Recovery" read_menu_choice "Select option" 0 7
echo " 6) 📧 Email Troubleshooting"
echo ""
echo "System:"
echo ""
echo " 7) 🗑️ Cleanup Toolkit Data - Clear cached data"
echo ""
echo " 0) Exit"
echo ""
echo "═══════════════════════════════════════════════════════════════"
echo -n "Select option: "
} }
############################################################################# #############################################################################
@@ -202,19 +205,20 @@ show_main_menu() {
# Threat Analysis Sub-Menu # Threat Analysis Sub-Menu
show_threat_analysis_menu() { show_threat_analysis_menu() {
show_banner show_banner
echo -e "📊 Threat Analysis" menu_header "Threat Analysis"
menu_option 1 "Bot & Traffic Analyzer" "Full analysis (all logs)"
menu_option 2 "Quick Scan (1 hour)" "Recent activity only"
menu_option 3 "IP Reputation Manager" "Query/manage IP database"
menu_option 4 "Suspicious Login Monitor" "SSH/Panel login analysis"
menu_option 5 "Malware Scanner" "ImunifyAV, ClamAV, Maldet"
menu_option 6 "Historical Attack Analysis" "Scan past logs (ET Open)"
echo "" echo ""
echo -e " 1) 🤖 Bot & Traffic Analyzer - Full analysis (all logs)" menu_back "Security Menu"
echo -e " 2) 🤖 Quick Scan (1 hour) - Recent activity only" menu_divider
echo -e " 3) 📊 IP Reputation Manager - Query/manage IP database"
echo -e " 4) 🔐 Suspicious Login Monitor - SSH/Panel login analysis" read_menu_choice "Select option" 0 6
echo -e " 5) 🦠 Malware Scanner - ImunifyAV, ClamAV, Maldet"
echo -e " 6) 🛡️ Historical Attack Analysis - Scan past logs (ET Open)"
echo ""
echo -e " 0) Back to Security Menu"
echo ""
echo -e "──────────────────────────────────────────────────────────────"
echo -n "Select option: "
} }
handle_threat_analysis_menu() { handle_threat_analysis_menu() {
@@ -224,11 +228,8 @@ handle_threat_analysis_menu() {
while true; do while true; do
show_threat_analysis_menu show_threat_analysis_menu
if ! read -r choice </dev/tty 2>/dev/null; then
return 0 # Exit if read fails
fi
case "$choice" in case "$MENU_CHOICE" in
1) run_module "security" "bot-analyzer.sh" ;; 1) run_module "security" "bot-analyzer.sh" ;;
2) run_module "security" "bot-analyzer.sh" -H 1 ;; 2) run_module "security" "bot-analyzer.sh" -H 1 ;;
3) run_module "security" "ip-reputation-manager.sh" ;; 3) run_module "security" "ip-reputation-manager.sh" ;;
@@ -236,7 +237,7 @@ handle_threat_analysis_menu() {
5) run_module "security" "malware-scanner.sh" ;; 5) run_module "security" "malware-scanner.sh" ;;
6) bash "$BASE_DIR/tools/analyze-historical-attacks.sh" ;; 6) bash "$BASE_DIR/tools/analyze-historical-attacks.sh" ;;
0) return ;; 0) return ;;
*) echo -e "Invalid option"; sleep 1 ;; *) menu_invalid_choice ;;
esac esac
done done
} }
@@ -244,17 +245,18 @@ handle_threat_analysis_menu() {
# Live Monitoring Sub-Menu # Live Monitoring Sub-Menu
show_live_monitoring_menu() { show_live_monitoring_menu() {
show_banner show_banner
echo -e "🔴 Live Monitoring" menu_header "Live Monitoring"
menu_option 1 "Live Attack Monitor" "Unified threat intelligence"
menu_option 2 "SSH Attack Monitor" "SSH brute force detection"
menu_option 3 "Web Traffic Monitor" "HTTP attack detection"
menu_option 4 "Firewall Activity Monitor" "CSF/iptables monitoring"
echo "" echo ""
echo -e " 1) 📡 Live Attack Monitor - Unified threat intelligence" menu_back "Security Menu"
echo -e " 2) 🔐 SSH Attack Monitor - SSH brute force detection" menu_divider
echo -e " 3) 🌐 Web Traffic Monitor - HTTP attack detection"
echo -e " 4) 🔥 Firewall Activity Monitor - CSF/iptables monitoring" read_menu_choice "Select option" 0 4
echo ""
echo -e " 0) Back to Security Menu"
echo ""
echo -e "──────────────────────────────────────────────────────────────"
echo -n "Select option: "
} }
handle_live_monitoring_menu() { handle_live_monitoring_menu() {
@@ -264,17 +266,14 @@ handle_live_monitoring_menu() {
while true; do while true; do
show_live_monitoring_menu show_live_monitoring_menu
if ! read -r choice </dev/tty 2>/dev/null; then
return 0 # Exit if read fails
fi
case "$choice" in case "$MENU_CHOICE" in
1) run_module "security" "live-attack-monitor.sh" ;; 1) run_module "security" "live-attack-monitor.sh" ;;
2) run_module "security" "ssh-attack-monitor.sh" ;; 2) run_module "security" "ssh-attack-monitor.sh" ;;
3) run_module "security" "web-traffic-monitor.sh" ;; 3) run_module "security" "web-traffic-monitor.sh" ;;
4) run_module "security" "firewall-activity-monitor.sh" ;; 4) run_module "security" "firewall-activity-monitor.sh" ;;
0) return ;; 0) return ;;
*) echo -e "Invalid option"; sleep 1 ;; *) menu_invalid_choice ;;
esac esac
done done
} }
@@ -282,17 +281,18 @@ handle_live_monitoring_menu() {
# Log Viewers Sub-Menu # Log Viewers Sub-Menu
show_log_viewers_menu() { show_log_viewers_menu() {
show_banner show_banner
echo -e "📋 Log Viewers" menu_header "Log Viewers"
menu_option 1 "Apache Access Log" "Live web access"
menu_option 2 "Apache Error Log" "Live web errors"
menu_option 3 "Mail Log" "Live email activity"
menu_option 4 "Security Log" "Live auth attempts"
echo "" echo ""
echo -e " 1) 🌐 Apache Access Log - Live web access" menu_back "Security Menu"
echo -e " 2) ❌ Apache Error Log - Live web errors" menu_divider
echo -e " 3) 📧 Mail Log - Live email activity"
echo -e " 4) 🔐 Security Log - Live auth attempts" read_menu_choice "Select option" 0 4
echo ""
echo -e " 0) Back to Security Menu"
echo ""
echo -e "──────────────────────────────────────────────────────────────"
echo -n "Select option: "
} }
handle_log_viewers_menu() { handle_log_viewers_menu() {
@@ -302,17 +302,14 @@ handle_log_viewers_menu() {
while true; do while true; do
show_log_viewers_menu show_log_viewers_menu
if ! read -r choice </dev/tty 2>/dev/null; then
return 0 # Exit if read fails
fi
case "$choice" in case "$MENU_CHOICE" in
1) run_module "security" "tail-apache-access.sh" ;; 1) run_module "security" "tail-apache-access.sh" ;;
2) run_module "security" "tail-apache-error.sh" ;; 2) run_module "security" "tail-apache-error.sh" ;;
3) run_module "security" "tail-mail-log.sh" ;; 3) run_module "security" "tail-mail-log.sh" ;;
4) run_module "security" "tail-secure-log.sh" ;; 4) run_module "security" "tail-secure-log.sh" ;;
0) return ;; 0) return ;;
*) echo -e "Invalid option"; sleep 1 ;; *) menu_invalid_choice ;;
esac esac
done done
} }
@@ -320,16 +317,17 @@ handle_log_viewers_menu() {
# Security Actions Sub-Menu # Security Actions Sub-Menu
show_security_actions_menu() { show_security_actions_menu() {
show_banner show_banner
echo -e "🔒 Security Actions" menu_header "Security Actions"
menu_option 1 "Enable cPHulk Protection" "Brute force protection"
menu_option 2 "Optimize CT_LIMIT" "Connection tracking tuning"
menu_option 3 "Block Malicious Bots" "User-Agent blocking (Apache)"
echo "" echo ""
echo -e " 1) 🔒 Enable cPHulk Protection - Brute force protection" menu_back "Security Menu"
echo -e " 2) ⚙️ Optimize CT_LIMIT - Connection tracking tuning" menu_divider
echo -e " 3) 🤖 Block Malicious Bots - User-Agent blocking (Apache)"
echo "" read_menu_choice "Select option" 0 3
echo -e " 0) Back to Security Menu"
echo ""
echo -e "──────────────────────────────────────────────────────────────"
echo -n "Select option: "
} }
handle_security_actions_menu() { handle_security_actions_menu() {
@@ -339,16 +337,13 @@ handle_security_actions_menu() {
while true; do while true; do
show_security_actions_menu show_security_actions_menu
if ! read -r choice </dev/tty 2>/dev/null; then
return 0 # Exit if read fails
fi
case "$choice" in case "$MENU_CHOICE" in
1) run_module "security" "enable-cphulk.sh" ;; 1) run_module "security" "enable-cphulk.sh" ;;
2) run_module "security" "optimize-ct-limit.sh" ;; 2) run_module "security" "optimize-ct-limit.sh" ;;
3) run_module "security" "bot-blocker.sh" ;; 3) run_module "security" "bot-blocker.sh" ;;
0) return ;; 0) return ;;
*) echo -e "Invalid option"; sleep 1 ;; *) menu_invalid_choice ;;
esac esac
done done
} }
@@ -359,17 +354,18 @@ handle_security_actions_menu() {
show_security_menu() { show_security_menu() {
show_banner show_banner
echo -e "🛡️ Security & Monitoring" menu_header "Security & Monitoring"
menu_option 1 "Threat Analysis" "Analyze threats & reputation"
menu_option 2 "Live Monitoring" "Real-time attack detection"
menu_option 3 "Log Viewers" "Tail system/security logs"
menu_option 4 "Security Actions" "Hardening & protection"
echo "" echo ""
echo -e " 1) 📊 Threat Analysis → Analyze threats & reputation" menu_back "Main Menu"
echo -e " 2) 🔴 Live Monitoring → Real-time attack detection" menu_divider
echo -e " 3) 📋 Log Viewers → Tail system/security logs"
echo -e " 4) 🔒 Security Actions → Hardening & protection" read_menu_choice "Select option" 0 4
echo ""
echo -e " 0) Back to Main Menu"
echo ""
echo -e "──────────────────────────────────────────────────────────────"
echo -n "Select option: "
} }
handle_security_menu() { handle_security_menu() {
@@ -379,17 +375,14 @@ handle_security_menu() {
while true; do while true; do
show_security_menu show_security_menu
if ! read -r choice </dev/tty 2>/dev/null; then
return 0 # Exit if read fails
fi
case "$choice" in case "$MENU_CHOICE" in
1) handle_threat_analysis_menu ;; 1) handle_threat_analysis_menu ;;
2) handle_live_monitoring_menu ;; 2) handle_live_monitoring_menu ;;
3) handle_log_viewers_menu ;; 3) handle_log_viewers_menu ;;
4) handle_security_actions_menu ;; 4) handle_security_actions_menu ;;
0) return ;; 0) return ;;
*) echo -e "Invalid option"; sleep 1 ;; *) menu_invalid_choice ;;
esac esac
done done
} }
@@ -400,30 +393,29 @@ handle_security_menu() {
show_website_menu() { show_website_menu() {
show_banner show_banner
echo -e "🌐 Website Diagnostics" menu_header "Website Diagnostics"
menu_section "Error Analysis"
menu_option 1 "Website Error Analyzer" "Find 500/config errors"
menu_option 2 "Fast 500 Error Tracker" "ONLY 500s + root cause"
echo "" echo ""
echo -e "Error Analysis:" menu_section "Performance & Slowness"
menu_option 3 "Website Slowness Diagnostics" "Multi-framework analysis"
echo "" echo ""
echo -e " 1) 🔍 Website Error Analyzer - Find 500/config errors (filters bots)" menu_section "WordPress Management"
echo -e " 2) 🔥 Fast 500 Error Tracker - ONLY 500s + root cause diagnosis" menu_option 4 "WordPress Tools" "WP-Cron manager & tools"
echo "" echo ""
echo -e "Performance & Slowness:" menu_section "Domain Analysis"
menu_option 5 "Cloudflare Detector" "Domains using Cloudflare"
echo "" echo ""
echo -e " 3) 🐢 Website Slowness Diagnostics - Multi-framework analysis" menu_back "Main Menu"
echo " └─ WordPress, Drupal, Joomla, Magento, Laravel, Node.js, etc." menu_divider
echo ""
echo -e "WordPress Management:" read_menu_choice "Select option" 0 5
echo ""
echo -e " 4) 📦 WordPress Tools → WP-Cron manager & more tools"
echo ""
echo -e "Domain Analysis:"
echo ""
echo -e " 5) 🔶 Cloudflare Detector - Which domains use Cloudflare + location"
echo ""
echo -e " 0) Back to Main Menu"
echo ""
echo -e "──────────────────────────────────────────────────────────────"
echo -n "Select option: "
} }
handle_website_menu() { handle_website_menu() {
@@ -433,18 +425,15 @@ handle_website_menu() {
while true; do while true; do
show_website_menu show_website_menu
if ! read -r choice </dev/tty 2>/dev/null; then
return 0 # Exit if read fails
fi
case "$choice" in case "$MENU_CHOICE" in
1) run_module "website" "website-error-analyzer.sh" ;; 1) run_module "website" "website-error-analyzer.sh" ;;
2) run_module "website" "500-error-tracker.sh" ;; 2) run_module "website" "500-error-tracker.sh" ;;
3) run_module "website" "website-slowness-diagnostics.sh" ;; 3) run_module "website" "website-slowness-diagnostics.sh" ;;
4) bash "$MODULES_DIR/website/wordpress-menu.sh" ;; 4) bash "$MODULES_DIR/website/wordpress-menu.sh" ;;
5) run_module "website" "cloudflare-detector.sh" ;; 5) run_module "website" "cloudflare-detector.sh" ;;
0) return ;; 0) return ;;
*) echo -e "Invalid option"; sleep 1 ;; *) menu_invalid_choice ;;
esac esac
done done
} }
@@ -455,34 +444,34 @@ handle_website_menu() {
show_performance_menu() { show_performance_menu() {
show_banner show_banner
echo -e "🔧 Performance & Maintenance" menu_header "Performance & Maintenance"
menu_section "Database"
menu_option 1 "MySQL Query Analyzer" "Find slow queries & optimize"
echo "" echo ""
echo -e "Database:" menu_section "Network & Resources"
menu_option 2 "Network & Bandwidth" "Traffic & top consumers"
menu_option 3 "Hardware Health Check" "SMART, memory, CPU sensors"
echo "" echo ""
echo -e " 1) 🗄️ MySQL Query Analyzer - Find slow queries & optimize" menu_section "PHP Optimization"
menu_option 4 "PHP Configuration Optimizer" "Per-domain PHP tuning"
echo "" echo ""
echo -e "Network & Resources:" menu_section "System Health"
menu_option 5 "Loadwatch Health Analyzer" "Historical system analysis"
menu_option 6 "Disk Space Analyzer" "Find space issues"
echo "" echo ""
echo -e " 2) 🌐 Network & Bandwidth - Traffic & top consumers" menu_section "Caching Solutions"
echo -e " 3) 💻 Hardware Health Check - SMART, memory, CPU sensors" menu_option 7 "Nginx + Varnish Manager" "Setup/manage caching stack"
echo "" echo ""
echo -e "PHP Optimization:" menu_back "Main Menu"
echo "" menu_divider
echo -e " 4) ⚙️ PHP Configuration Optimizer - Per-domain PHP tuning"
echo "" read_menu_choice "Select option" 0 7
echo -e "System Health:"
echo ""
echo -e " 5) 📊 Loadwatch Health Analyzer - Historical system analysis"
echo -e " 6) 💿 Disk Space Analyzer - Find space issues & cleanup files"
echo ""
echo -e "Caching Solutions:"
echo ""
echo -e " 7) ⚡ Nginx + Varnish Manager - Setup/manage caching stack"
echo ""
echo -e " 0) Back to Main Menu"
echo ""
echo -e "──────────────────────────────────────────────────────────────"
echo -n "Select option: "
} }
handle_performance_menu() { handle_performance_menu() {
@@ -492,11 +481,8 @@ handle_performance_menu() {
while true; do while true; do
show_performance_menu show_performance_menu
if ! read -r choice </dev/tty 2>/dev/null; then
return 0 # Exit if read fails
fi
case "$choice" in case "$MENU_CHOICE" in
1) run_module "performance" "mysql-query-analyzer.sh" ;; 1) run_module "performance" "mysql-query-analyzer.sh" ;;
2) run_module "performance" "network-bandwidth-analyzer.sh" ;; 2) run_module "performance" "network-bandwidth-analyzer.sh" ;;
3) run_module "performance" "hardware-health-check.sh" ;; 3) run_module "performance" "hardware-health-check.sh" ;;
@@ -505,7 +491,7 @@ handle_performance_menu() {
6) run_module "maintenance" "disk-space-analyzer.sh" ;; 6) run_module "maintenance" "disk-space-analyzer.sh" ;;
7) run_module "performance" "nginx-varnish-manager.sh" ;; 7) run_module "performance" "nginx-varnish-manager.sh" ;;
0) return ;; 0) return ;;
*) echo -e "Invalid option"; sleep 1 ;; *) menu_invalid_choice ;;
esac esac
done done
} }
@@ -552,55 +538,55 @@ handle_loadwatch_analyzer() {
show_backup_menu() { show_backup_menu() {
show_banner show_banner
echo -e "💾 Backup & Recovery" menu_header "Backup & Recovery"
menu_section "Acronis Cyber Protect"
menu_option 1 "Acronis Management" "Complete backup management"
echo "" echo ""
echo -e "Acronis Cyber Protect:" menu_section "Database Tools"
menu_option 2 "MySQL File Restore" "Convert restored DB files"
echo "" echo ""
echo -e " 1) 🔷 Acronis Management → Complete backup management" menu_section "Maintenance"
menu_option 3 "Cleanup Toolkit Data" "Remove temp files"
echo "" echo ""
echo -e "Database Tools:" menu_back "Main Menu"
echo "" menu_divider
echo -e " 2) 🔄 MySQL File Restore - Convert restored DB files to .sql"
echo "" read_menu_choice "Select option" 0 3
echo -e "Maintenance:"
echo ""
echo -e " 3) 🗑️ Cleanup Toolkit Data - Remove IP reputation & temp files"
echo ""
echo -e " 0) Back to Main Menu"
echo ""
echo -e "──────────────────────────────────────────────────────────────"
echo -n "Select option: "
} }
show_acronis_menu() { show_acronis_menu() {
show_banner show_banner
echo -e "🔷 Acronis Cyber Protect" menu_header "Acronis Cyber Protect"
menu_section "Installation & Setup"
menu_option 1 "Install Acronis Agent" "Download and install"
menu_option 2 "Register with Cloud" "Connect to Acronis Cloud"
menu_option 3 "Configure Agent" "Adjust settings"
echo "" echo ""
echo -e "Installation & Setup:" menu_section "Backup Management"
menu_option 4 "Manage Backups" "Complete backup interface"
echo "" echo ""
echo -e " 1) Install Acronis Agent - Download and install" menu_section "Status & Monitoring"
echo -e " 2) Register with Cloud - Connect to Acronis Cloud" menu_option 5 "Check Agent Status" "Verify Acronis running"
echo -e " 3) Configure Agent - Adjust settings" menu_option 6 "View Logs" "Check Acronis logs"
menu_option 7 "Troubleshoot" "Diagnose backup failures"
echo "" echo ""
echo -e "Backup Management:" menu_section "Maintenance"
menu_option 8 "Update Agent" "Upgrade to latest version"
menu_option 9 "Uninstall Acronis" "Remove agent"
echo "" echo ""
echo -e " 4) 📊 Manage Backups - Complete backup interface" menu_back "Backup Menu"
echo "" menu_divider
echo -e "Status & Monitoring:"
echo "" read_menu_choice "Select option" 0 9
echo -e " 5) Check Agent Status - Verify Acronis is running"
echo -e " 6) View Logs - Check Acronis logs"
echo -e " 7) Troubleshoot - Diagnose backup failures"
echo ""
echo -e "Maintenance:"
echo ""
echo -e " 8) Update Agent - Upgrade to latest version"
echo -e " 9) Uninstall Acronis - Remove agent"
echo ""
echo -e " 0) Back to Backup Menu"
echo ""
echo -e "──────────────────────────────────────────────────────────────"
echo -n "Select option: "
} }
handle_backup_menu() { handle_backup_menu() {
@@ -610,16 +596,13 @@ handle_backup_menu() {
while true; do while true; do
show_backup_menu show_backup_menu
if ! read -r choice </dev/tty 2>/dev/null; then
return 0 # Exit if read fails
fi
case "$choice" in case "$MENU_CHOICE" in
1) handle_acronis_menu ;; 1) handle_acronis_menu ;;
2) run_module "backup" "mysql-restore-to-sql.sh" ;; 2) run_module "backup" "mysql-restore-to-sql.sh" ;;
3) run_module "maintenance" "cleanup-toolkit-data.sh" ;; 3) run_module "maintenance" "cleanup-toolkit-data.sh" ;;
0) return ;; 0) return ;;
*) echo -e "Invalid option"; sleep 1 ;; *) menu_invalid_choice ;;
esac esac
done done
} }
@@ -631,11 +614,8 @@ handle_acronis_menu() {
while true; do while true; do
show_acronis_menu show_acronis_menu
if ! read -r choice </dev/tty 2>/dev/null; then
return 0 # Exit if read fails
fi
case "$choice" in case "$MENU_CHOICE" in
1) run_module "backup" "acronis-install.sh" ;; 1) run_module "backup" "acronis-install.sh" ;;
2) run_module "backup" "acronis-register.sh" ;; 2) run_module "backup" "acronis-register.sh" ;;
3) run_module "backup" "acronis-configure.sh" ;; 3) run_module "backup" "acronis-configure.sh" ;;
@@ -646,7 +626,7 @@ handle_acronis_menu() {
8) run_module "backup" "acronis-update.sh" ;; 8) run_module "backup" "acronis-update.sh" ;;
9) run_module "backup" "acronis-uninstall.sh" ;; 9) run_module "backup" "acronis-uninstall.sh" ;;
0) return ;; 0) return ;;
*) echo -e "Invalid option"; sleep 1 ;; *) menu_invalid_choice ;;
esac esac
done done
} }
@@ -657,31 +637,31 @@ handle_acronis_menu() {
show_email_menu() { show_email_menu() {
show_banner show_banner
echo -e "📧 Email Troubleshooting & Maintenance" menu_header "Email Troubleshooting & Maintenance"
menu_section "Diagnostics"
menu_option 1 "Email Diagnostics" "Verify email/domain working"
menu_option 2 "Email Deliverability Test" "Test sending/receiving"
menu_option 3 "Mail Queue Inspector" "View stuck emails"
menu_option 4 "SMTP Connection Test" "Verify mail server"
menu_option 5 "SPF/DKIM/DMARC Check" "Email authentication"
echo "" echo ""
echo -e "Diagnostics:" menu_section "Troubleshooting"
menu_option 6 "Blacklist Check" "Check IP reputation"
menu_option 7 "Mail Log Analyzer" "Search mail logs"
menu_option 8 "Flush Mail Queue" "Clear stuck emails"
echo "" echo ""
echo -e " 1) 🔍 Email Diagnostics - Verify email/domain is working ⭐" menu_section "Maintenance"
echo -e " 2) 📬 Email Deliverability Test - Test sending/receiving" menu_option 9 "Clean Mailboxes" "Remove old emails"
echo -e " 3) 🔍 Mail Queue Inspector - View stuck emails" menu_option 10 "Mailbox Size Report" "Show usage per account"
echo -e " 4) 📊 SMTP Connection Test - Verify mail server"
echo -e " 5) 🔐 SPF/DKIM/DMARC Check - Email authentication"
echo "" echo ""
echo -e "Troubleshooting:" menu_back "Main Menu"
echo "" menu_divider
echo -e " 6) 🚫 Blacklist Check - Check IP reputation"
echo -e " 7) 📧 Mail Log Analyzer - Search mail logs" read_menu_choice "Select option" 0 10
echo -e " 8) 🔄 Flush Mail Queue - Clear stuck emails"
echo ""
echo -e "Maintenance:"
echo ""
echo -e " 9) 🧹 Clean Mailboxes - Remove old emails"
echo -e " 10) 📈 Mailbox Size Report - Show usage per account"
echo ""
echo -e " 0) Back to Main Menu"
echo ""
echo -e "──────────────────────────────────────────────────────────────"
echo -n "Select option: "
} }
handle_email_menu() { handle_email_menu() {
@@ -691,11 +671,8 @@ handle_email_menu() {
while true; do while true; do
show_email_menu show_email_menu
if ! read -r choice </dev/tty 2>/dev/null; then
return 0 # Exit if read fails
fi
case "$choice" in case "$MENU_CHOICE" in
1) run_module "email" "email-diagnostics.sh" ;; 1) run_module "email" "email-diagnostics.sh" ;;
2) run_module "email" "deliverability-test.sh" ;; 2) run_module "email" "deliverability-test.sh" ;;
3) run_module "email" "mail-queue-inspector.sh" ;; 3) run_module "email" "mail-queue-inspector.sh" ;;
@@ -707,7 +684,7 @@ handle_email_menu() {
9) run_module "email" "clean-mailboxes.sh" ;; 9) run_module "email" "clean-mailboxes.sh" ;;
10) run_module "email" "mailbox-size-report.sh" ;; 10) run_module "email" "mailbox-size-report.sh" ;;
0) return ;; 0) return ;;
*) echo -e "Invalid option"; sleep 1 ;; *) menu_invalid_choice ;;
esac esac
done done
} }
@@ -799,13 +776,7 @@ main() {
return 0 return 0
fi fi
# Read from terminal (use /dev/tty directly for interaction) case "$MENU_CHOICE" in
if ! read -r choice </dev/tty 2>/dev/null; then
# No terminal available, return from function gracefully
return 0
fi
case "$choice" in
1) run_module "diagnostics" "system-health-check.sh" ;; 1) run_module "diagnostics" "system-health-check.sh" ;;
2) handle_security_menu ;; 2) handle_security_menu ;;
3) handle_website_menu ;; 3) handle_website_menu ;;
@@ -837,8 +808,7 @@ main() {
return 0 return 0
;; ;;
*) *)
echo -e "Invalid option" menu_invalid_choice
sleep 1
;; ;;
esac esac
done done