Changeset 3294168

Timestamp:

05/15/2025 01:08:05 PM (8 months ago)

Author:

plugcrux

Message:

Release 1.0.4 - Fixed missing fields issue and updated Elementor form listing method.

Location:

integrate-with-mailchimp/trunk

Files:

• integrate-with-mailchimp.php (modified) (1 diff)
• readme.txt (modified) (2 diffs)
• src/forms/form-fields.php (modified) (1 diff)
• src/forms/form-group-ids.php (modified) (1 diff)
• src/forms/form-name.php (modified) (1 diff)
• src/forms/submit-action.php (modified) (1 diff)
• src/product/mailchimp-crm.php (modified) (1 diff)

integrate-with-mailchimp/trunk/integrate-with-mailchimp.php

@@ -5 +5 @@
  * Plugin URI: https://integrazo.com/products/integrate-with-mailchimp
  * Description: Automatically send contact form submissions from popular WordPress forms to Mailchimp and grow your business.
- * Version: 1.0.3
+ * Version: 1.0.4
  * Author: Integrazo
  * Author URI: https://integrazo.com/

integrate-with-mailchimp/trunk/readme.txt

@@ -5 +5 @@
 Tested up to: 6.8
 Requires PHP: 7.4
-Stable tag: 1.0.3
+Stable tag: 1.0.4
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -430 +430 @@
 == Changelog ==
 
+= 1.0.4 =  
+**Fixed:** Issue where some Mailchimp fields were not displaying properly.
+**Fixed:** Elementor form listing method updated for better compatibility.
+
 = 1.0.3 =  
 **Added:** Improved validation and sanitization  

integrate-with-mailchimp/trunk/src/forms/form-fields.php

