Changeset 3369608

Timestamp:

09/29/2025 10:23:29 AM (5 months ago)

Author:

jumptech

Message:

fix links to avacy SaaS and webspace key updating process

Location:

avacy/trunk/src

Files:

• AddAdminInterface.php (modified) (2 diffs)
• views/avacy-dashboard.php (modified) (1 diff)

avacy/trunk/src/AddAdminInterface.php

@@ -145 +145 @@
     $avacyActiveTab = $_POST['avacy_active_tab'] ?? 'cookie-banner';
     if (!empty($can_update) && isset($avacyActiveTab) && empty($checkSaasAccount)) {
-      update_option('avacy_webspace_key', esc_attr($saveAccountToken));
       update_option('avacy_show_banner', esc_attr($showBanner));
       update_option('avacy_enable_preemptive_block', esc_attr($enablePreemptiveBlock));
@@ -155 +154 @@
         'success'
       ];
+    }
+
+    // if current avacy_webspace_key and avacy_tenant are not the same as the new ones, update them
+    if (get_option('avacy_tenant') !== $tenant || get_option('avacy_webspace_key') !== $webspaceKey) {
+      update_option('avacy_tenant', esc_attr($tenant));
+      update_option('avacy_webspace_key', esc_attr($saveAccountToken));
     }
 

avacy/trunk/src/views/avacy-dashboard.php

@@ -116 +116 @@
                         <div class="AvacyDescription">
                             <p>
-                                <?php 
-                                    $cookie_banner_href = $base_api_url.'/redirect/cookie-banner/'.get_option('avacy_tenant').'/'.get_option('avacy_webspace_key');
+                                <?php
+                                    $isKeyInOldFormat = strpos(get_option('avacy_webspace_key'), '|') === false;
+                                    if( $isKeyInOldFormat) {
+                                        $webspaceKey = get_option('avacy_webspace_key');
+                                    } else {
+                                        $accountToken = explode('|', get_option('avacy_webspace_key'));
+                                        $webspaceKey = $accountToken[1];
+                                    }
+                                    $cookie_banner_href = $base_api_url.'/redirect/cookie-banner/'.get_option('avacy_tenant').'/'.$webspaceKey;
                                     echo wp_kses_post(sprintf(__('To modify the appearance of the cookie banner <a href=%s target="_blank">click here</a>.', 'avacy'),esc_url($cookie_banner_href)));
                                 ?>