refactor function and use correct one in code

Author: peperuda-dev

packages/wp-mu-plugin/stretch-extra/stretch-extra/inc/secondary-plugin-dir.php

@@ -30,7 +30,7 @@
   \update_option('extendify_insights_stop', true, true);
 
   // Initialize the active plugins option as an empty array
-  foreach (get_custom_plugins() as $plugin_info) {
+  foreach (get_installed_custom_plugins() as $plugin_info) {
     // Activate all custom plugins by default on first run
     // @TODO: activate all in one update_option call
     activate_custom_plugin($plugin_info['key']);
@@ -127,10 +127,9 @@ function deactivate_custom_plugin($plugin_key)
 }
 
 /**
- * Get all custom plugins from the custom plugins directory (excluding deleted ones)
- * Returns an array of plugin info: ['key' => plugin_key, 'file' => plugin_file, 'data' => plugin_data]
+ * Get all custom plugins from the custom plugins directory
  */
-function get_custom_plugins(bool $include_deleted = false): array
+function get_all_custom_plugins(): array
 {
   static $all_custom_plugins = null;
 
@@ -139,10 +138,15 @@ function get_custom_plugins(bool $include_deleted = false): array
     $all_custom_plugins = $bundle_config['plugins'];
   }
 
-  if ($include_deleted) {
-    return $all_custom_plugins;
-  }
+  return $all_custom_plugins;
+}
 
+/**
+ * Get installed (not deleted) custom plugins
+ */
+function get_installed_custom_plugins(): array
+{
+  $all_custom_plugins = get_all_custom_plugins();
   // Filter out deleted plugins
   $deleted_plugins = get_deleted_custom_plugins();
   return array_filter($all_custom_plugins, function ($plugin_info) use ($deleted_plugins) {
@@ -154,7 +158,7 @@ function get_custom_plugins(bool $include_deleted = false): array
  * Inject activated custom plugins
  */
 \add_action('plugins_loaded', function () {
-  $custom_plugins = get_custom_plugins();
+  $custom_plugins = get_installed_custom_plugins();
   $active_plugins = get_active_custom_plugins();
 
   foreach ($custom_plugins as $plugin_info) {
@@ -194,7 +198,7 @@ function get_custom_plugins(bool $include_deleted = false): array
 
   switch ($pagenow) {
     case 'plugins.php':
-      $custom_plugins  = get_custom_plugins();
+      $custom_plugins  = get_installed_custom_plugins();
       $deleted_plugins = get_deleted_custom_plugins();
 
       foreach ($custom_plugins as $plugin_info) {
@@ -226,7 +230,7 @@ function get_custom_plugins(bool $include_deleted = false): array
     return $result;
   }
 
-  $custom_plugins                = get_custom_plugins();
+  $custom_plugins                = get_installed_custom_plugins();
   $custom_installed_plugin_slugs = array_column($custom_plugins, 'slug');
   $custom_installed_plugin_slugs = array_merge(
     array_map(fn ($slug) => basename(dirname($slug)), get_deleted_custom_plugins()),
@@ -265,7 +269,7 @@ function get_custom_plugins(bool $include_deleted = false): array
  */
 \add_filter('upgrader_pre_install', function ($response, $hook_extra) {
   if (isset($hook_extra['plugin'])) {
-    $custom_plugins = get_custom_plugins();
+    $custom_plugins = get_installed_custom_plugins();
     $custom_slugs   = array_column($custom_plugins, 'slug');
 
     // Extract slug from plugin path
@@ -520,7 +524,7 @@ function get_custom_plugins(bool $include_deleted = false): array
     'slug' => $slug,
   ];
 
-  $custom_plugin = array_find(get_custom_plugins(), fn ($_) => $_['slug'] === $slug);
+  $custom_plugin = array_find(get_installed_custom_plugins(), fn ($_) => $_['slug'] === $slug);
 
   if ($custom_plugin===null) {
     // not a custom plugin, fallback to default handler
@@ -576,7 +580,7 @@ function get_custom_plugins(bool $include_deleted = false): array
 
   $slug = \wp_unslash($_POST['slug']);
 
-  $custom_plugin = array_find(get_custom_plugins(), fn ($_) => $_['slug'] === $slug);
+  $custom_plugin = array_find(get_installed_custom_plugins(), fn ($_) => $_['slug'] === $slug);
 
   if ($custom_plugin===null) {
     // not a custom plugin, fallback to default handler
@@ -644,7 +648,7 @@ function get_custom_plugins(bool $include_deleted = false): array
 */
 \add_filter('plugin_install_action_links', function ($links, $plugin) {
   $custom_plugin = array_find(
-    get_custom_plugins(),
+    get_installed_custom_plugins(),
     // CAVEAT: we cannot name it $custom plugin since rector will name it also $custom_plugin_*
     // fn ($custom_plugin) => $custom_plugin['slug'] === $plugin['slug'],
     fn ($_) => $_['slug'] === $plugin['slug'],

packages/wp-plugin/ionos-essentials/ionos-essentials/inc/wpscan/index.php

@@ -3,7 +3,7 @@
 namespace ionos\essentials\wpscan;
 
 defined('ABSPATH') || exit();
-use function ionos\stretch_extra\secondary_plugin_dir\get_custom_plugins;
+use function ionos\stretch_extra\secondary_plugin_dir\get_all_custom_plugins;
 require_once __DIR__ . '/controller/class-wpscan.php';
 require_once __DIR__ . '/controller/class-wpscanmiddleware.php';
 require_once __DIR__ . '/views/summary.php';
@@ -40,19 +40,22 @@ function instant_check()
     \wp_send_json_error(null, 500);
   }
 
-  $custom_plugins = get_custom_plugins(true);
-  $custom_installed_plugin_slugs = array_column($custom_plugins, 'slug');
+  if (function_exists('get_all_custom_plugins')) {
+    $custom_plugins = get_all_custom_plugins();
+    $custom_installed_plugin_slugs = array_column($custom_plugins, 'slug');
 
-  if ( in_array($slug, $custom_installed_plugin_slugs)) {
-    \wp_send_json_success("nothing_found", 200);
-  } else {
-    $middleware   = new WPScanMiddleware();
-    $issue_type = $middleware->get_instant_data($type, $slug);
-    if (false === $issue_type) {
-      \wp_send_json_error(null, 500);
-    }
-    \wp_send_json_success($issue_type, 200);
+    if ( in_array($slug, $custom_installed_plugin_slugs)) {
+      \wp_send_json_success("nothing_found", 200);
+    } 
+  }
+
+  $middleware   = new WPScanMiddleware();
+
+  $issue_type = $middleware->get_instant_data($type, $slug);
+  if (false === $issue_type) {
+    \wp_send_json_error(null, 500);
   }
+  \wp_send_json_success($issue_type, 200);
 }
 
 function recommended_action(\WP_REST_Request $request)