Upd. Settings. Update links on wpms to subsite settings. (#738)

Co-authored-by: svedge <svedge@users.noreply.github.com>

Author: svedge

inc/spbc-settings.php

@@ -1933,7 +1933,7 @@ function spbc_field_scanner__show_accordion($direct_call = false)
 
     //cure log description
     $cure_log_description = sprintf(
-        '<div> %s <a href="/wp-admin/options-general.php?page=spbc&spbc_tab=backups">%s</a><br><ul><li>%s</li><li>%s</li></ul></div>',
+        '<div> %s <a href="' . esc_url($spbc->settings_link . '&spbc_tab=backups') . '">%s</a><br><ul><li>%s</li><li>%s</li></ul></div>',
         __('These files were automatically cured. You can see backups and restore files on the ', 'security-malware-firewall'),
         __('Backups tab:', 'security-malware-firewall'),
         __('CURED - the file was automatically cured.', 'security-malware-firewall'),

js/public/spbct-react-bundle.js

@@ -319,7 +319,8 @@ export default function TabFirewall({sectionId, sectionData, isActive}) {
                                         'Plugin does not work until you enter the Access key in ',
                                         'security-malware-firewall',
                                     )}
-                                    <a href={'/wp-admin/options-general.php?page=spbc&spbc_tab=settings_general'}>
+                                    <a href={sectionData.strings.access_key_settings_url ||
+                                        'options-general.php?page=spbc&spbc_tab=settings_general'}>
                                         {__('General settings', 'security-malware-firewall')}
                                     </a>.
                                 </h3>

js/src/react/components/TabContent/TabFirewall/TabFirewall.js

@@ -64,7 +64,7 @@ protected function needToShow()
      */
     protected function display()
     {
-        $link = get_admin_url(get_main_site_id(), 'options-general.php?page=spbc&spbc_tab=settings_general');
+        $link = $this->banners_handler->spbc->getAccessKeySettingsUrl();
         $msg = __('Please enter the Access Key in Security by CleanTalk plugin to enable security features!', 'security-malware-firewall');
         $is_dismissible_text = $this->is_settings_page ? '' : 'is-dismissible';
         $div_head =  '<div class="spbc-notice error um-admin-notice notice '

lib/CleantalkSP/SpbctWP/AdminBannersModule/AdminBanners/AdminBannerEmptyKey.php

@@ -65,8 +65,13 @@ protected function needToShow()
      */
     protected function display()
     {
-        $link = get_admin_url(get_main_site_id(), 'options-general.php?page=spbc&spbc_tab=settings_general');
-        $msg = __('Access key is not valid. Enter into plugin settings in the main site dashboard to get access key.', 'security-malware-firewall');
+        $link = $this->banners_handler->spbc->getAccessKeySettingsUrl();
+        $use_main_site_copy = $this->banners_handler->spbc->is_network
+            && ! $this->banners_handler->spbc->is_mainsite
+            && (int) $this->banners_handler->spbc->ms__work_mode === 2;
+        $msg = $use_main_site_copy
+            ? __('Access key is not valid. Enter into plugin settings in the main site dashboard to get access key.', 'security-malware-firewall')
+            : __('Access key is not valid. Enter into plugin settings to get access key.', 'security-malware-firewall');
         $is_dismissible_text = $this->is_settings_page ? '' : 'is-dismissible';
         $div_head =  '<div class="spbc-notice error um-admin-notice notice '
             . $is_dismissible_text

lib/CleantalkSP/SpbctWP/AdminBannersModule/AdminBanners/AdminBannerWrongKey.php

@@ -13,9 +13,19 @@ class FeatureRestrictionView
      */
     public static function keyNotValid()
     {
+        global $spbc;
+
+        $link = admin_url('options-general.php?page=spbc&spbc_tab=settings_general');
+        if (isset($spbc) && is_object($spbc) && method_exists($spbc, 'getAccessKeySettingsUrl')) {
+            $maybe_link = $spbc->getAccessKeySettingsUrl();
+            if (is_string($maybe_link) && $maybe_link !== '') {
+                $link = $maybe_link;
+            }
+        }
+
         return '<div style="margin: 10px auto; text-align: center;"><h3 style="margin: 5px; display: inline-block;">'
             . __('Plugin does not work until you enter the Access key in ', 'security-malware-firewall')
-            . '<a href="/wp-admin/options-general.php?page=spbc&spbc_tab=settings_general">'
+            . '<a href="' . esc_url($link) . '">'
             . __('General settings', 'security-malware-firewall')
             . '</a>.</h3></div>';
     }

lib/CleantalkSP/SpbctWP/FeatureRestriction/FeatureRestrictionView.php

@@ -25,6 +25,7 @@ public static function getReactData($data)
         $data['objects']['service_id'] = $spbc->service_id;
 
         $data['flags']['is_key_ok'] = $spbc->key_is_ok;
+        $data['strings']['access_key_settings_url'] = $spbc->getAccessKeySettingsUrl();
         $data['flags']['showMoreButton'] = self::getFirewallRowsCount() > SPBC_LAST_ACTIONS_TO_VIEW;
         $data['flags']['is_traffic_control_enabled'] = isset($spbc->settings['traffic_control__enabled']) && $spbc->settings['traffic_control__enabled'] == true;
         $data['flags']['is_waf_enabled'] = isset($spbc->settings['waf__enabled']) && $spbc->settings['waf__enabled'] == true;

lib/CleantalkSP/SpbctWP/Firewall/View.php

@@ -423,6 +423,30 @@ protected function init()
         $this->update_logger = new Firewall\SpbcFWUpdateLogger();
     }
 
+    /**
+     * Settings URL where the Access key is entered.
+     * Individual keys (WPMS modes 1 and 3): current site.
+     * Mutual Access Key (mode 2): main site.
+     *
+     * @param string $tab
+     *
+     * @return string
+     * @psalm-suppress PossiblyUnusedMethod
+     */
+    public function getAccessKeySettingsUrl($tab = 'settings_general')
+    {
+        $path = 'options-general.php?page=spbc';
+        if ($tab !== '') {
+            $path .= '&spbc_tab=' . rawurlencode($tab);
+        }
+
+        if ($this->is_network && ! $this->is_mainsite && (int) $this->ms__work_mode === 2) {
+            return get_admin_url(get_main_site_id(), $path);
+        }
+
+        return admin_url($path);
+    }
+
     /**
      * Wrapper for CMS
      * Getting the option from the database

lib/CleantalkSP/SpbctWP/State.php

@@ -38,4 +38,34 @@ public function testIsHaveErrors()
         ));
         $this->assertTrue($this->state->isHaveErrors());
     }
+
+    public function testGetAccessKeySettingsUrlUsesCurrentSiteForIndividualKeys()
+    {
+        $subsite_state = new State(
+            'spbc',
+            array(
+                'settings',
+                'data',
+                'remote_calls',
+                'debug',
+                'installing',
+                'errors',
+                'fw_stats'
+            ),
+            true,
+            false
+        );
+        $subsite_state->ms__work_mode = 1;
+
+        $this->assertSame(
+            admin_url('options-general.php?page=spbc&spbc_tab=settings_general'),
+            $subsite_state->getAccessKeySettingsUrl()
+        );
+
+        $subsite_state->ms__work_mode = 2;
+        $this->assertSame(
+            get_admin_url(get_main_site_id(), 'options-general.php?page=spbc&spbc_tab=settings_general'),
+            $subsite_state->getAccessKeySettingsUrl()
+        );
+    }
 }