@@ -315 +315 @@
         public function getElementorFormFields($form_id)
         {
-            global $wpdb;
-
-            $form_fields = [];
-
-            // Query to fetch Elementor form data and associated page titles
-            $query = "
-               SELECT m.post_id, m.meta_value, p.post_title
-               FROM {$wpdb->postmeta} m
-               INNER JOIN {$wpdb->posts} p ON m.post_id = p.ID
-               WHERE m.meta_key = '_elementor_data' AND p.post_status = 'publish'
-               LIMIT 30
-           ";
-            // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared,WordPress.DB.DirectDatabaseQuery.DirectQuery,WordPress.DB.DirectDatabaseQuery.NoCaching
-            $results = $wpdb->get_results($query, ARRAY_A);
-
-            foreach ($results as $result) {
-                // Decode the JSON stored in meta_value
-                $form_elements = json_decode($result['meta_value'], true);
-
-                if (is_array($form_elements)) {
-                    foreach ($form_elements as $elements) {
-                        if (is_array($elements)) {
-                            foreach ($elements as $elementtemp) {
-                                if (is_array($elementtemp) || is_object($elementtemp)) {
-                                    foreach ($elementtemp as $element) {
-
-                                        // Check if $element is an array and has the 'id' key
-                                        if (is_array($element) && isset($element['id'])) {
-                                            // Check if 'settings' exists and has a 'form_name' key
-                                            if ($form_id === $element['id']) {
-                                                if (!empty($element['settings']['form_fields']) && is_array($element['settings']['form_fields'])) {
-                                                    foreach ($element['settings']['form_fields'] as $field) {
-
-
-                                                        if (isset($field['field_label'])) {
-                                                            // Ensure the necessary keys exist in the field array
-                                                            $key = $field['custom_id']; // Use default empty string if not set
-                                                            $label = $field['field_label']; // Use default empty string if not set
-                                                            $type = $field['field_type'] ?? 'text'; // Default to 'text' if field_type is not set
-
-                                                            $form_fields[] = [
-                                                                'key' => $key,       // Field slug
-                                                                'label' => $label,   // Field label
-                                                                'type' => $type,     // Field type
-                                                                'source' => 'form'   // Source type
-                                                            ];
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
+            $form_fields = [];
+
+            // ✅ Check if Elementor Pro class exists
+            if (! class_exists('\ElementorPro\Modules\Forms\Submissions\Database\Repositories\Form_Snapshot_Repository')) {
+                return $form_fields;
+            }
+
+            try {
+                $formsnaps = \ElementorPro\Modules\Forms\Submissions\Database\Repositories\Form_Snapshot_Repository::instance()->all();
+
+                foreach ($formsnaps as $form) {
+                    if ($form->id === $form_id) {
+                        // ✅ Found matching form ID → now get fields
+                        if (!empty($form->fields) && is_array($form->fields)) {
+                            foreach ($form->fields as $field) {
+                                $form_fields[] = [
+                                    'key'    => $field['id'] ?? '',
+                                    'label'  => $field['label'] ?? '',
+                                    'type'   => $field['type'] ?? 'text',
+                                    'source' => 'form'
+                                ];
                             }
                         }
-                    }
-                }
-            }
-
-            return $form_fields;
+                        break; // ✅ Form found → no need to check others
+                    }
+                }
+                return $form_fields;
+            } catch (Throwable $e) {
+                return $form_fields;
+            }
         }
         /**

integrate-with-mailchimp/trunk/src/forms/form-group-ids.php

@@ -272 +272 @@
         public function getElementorForms()
         {
-            global $wpdb;
-
             $form_list = [];
-            try {
-                // Query to fetch Elementor form data and associated page titles
-                $query = "
-SELECT m.post_id, m.meta_value, p.post_title
-FROM {$wpdb->postmeta} m
-INNER JOIN {$wpdb->posts} p ON m.post_id = p.ID
-WHERE m.meta_key = '_elementor_data' AND p.post_status = 'publish'
-LIMIT 30
-";
-                // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared,WordPress.DB.DirectDatabaseQuery.DirectQuery,WordPress.DB.DirectDatabaseQuery.NoCaching
-                $results = $wpdb->get_results($query, ARRAY_A);
-
-                foreach ($results as $result) {
-                    // Decode the JSON stored in meta_value
-                    $form_elements = json_decode($result['meta_value'], true);
-
-                    if (is_array($form_elements)) {
-                        foreach ($form_elements as $elements) {
-                            if (is_array($elements)) {
-                                foreach ($elements as $elementtemp) {
-
-                                    if (is_array($elementtemp) || is_object($elementtemp)) {
-                                        foreach ($elementtemp as $element) {
-
-                                            // Check if $element is an array and has the 'id' key
-                                            if (is_array($element) && isset($element['id'])) {
-                                                // Check if 'settings' exists and has a 'form_name' key
-
-                                                // Proceed only if 'settings' is valid and contains 'form_name'
-                                                if (isset($element['settings']) && is_array($element['settings']) && isset($element['settings']['form_name'])) {
-                                                    $form_name = $element['settings']['form_name'];
-
-                                                    // Append to the form list
-                                                    $form_list[] = [
-                                                        'id'   => $element['id'],
-                                                        'name' => $form_name . " - " . $result['post_title'],
-                                                    ];
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
+
+            if (! class_exists('\ElementorPro\Modules\Forms\Submissions\Database\Repositories\Form_Snapshot_Repository')) {
+                return $form_list; // Return empty if class not found
+            }
+
+            try {
+                $formsnaps = \ElementorPro\Modules\Forms\Submissions\Database\Repositories\Form_Snapshot_Repository::instance()->all();
+
+                foreach ($formsnaps as $form) {
+                    $page_title = get_the_title($form->post_id);
+
+                    $form_list[] = [
+                        'id'   => $form->id,
+                        'name' => $form->name . ' - ' . $page_title,
+                    ];
                 }
 

integrate-with-mailchimp/trunk/src/forms/form-name.php

@@ -117 +117 @@
         public function getElementorFormName($form_id)
         {
-            global $wpdb;
+            // Return empty string by default
+            $form_name = '';
 
-            // Query to fetch Elementor form data and associated page titles
-            $query = "
-       SELECT m.post_id, m.meta_value, p.post_title
-       FROM {$wpdb->postmeta} m
-       INNER JOIN {$wpdb->posts} p ON m.post_id = p.ID
-       WHERE m.meta_key = '_elementor_data' AND p.post_status = 'publish'
-   ";
-            // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared,WordPress.DB.DirectDatabaseQuery.DirectQuery,WordPress.DB.DirectDatabaseQuery.NoCaching
-            $results = $wpdb->get_results($query, ARRAY_A);
+            // ✅ Check if Elementor Pro class exists
+            if (! class_exists('\ElementorPro\Modules\Forms\Submissions\Database\Repositories\Form_Snapshot_Repository')) {
+                return $form_name;
+            }
 
-            if ($results) {
-                foreach ($results as $result) {
-                    $form_elements = json_decode($result['meta_value'], true); // Decode JSON
+            try {
+                $formsnaps = \ElementorPro\Modules\Forms\Submissions\Database\Repositories\Form_Snapshot_Repository::instance()->all();
 
-                    if (is_array($form_elements)) {
-                        foreach ($form_elements as $element_group) {
-                            if (is_array($element_group)) {
-                                foreach ($element_group['elements'] ?? [] as $element) {
-                                    if (is_array($element) && isset($element['id'], $element['settings']['form_name'])) {
-                                        // Match the form ID
-                                        if ($element['id'] === $form_id) {
-                                            return $element['settings']['form_name'] . " - " . $result['post_title'];
-                                        }
-                                    }
-                                }
-                            }
-                        }
+                foreach ($formsnaps as $form) {
+                    if ($form->id === $form_id) {
+                        $page_title = get_the_title($form->post_id);
+                        $form_name = $form->name . ' - ' . $page_title;
+                        break; // Found → exit loop
                     }
                 }
+
+                return $form_name;
+            } catch (Throwable $e) {
+                return $form_name; // return empty string if error
             }
-
-            return __('Unknown Form', 'integrate-with-mailchimp');
         }
-
-
-
 
         /**

integrate-with-mailchimp/trunk/src/forms/submit-action.php

@@ -365 +365 @@
             try {
                 // Retrieve form ID and group ID
-                $form_settings = $record->get('form_settings'); // Get form settings
-                $form_id = $form_settings['id'] ?? 'unknown_form_id'; // Retrieve the correct form ID
+                $form_details = $handler->get_current_form();
+                $form_id = $form_details['id'];
                 $form_group_id = 7; // Set form group ID for Elementor Forms
                 $session = iafwmc_is_valid_key();

integrate-with-mailchimp/trunk/src/product/mailchimp-crm.php

@@ -107 +107 @@
 
             // Mailchimp API URL to fetch fields of a specific list
-            $url = "https://{$dc}.api.mailchimp.com/3.0/lists/{$list_id}/merge-fields";
+            $url = "https://{$dc}.api.mailchimp.com/3.0/lists/{$list_id}/merge-fields?count=100";
 
             // API request headers