Merge remote-tracking branch 'origin/beta' into beta

Author: alexandergull

composer.json

@@ -27,12 +27,6 @@
             "vendor/bin/phpcs --config-set installed_paths vendor/phpcompatibility/php-compatibility",
             "vendor/bin/phpcs --standard=tests/.phpcs.xml",
             "vendor/bin/psalm --no-cache --config=psalm.xml"
-        ],
-        "just_phpunit": [
-            "vendor/bin/phpunit --configuration tests/phpunit.xml --debug"
-        ],
-        "just_psalm": [
-            "vendor/bin/psalm --no-cache --config=psalm.xml --debug"
         ]
     },
     "config": {

inc/admin-templates/field-templates/checkbox.php

@@ -145,7 +145,6 @@ function spbc_admin_init()
     add_action('wp_ajax_spbc_settings__check_renew_banner', 'spbc_settings__check_renew_banner');
     add_action('wp_ajax_spbc_get_key_auto', 'spbc_get_key_auto');
     add_action('wp_ajax_spbc_save_key', 'spbc_save_key');
-    add_action('wp_ajax_spbc_update_account_email', 'spbc_settings__update_account_email');
     add_action('wp_ajax_spbc_create_support_user', 'spbc_settings__spbc_create_support_user');
 
     // Confirm the email to activate 2FA
@@ -228,24 +227,25 @@ function spbct_get_tab_data()
     switch ($tab_name) {
         case 'critical_updates':
             wp_send_json(VulnerabilityAlarmView::getTabCriticalUpdatesData());
-            break;
+            // no break
         case 'fswatcher':
             wp_send_json(\CleantalkSP\SpbctWP\FSWatcher\View\View::getReactData($data));
-            break;
+            // no break
         case 'traffic_control':
             wp_send_json(FirewallView::getReactData($data));
-            break;
+            // no break
         case 'settings_general':
             wp_send_json(SettingsGeneralReact::getReactData());
-            break;
+            // no break
         case 'security_certified':
             PscCertifiedPluginsController::ajaxRenderTab();
             break;
         case 'spbct_settings_overview':
             wp_send_json(spbc_field_options_overview_traffic_light());
-            break;
+            // no break
         default:
             wp_send_json_error('Unknown tab');
+            // no break
     }
 }
 
@@ -298,12 +298,15 @@ function spbc_plugin_list_show_vulnerability($plugin_file, $plugin_data, $_statu
     $do_show = (
             isset($spbc->settings['vulnerability_check__enable_cron'], $spbc->settings['vulnerability_check__warn_on_modules_pages']) &&
             $spbc->settings['vulnerability_check__enable_cron'] == true &&
-            $spbc->settings['vulnerability_check__warn_on_modules_pages'] == true &&
-            isset($plugin_data['slug']) // Only plugins which have slug (from wordpress catalog) need to check
+            $spbc->settings['vulnerability_check__warn_on_modules_pages'] == true
     );
 
     if ($do_show) {
-        $plugin_slug = isset($plugin_data['slug']) ? $plugin_data['slug'] : sanitize_title($plugin_data['Name']);
+        // WP.org slug is often missing here (custom Plugin URI). Fall back to folder/textdomain.
+        $plugin_slug = VulnerabilityAlarm::getPluginSlug($plugin_data, $plugin_file);
+        if ( $plugin_slug === '' ) {
+            return;
+        }
         $plugin_version = ! empty($plugin_data['Version']) ? $plugin_data['Version'] : '';
         $plugin_report = VulnerabilityAlarm::checkPluginVulnerabilityStatic($plugin_slug, $plugin_version);
         if ( $plugin_report instanceof \CleantalkSP\SpbctWP\VulnerabilityAlarm\Dto\PluginReport ) {