Changeset 3444289

Timestamp:

01/21/2026 05:01:40 PM (4 weeks ago)

Author:

rnzo

Message:

Code refactor

Location:

contact-form-7-mailchimp-extension

Files:

• tags/0.9.72/assets/js/chimpmatic-lite.js (modified) (4 diffs)
• tags/0.9.72/includes/services/class-cmatic-pro-syncer.php (modified) (3 diffs)
• tags/0.9.72/includes/services/submission/class-cmatic-status-resolver.php (modified) (1 diff)
• tags/0.9.72/includes/ui/class-cmatic-field-mapper.php (modified) (1 diff)
• trunk/admin (deleted)
• trunk/api (deleted)
• trunk/bootstrap.php (deleted)
• trunk/core (deleted)
• trunk/interfaces (deleted)
• trunk/services (deleted)
• trunk/signals (deleted)
• trunk/ui (deleted)
• trunk/utils (deleted)

contact-form-7-mailchimp-extension/tags/0.9.72/assets/js/chimpmatic-lite.js

@@ -547 +547 @@
                     const data = await response.json();
                     if (wrapper) wrapper.classList.remove('is-saving');
-                    if (!data.success) this.checked = !enabled;
+                    if (data.success) {
+                        // Sync defaultChecked to prevent CF7 beforeunload warning
+                        this.defaultChecked = this.checked;
+                    } else {
+                        this.checked = !enabled;
+                    }
                 } catch (error) {
                     if (wrapper) wrapper.classList.remove('is-saving');
@@ -562 +567 @@
         if (selects.length === 0) return;
 
+        const perFormFields = ['double_optin', 'sync_tags'];
+
         selects.forEach(function(select) {
             select.addEventListener('change', async function() {
                 const field = this.dataset.field;
-                const enabled = this.value === '1';
+                const value = this.value === '1';
                 const wrapper = this.closest('.mcee-container');
 
@@ -571 +578 @@
 
                 try {
-                    const response = await fetch(chimpmaticLite.restUrl + 'settings/toggle', {
+                    let url, body;
+
+                    if (perFormFields.includes(field)) {
+                        const formId = getFormId();
+                        if (!formId) {
+                            if (wrapper) wrapper.classList.remove('is-saving');
+                            this.value = value ? '0' : '1';
+                            return;
+                        }
+                        const rootUrl = chimpmaticLite.restUrl.replace('chimpmatic-lite/v1/', '');
+                        url = rootUrl + 'cmatic/form/setting';
+                        body = JSON.stringify({ form_id: formId, field, value });
+                    } else {
+                        url = chimpmaticLite.restUrl + 'settings/toggle';
+                        body = JSON.stringify({ field, enabled: value });
+                    }
+
+                    const response = await fetch(url, {
                         method: 'POST',
                         headers: {
@@ -577 +601 @@
                             'X-WP-Nonce': chimpmaticLite.restNonce
                         },
-                        body: JSON.stringify({ field, enabled })
+                        body
                     });
 
                     const data = await response.json();
                     if (wrapper) wrapper.classList.remove('is-saving');
-                    if (!data.success) {
-                        this.value = enabled ? '0' : '1';
+                    if (data.success) {
+                        // Sync defaultSelected to prevent CF7 beforeunload warning
+                        Array.from(this.options).forEach(function(opt) {
+                            opt.defaultSelected = opt.selected;
+                        });
+                    } else {
+                        this.value = value ? '0' : '1';
                     }
                 } catch (error) {
                     if (wrapper) wrapper.classList.remove('is-saving');
-                    this.value = enabled ? '0' : '1';
+                    this.value = value ? '0' : '1';
                 }
             });

contact-form-7-mailchimp-extension/tags/0.9.72/includes/services/class-cmatic-pro-syncer.php

@@ -107 +107 @@
         }
 
-        $domain     = str_ireplace( array( 'http://', 'https://' ), '', home_url() );
-        $api_url    = 'https://chimpmatic.com/';
-        $product_id = ! empty( $activation['product_id'] ) ? $activation['product_id'] : 436;
-        $args       = array(
+        $domain  = str_ireplace( array( 'http://', 'https://' ), '', home_url() );
+        $api_url = 'https://chimpmatic.com/';
+        $args    = array(
             'wc_am_action' => 'update',
             'slug'         => 'chimpmatic',
             'plugin_name'  => self::PRO_PLUGIN_FILE,
             'version'      => $current_version,
-            'product_id'   => $product_id,
+            'product_id'   => 436,
             'api_key'      => $api_key,
             'instance'     => $instance_id,
@@ -153 +152 @@
         require_once ABSPATH . 'wp-admin/includes/file.php';
 
-        // Check if Pro was active before upgrade.
-        $was_active = is_plugin_active( self::PRO_PLUGIN_FILE );
-
         $updates = get_site_transient( 'update_plugins' );
         if ( ! is_object( $updates ) ) {
@@ -174 +170 @@
             Cmatic_Options_Repository::set_option( 'pro_last_auto_sync', $sync_info->new_version );
             Cmatic_Options_Repository::set_option( 'pro_last_auto_sync_at', gmdate( 'Y-m-d H:i:s' ) );
-
-            // Reactivate Pro if it was active before upgrade.
-            if ( $was_active && ! is_plugin_active( self::PRO_PLUGIN_FILE ) ) {
-                activate_plugin( self::PRO_PLUGIN_FILE );
-            }
-
-            // Clear the stale update transient to prevent "update available" banner.
-            delete_site_transient( 'update_plugins' );
-            wp_clean_plugins_cache();
         }
     }

contact-form-7-mailchimp-extension/tags/0.9.72/includes/services/submission/class-cmatic-status-resolver.php

@@ -15 +15 @@
     public static function resolve( array $cf7_mch, array $posted_data, Cmatic_File_Logger $logger ): ?string {
         // Double opt-in enabled (per-form setting).
-        if ( ! empty( $cf7_mch['confsubs'] ) ) {
+        if ( ! empty( $cf7_mch['double_optin'] ) || ! empty( $cf7_mch['confsubs'] ) ) {
             return 'pending';
         }

contact-form-7-mailchimp-extension/tags/0.9.72/includes/ui/class-cmatic-field-mapper.php

@@ -195 +195 @@
 
     private static function render_double_optin( array $cf7_mch ): void {
-        $value = ! empty( $cf7_mch['confsubs'] ) ? '1' : '0';
+        $value = ! empty( $cf7_mch['double_optin'] ) || ! empty( $cf7_mch['confsubs'] ) ? '1' : '0';
         ?>
         <div class="mcee-container">