From 0640de30bc19daa07c8b3d7e137d9dbbaba68151 Mon Sep 17 00:00:00 2001
From: cschantz <admin@server.local>
Date: Tue, 11 Nov 2025 18:47:16 -0500
Subject: [PATCH] Move Malware Scanner to top-level security analysis menu
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Malware scanning is now more prominent:
- Moved from Web Application Analysis submenu to main Security Analysis menu
- Now option 1 (🦠 Malware Scanner) in Analysis & Troubleshooting
- Direct path: Security → Analysis → Malware Scanner (2→1→1)
- Removed from Web Application submenu to avoid duplication
- Renumbered all security analysis options accordingly

Much easier to find and access the malware scanner now.
---
 launcher.sh | 48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/launcher.sh b/launcher.sh
index be7ad3d..5d4712c 100755
--- a/launcher.sh
+++ b/launcher.sh
@@ -183,10 +183,11 @@ show_security_analysis_menu() {
     echo ""
     echo -e "${BOLD}Analysis Categories:${NC}"
     echo ""
-    echo -e "  ${CYAN}1)${NC} 🤖 Bot & Traffic Analysis     → Analyze attack patterns, bots, DDoS"
-    echo -e "  ${CYAN}2)${NC} 🔐 Authentication Analysis    → SSH, cPanel, FTP, Email login attempts"
-    echo -e "  ${CYAN}3)${NC} 🌐 Web Application Analysis   → Website security, malware, vulnerabilities"
-    echo -e "  ${CYAN}4)${NC} 🔥 Firewall & Network Review  → CSF, ports, connections"
+    echo -e "  ${CYAN}1)${NC} 🦠 Malware Scanner            → Full malware detection (ImunifyAV, ClamAV, Maldet)"
+    echo -e "  ${CYAN}2)${NC} 🤖 Bot & Traffic Analysis     → Analyze attack patterns, bots, DDoS"
+    echo -e "  ${CYAN}3)${NC} 🔐 Authentication Analysis    → SSH, cPanel, FTP, Email login attempts"
+    echo -e "  ${CYAN}4)${NC} 🌐 Web Application Analysis   → Website security, vulnerabilities"
+    echo -e "  ${CYAN}5)${NC} 🔥 Firewall & Network Review  → CSF, ports, connections"
     echo ""
     echo -e "  ${RED}0)${NC} Back to Security Menu"
     echo ""
@@ -270,17 +271,16 @@ show_webapp_analysis_menu() {
     echo ""
     echo -e "${BOLD}Security Scanning:${NC}"
     echo ""
-    echo -e "  ${CYAN}1)${NC} Malware Scanner              - Scan for infected files"
-    echo -e "  ${CYAN}2)${NC} WordPress Security Scan      - WP-specific vulnerabilities"
-    echo -e "  ${CYAN}3)${NC} SQL Injection Detector       - Analyze for SQLi attempts"
-    echo -e "  ${CYAN}4)${NC} XSS Attack Detector          - Cross-site scripting analysis"
-    echo -e "  ${CYAN}5)${NC} File Permission Audit        - Insecure permissions scan"
+    echo -e "  ${CYAN}1)${NC} WordPress Security Scan      - WP-specific vulnerabilities"
+    echo -e "  ${CYAN}2)${NC} SQL Injection Detector       - Analyze for SQLi attempts"
+    echo -e "  ${CYAN}3)${NC} XSS Attack Detector          - Cross-site scripting analysis"
+    echo -e "  ${CYAN}4)${NC} File Permission Audit        - Insecure permissions scan"
     echo ""
     echo -e "${BOLD}Configuration Review:${NC}"
     echo ""
-    echo -e "  ${CYAN}6)${NC} SSL/TLS Security Audit       - Certificate & config review"
-    echo -e "  ${CYAN}7)${NC} ModSecurity Status           - WAF configuration review"
-    echo -e "  ${CYAN}8)${NC} Apache Security Audit        - Web server security review"
+    echo -e "  ${CYAN}5)${NC} SSL/TLS Security Audit       - Certificate & config review"
+    echo -e "  ${CYAN}6)${NC} ModSecurity Status           - WAF configuration review"
+    echo -e "  ${CYAN}7)${NC} Apache Security Audit        - Web server security review"
     echo ""
     echo -e "  ${RED}0)${NC} Back to Analysis Menu"
     echo ""
@@ -978,10 +978,11 @@ handle_security_analysis_menu() {
         read -r choice
 
         case $choice in
-            1) handle_bot_analysis_menu ;;
-            2) handle_auth_analysis_menu ;;
-            3) handle_webapp_analysis_menu ;;
-            4) handle_firewall_analysis_menu ;;
+            1) run_module "security" "malware-scanner.sh" ;;
+            2) handle_bot_analysis_menu ;;
+            3) handle_auth_analysis_menu ;;
+            4) handle_webapp_analysis_menu ;;
+            5) handle_firewall_analysis_menu ;;
             0) return ;;
             *) echo -e "${RED}Invalid option${NC}"; sleep 1 ;;
         esac
@@ -1089,14 +1090,13 @@ handle_webapp_analysis_menu() {
         read -r choice
 
         case $choice in
-            1) run_module "security" "malware-scanner.sh" ;;
-            2) run_module "security" "wp-security-scan.sh" ;;
-            3) run_module "security" "sqli-detector.sh" ;;
-            4) run_module "security" "xss-detector.sh" ;;
-            5) run_module "security" "permission-audit.sh" ;;
-            6) run_module "security" "ssl-security-audit.sh" ;;
-            7) run_module "security" "modsecurity-status.sh" ;;
-            8) run_module "security" "apache-security-audit.sh" ;;
+            1) run_module "security" "wp-security-scan.sh" ;;
+            2) run_module "security" "sqli-detector.sh" ;;
+            3) run_module "security" "xss-detector.sh" ;;
+            4) run_module "security" "permission-audit.sh" ;;
+            5) run_module "security" "ssl-security-audit.sh" ;;
+            6) run_module "security" "modsecurity-status.sh" ;;
+            7) run_module "security" "apache-security-audit.sh" ;;
             0) return ;;
             *) echo -e "${RED}Invalid option${NC}"; sleep 1 ;;
         esac