From 4eb12a5f8125825a4c4696a40c24b43bed9ec4d2 Mon Sep 17 00:00:00 2001
From: master3395 <master3395@users.noreply.github.com>
Date: Tue, 20 Jan 2026 01:31:18 +0100
Subject: [PATCH] Fix plugin author display and add Settings button

- Add author field extraction from meta.xml in both plugin processing loops
- Update discordWebhooks meta.xml to include author: Master3395
- Update examplePlugin meta.xml to include author: usmannasir
- Add Plugin Settings button next to Deactivate/Uninstall buttons in both grid and table views
- Special handling for emailMarketing core plugin URL (/emailMarketing/ instead of /plugins/emailMarketing/)
- Add btn-settings styling for Settings button with hover effects
---
 examplePlugin/meta.xml                        |  1 +
 .../templates/pluginHolder/plugins.html       | 21 +++++++++++++++
 pluginHolder/views.py                         | 27 +++++++++++++++++--
 3 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/examplePlugin/meta.xml b/examplePlugin/meta.xml
index d2906990b..dfa949cd5 100644
--- a/examplePlugin/meta.xml
+++ b/examplePlugin/meta.xml
@@ -4,4 +4,5 @@
     <type>plugin</type>
     <description>This is an example plugin</description>
     <version>1.0</version>
+    <author>usmannasir</author>
 </cyberpanelPluginConfig>
\ No newline at end of file
diff --git a/pluginHolder/templates/pluginHolder/plugins.html b/pluginHolder/templates/pluginHolder/plugins.html
index 2329de30a..19942fc17 100644
--- a/pluginHolder/templates/pluginHolder/plugins.html
+++ b/pluginHolder/templates/pluginHolder/plugins.html
@@ -708,6 +708,17 @@
         box-shadow: 0 4px 8px rgba(255,193,7,0.3);
     }
     
+    .btn-settings {
+        background: #5856d6;
+        color: white;
+    }
+    
+    .btn-settings:hover {
+        background: #4a48c4;
+        transform: translateY(-1px);
+        box-shadow: 0 4px 8px rgba(88,86,214,0.3);
+    }
+    
     .btn-action:disabled {
         opacity: 0.6;
         cursor: not-allowed;
@@ -883,6 +894,11 @@
                     <div class="plugin-footer">
                         <div class="plugin-actions">
                             {% if plugin.installed %}
+                                {% if plugin.manage_url %}
+                                    <a href="{{ plugin.manage_url }}" class="btn-action btn-settings btn-small" title="{% trans 'Plugin Settings' %}">
+                                        <i class="fas fa-cog"></i> {% trans "Settings" %}
+                                    </a>
+                                {% endif %}
                                 {% if plugin.enabled %}
                                     <button class="btn-action btn-deactivate btn-small" onclick="deactivatePlugin('{{ plugin.plugin_dir }}')">
                                         <i class="fas fa-toggle-on"></i> {% trans "Deactivate" %}
@@ -954,6 +970,11 @@
                                 <td>
                                     <div class="plugin-actions">
                                         {% if plugin.installed %}
+                                            {% if plugin.manage_url %}
+                                                <a href="{{ plugin.manage_url }}" class="btn-action btn-settings" title="{% trans 'Plugin Settings' %}">
+                                                    <i class="fas fa-cog"></i> {% trans "Settings" %}
+                                                </a>
+                                            {% endif %}
                                             {% if plugin.enabled %}
                                                 <button class="btn-action btn-deactivate" onclick="deactivatePlugin('{{ plugin.plugin_dir }}')">
                                                     <i class="fas fa-toggle-on"></i> {% trans "Deactivate" %}
diff --git a/pluginHolder/views.py b/pluginHolder/views.py
index 8860e43f2..3eae50968 100644
--- a/pluginHolder/views.py
+++ b/pluginHolder/views.py
@@ -152,7 +152,11 @@ def installed(request):
                 url_elem = root.find('url')
                 
                 # Priority: settings_url > url > default pattern
-                if settings_url_elem is not None and settings_url_elem.text:
+                # Special handling for core plugins that don't use /plugins/ prefix
+                if plugin == 'emailMarketing':
+                    # emailMarketing is a core CyberPanel plugin, uses /emailMarketing/ not /plugins/emailMarketing/
+                    data['manage_url'] = '/emailMarketing/'
+                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:
                     data['manage_url'] = url_elem.text
@@ -163,6 +167,13 @@ def installed(request):
                         data['manage_url'] = f'/plugins/{plugin}/settings/'
                     else:
                         data['manage_url'] = None
+                
+                # Extract author information
+                author_elem = root.find('author')
+                if author_elem is not None and author_elem.text:
+                    data['author'] = author_elem.text
+                else:
+                    data['author'] = 'Unknown'
 
                 pluginList.append(data)
                 processed_plugins.add(plugin)  # Mark as processed
@@ -233,13 +244,25 @@ def installed(request):
                 settings_url_elem = root.find('settings_url')
                 url_elem = root.find('url')
                 
-                if settings_url_elem is not None and settings_url_elem.text:
+                # Priority: settings_url > url > default pattern
+                # Special handling for core plugins that don't use /plugins/ prefix
+                if plugin == 'emailMarketing':
+                    # emailMarketing is a core CyberPanel plugin, uses /emailMarketing/ not /plugins/emailMarketing/
+                    data['manage_url'] = '/emailMarketing/'
+                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:
                     data['manage_url'] = url_elem.text
                 else:
                     data['manage_url'] = f'/plugins/{plugin}/'
                 
+                # Extract author information
+                author_elem = root.find('author')
+                if author_elem is not None and author_elem.text:
+                    data['author'] = author_elem.text
+                else:
+                    data['author'] = 'Unknown'
+                
                 pluginList.append(data)
                 
             except ElementTree.ParseError as e: