Merge branch 'dev' into upload-exclusions

CleanTalk · Jul 17, 2024 · 6ee561a · 6ee561a
2 parents 2382541 + 79beda5
commit 6ee561a
Show file tree

Hide file tree

Showing 728 changed files with 1,855 additions and 20,606 deletions.
diff --git a/css/spbc-admin.min.css b/css/spbc-admin.min.css
diff --git a/css/spbc-dashboard-widget.min.css b/css/spbc-dashboard-widget.min.css
diff --git a/css/spbc-settings.min.css b/css/spbc-settings.min.css
diff --git a/css/src/spbc-admin.css b/css/src/spbc-admin.css
@@ -158,7 +158,7 @@ span.green_dot{
 .spbct-safe-extension-badge-description {
 	display: none;
 	position: absolute;
-	min-width: 200px;
+	min-width: 400px;
 	background: rgba(0, 0, 0, 0.5);
 	color: white;
 	text-align: center;
@@ -197,4 +197,4 @@ span.green_dot{
 .spbct-safe-extension-badge-description > a {
 	color: white;
 	text-decoration: underline;
-}
+}
diff --git a/css/src/spbc-dashboard-widget.css b/css/src/spbc-dashboard-widget.css
@@ -4,10 +4,17 @@
 	height: 100%;
 }
 .spbc_widget_top_links {
-	text-align: right;
+	display: grid;
+	justify-items: right;
 	padding: 0 12px;
-	height: 32px;
+	height: auto;
+}
+
+.spbc_widget_notice_critical {
+    text-align: left;
+	margin-bottom: 10px;
 }
+
 .spbc_widget_settings_link{margin: 0 0 0 10px;}
 .spbc_widget_refresh_link{}
 

diff --git a/css/src/spbc-settings.css b/css/src/spbc-settings.css
@@ -972,4 +972,21 @@ button#spbc_setting_get_key_auto:disabled {
 	font-size: 15px;
 	font-weight: 500;
 	margin: 5px 0 0 30px;
+}
+
+.spbct_notice {
+	display: flex;
+    justify-content: space-between;
+}
+
+.spbct_notice-dismiss {
+	position: relative;
+    top: 0;
+    right: 1px;
+    border: none;
+    margin: 0;
+    padding: 9px;
+    background: 0 0;
+    color: #787c82;
+    cursor: pointer;
 }
diff --git a/inc/admin-bar.php b/inc/admin-bar.php
@@ -1,5 +1,7 @@
 <?php
 
+use CleantalkSP\SpbctWP\LinkConstructor;
+
 /**
  * Adding parent nodes for plugins depending on installed ones
  *
@@ -24,16 +26,19 @@ function spbc_admin__admin_bar__add_structure($wp_admin_bar)
         'meta'  => array('class' => 'cleantalk-admin_bar--list_wrapper'),
     ));
 
-    $utm_marks = '&utm_source=wp-backend&utm_medium=cpc&utm_campaign=WP%%20backend%%20trial_security';
-    $link = 'https://p.cleantalk.org/?featured=&product_id=4&user_token=' . $spbc->user_token . $utm_marks;
+    $link_tag = linkConstructor::buildRenewalLinkATag(
+        $spbc->user_token,
+        __('Renew Security', 'security-malware-firewall'),
+        4,
+        'renew_admin_bar_spbct'
+    );
+
     $title_link = $spbc->data["wl_mode_enabled"] ? $spbc->data["wl_support_url"] :
-        "<span><a href='{$link}' target='_blank'>";
+        '<span>' . $link_tag . '</span>';
 
     // Security
     $title = $spbc->notice_trial
         ? $title_link
-          . __('Renew Security', 'security-malware-firewall')
-          . '</a></span>'
         : '<a>' . __('Security', 'security-malware-firewall') . '</a>';
 
     $attention_mark = $spbc->notice_show ? '<i class="spbc-icon-attention-alt ctlk---red"></i>' : '';
@@ -52,8 +57,14 @@ function spbc_admin__admin_bar__add_structure($wp_admin_bar)
     if ( ! $apbct) {
         $apbct_title = '<a>' . __('Anti-Spam', 'cleantalk-spam-protect') . '</a>';
     } elseif ($apbct->admin_bar_enabled) {
+        $link_tag = linkConstructor::buildRenewalLinkATag(
+            $spbc->user_token,
+            __('Renew Anti-Spam', 'security-malware-firewall'),
+            1,
+            'renew_admin_bar_cross_link_apbct'
+        );
         $apbct_title = $apbct->notice_trial == 1
-            ? "<span><a class='ctlk---red' href='https://cleantalk.org/my/bill/recharge?utm_source=wp-backend&utm_medium=cpc&utm_campaign=WP%20backend%20trial&user_token={$apbct->user_token}&cp_mode=antispam' target='_blank'>" . __('Renew Anti-Spam', 'cleantalk-spam-protect') . '</a></span>'
+            ? '<span>' . $link_tag . '</span>'
             : '<a>' . __('Anti-Spam', 'cleantalk-spam-protect') . '</a>';
 
         $apbct_attention_mark = $apbct->notice_show ? '<i class="apbct-icon-attention-alt"></i>' : '';