From 2f48e0499f43432051f11d683ff20bc9537885ad Mon Sep 17 00:00:00 2001
From: objec <objecttothis@gmail.com>
Date: Wed, 29 Apr 2026 15:20:08 +0400
Subject: [PATCH] Plugin discovery bugfix

- Fix namespace typo causing plugin to not load
- Code cleanup

Signed-off-by: objec <objecttothis@gmail.com>
---
 app/Controllers/Plugins.php                                  | 4 ++--
 app/Libraries/Plugins/PluginManager.php                      | 3 ++-
 app/Plugins/MailchimpPlugin/Libraries/MailchimpConnector.php | 2 +-
 app/Plugins/MailchimpPlugin/Libraries/MailchimpLibrary.php   | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/Controllers/Plugins.php b/app/Controllers/Plugins.php
index 835d38305..5566821d9 100644
--- a/app/Controllers/Plugins.php
+++ b/app/Controllers/Plugins.php
@@ -32,7 +32,7 @@ class Plugins extends Secure_Controller
         $pluginData = $this->buildPluginDataArray();
 
         if ($search !== '') {
-            $pluginData = array_values(array_filter($pluginData, static function(array $p) use ($search): bool {
+            $pluginData = array_values(array_filter($pluginData, static function (array $p) use ($search): bool {
                 return str_contains(strtolower($p['name']), $search)
                     || str_contains(strtolower($p['description']), $search)
                     || str_contains(strtolower($p['id']), $search);
@@ -41,7 +41,7 @@ class Plugins extends Secure_Controller
 
         $total = count($pluginData);
 
-        usort($pluginData, static function(array $a, array $b) use ($sort, $order): int {
+        usort($pluginData, static function (array $a, array $b) use ($sort, $order): int {
             $valA = strtolower($a[$sort] ?? $a['name']);
             $valB = strtolower($b[$sort] ?? $b['name']);
             return $order === 'asc' ? strcmp($valA, $valB) : strcmp($valB, $valA);
diff --git a/app/Libraries/Plugins/PluginManager.php b/app/Libraries/Plugins/PluginManager.php
index f563916cb..3a83af649 100644
--- a/app/Libraries/Plugins/PluginManager.php
+++ b/app/Libraries/Plugins/PluginManager.php
@@ -6,6 +6,7 @@ use App\Models\PluginConfig;
 use CodeIgniter\Events\Events;
 use Config\Database;
 use Config\Services;
+use Throwable;
 
 class PluginManager
 {
@@ -57,7 +58,7 @@ class PluginManager
 
             try {
                 $plugin = new $className();
-            } catch (\Throwable $e) {
+            } catch (Throwable $e) {
                 log_message('error', "Failed to instantiate plugin {$className}: " . $e->getMessage());
                 continue;
             }
diff --git a/app/Plugins/MailchimpPlugin/Libraries/MailchimpConnector.php b/app/Plugins/MailchimpPlugin/Libraries/MailchimpConnector.php
index c147237f4..f093e7c02 100644
--- a/app/Plugins/MailchimpPlugin/Libraries/MailchimpConnector.php
+++ b/app/Plugins/MailchimpPlugin/Libraries/MailchimpConnector.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace app\Plugins\MailchimpPlugin\Libraries;
+namespace App\Plugins\MailchimpPlugin\Libraries;
 
 use CodeIgniter\Encryption\EncrypterInterface;
 use Config\Services;
diff --git a/app/Plugins/MailchimpPlugin/Libraries/MailchimpLibrary.php b/app/Plugins/MailchimpPlugin/Libraries/MailchimpLibrary.php
index 3347c5b06..bbe0f8d0b 100644
--- a/app/Plugins/MailchimpPlugin/Libraries/MailchimpLibrary.php
+++ b/app/Plugins/MailchimpPlugin/Libraries/MailchimpLibrary.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace app\Plugins\MailchimpPlugin\Libraries;
+namespace App\Plugins\MailchimpPlugin\Libraries;
 
 use App\Plugins\MailchimpPlugin\Enums\SubscriptionStatus;
 use Exception;