From 806571e0f18c8c1573542ae30e53d4fe2d5aff63 Mon Sep 17 00:00:00 2001
From: master3395 <master3395@users.noreply.github.com>
Date: Mon, 26 Jan 2026 03:09:58 +0100
Subject: [PATCH] fix: Remove emailMarketing references after removal from
 INSTALLED_APPS

- Comment out emailMarketing menu item in baseTemplate/index.html
- Skip emailMarketing in pluginHolder/views.py when listing plugins
- Prevents HTTP 500 error when template tries to reverse 'emailMarketing' URL

Fixes: HTTP 500 on /plugins/installed after emailMarketing removal
---
 baseTemplate/templates/baseTemplate/index.html | 5 +++--
 pluginHolder/views.py                          | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/baseTemplate/templates/baseTemplate/index.html b/baseTemplate/templates/baseTemplate/index.html
index e818e9bd9..0323f0668 100644
--- a/baseTemplate/templates/baseTemplate/index.html
+++ b/baseTemplate/templates/baseTemplate/index.html
@@ -2312,9 +2312,10 @@
                 <a href="{% url 'SpamAssassin' %}" class="menu-item">
                     <span>SpamAssassin</span>
                 </a>
-                <a href="{% url 'emailMarketing' %}" class="menu-item">
+                <!-- Email Marketing removed - plugin not in INSTALLED_APPS -->
+                <!-- <a href="{% url 'emailMarketing' %}" class="menu-item">
                     <span>Email Marketing</span>
-                </a>
+                </a> -->
                 <a href="{% url 'MailScanner' %}" class="menu-item">
                     <span>MailScanner</span>
                 </a>
diff --git a/pluginHolder/views.py b/pluginHolder/views.py
index a340ef192..b5df768f5 100644
--- a/pluginHolder/views.py
+++ b/pluginHolder/views.py
@@ -184,9 +184,9 @@ def installed(request):
                 
                 # Priority: settings_url > url > default pattern
                 # Special handling for core plugins that don't use /plugins/ prefix
+                # emailMarketing removed from INSTALLED_APPS - skip it
                 if plugin == 'emailMarketing':
-                    # emailMarketing is a core CyberPanel plugin, uses /emailMarketing/ not /plugins/emailMarketing/
-                    data['manage_url'] = '/emailMarketing/'
+                    continue
                 elif settings_url_elem is not None and settings_url_elem.text:
                     data['manage_url'] = settings_url_elem.text
                 elif url_elem is not None and url_elem.text:
@@ -352,9 +352,9 @@ def installed(request):
                 
                 # Priority: settings_url > url > default pattern
                 # Special handling for core plugins that don't use /plugins/ prefix
+                # emailMarketing removed from INSTALLED_APPS - skip it
                 if plugin == 'emailMarketing':
-                    # emailMarketing is a core CyberPanel plugin, uses /emailMarketing/ not /plugins/emailMarketing/
-                    data['manage_url'] = '/emailMarketing/'
+                    continue
                 elif settings_url_elem is not None and settings_url_elem.text:
                     data['manage_url'] = settings_url_elem.text
                 elif url_elem is not None and url_elem.text: