From b0d49028e33befcb537dce3f0c9f0c545ff1b7cf Mon Sep 17 00:00:00 2001
From: Marcus Quinn <marcus@agentdesign.co.uk>
Date: Fri, 14 Mar 2025 04:08:11 +0000
Subject: [PATCH] Fix plugin filtering to match defined lists: - Ensure only
 recommended plugins are displayed - Add better error handling - Fix table
 initialization - Improve API error handling

---
 admin/settings.php | 65 ++++++++++++++++++++++++++--------------------
 1 file changed, 37 insertions(+), 28 deletions(-)

diff --git a/admin/settings.php b/admin/settings.php
index e91d7be..ba0e056 100644
--- a/admin/settings.php
+++ b/admin/settings.php
@@ -104,6 +104,7 @@ function wpa_superstar_ajax_get_plugins() {
         // Setup the list table with cached data
         $GLOBALS['tab'] = 'plugin-install';
         $_REQUEST['tab'] = 'plugin-install';
+        $_REQUEST['type'] = 'plugin-install';
         set_current_screen('plugin-install');
         
         $wp_list_table = _get_list_table('WP_Plugin_Install_List_Table', array(
@@ -128,34 +129,41 @@ function wpa_superstar_ajax_get_plugins() {
     // If no cache, get fresh data
     try {
         $plugins = array();
+        
+        // Only fetch plugins that are in our recommended list for this category
         foreach ($recommended_plugins[$category] as $slug) {
-            $plugin_data = plugins_api('plugin_information', array(
-                'slug' => $slug,
-                'fields' => array(
-                    'short_description' => true,
-                    'sections' => false,
-                    'requires' => true,
-                    'rating' => true,
-                    'ratings' => false,
-                    'downloaded' => true,
-                    'last_updated' => true,
-                    'added' => false,
-                    'tags' => false,
-                    'compatibility' => false,
-                    'homepage' => true,
-                    'versions' => false,
-                    'donate_link' => false,
-                    'reviews' => false,
-                    'banners' => false,
-                    'icons' => true,
-                    'active_installs' => true,
-                    'group' => false,
-                    'contributors' => false,
-                )
-            ));
-            
-            if (!is_wp_error($plugin_data)) {
-                $plugins[] = $plugin_data;
+            try {
+                $plugin_data = plugins_api('plugin_information', array(
+                    'slug' => $slug,
+                    'fields' => array(
+                        'short_description' => true,
+                        'sections' => false,
+                        'requires' => true,
+                        'rating' => true,
+                        'ratings' => false,
+                        'downloaded' => true,
+                        'last_updated' => true,
+                        'added' => false,
+                        'tags' => false,
+                        'compatibility' => false,
+                        'homepage' => true,
+                        'versions' => false,
+                        'donate_link' => false,
+                        'reviews' => false,
+                        'banners' => false,
+                        'icons' => true,
+                        'active_installs' => true,
+                        'group' => false,
+                        'contributors' => false,
+                    )
+                ));
+                
+                if (!is_wp_error($plugin_data)) {
+                    $plugins[] = $plugin_data;
+                }
+            } catch (Exception $e) {
+                // Skip this plugin if there's an error
+                continue;
             }
         }
         
@@ -175,6 +183,7 @@ function wpa_superstar_ajax_get_plugins() {
         // Setup the list table
         $GLOBALS['tab'] = 'plugin-install';
         $_REQUEST['tab'] = 'plugin-install';
+        $_REQUEST['type'] = 'plugin-install';
         set_current_screen('plugin-install');
         
         $wp_list_table = _get_list_table('WP_Plugin_Install_List_Table', array(
@@ -195,7 +204,7 @@ function wpa_superstar_ajax_get_plugins() {
         wp_send_json_success($html);
         
     } catch (Exception $e) {
-        wp_send_json_error('Failed to fetch plugin data');
+        wp_send_json_error('Failed to fetch plugin data: ' . $e->getMessage());
     }
 }
 add_action('wp_ajax_wpa_get_plugins', 'wpa_superstar_ajax_get_plugins');