Changeset 3078519

Timestamp:

04/29/2024 08:52:41 AM (22 months ago)

Author:

pinpointe

Message:

Fix error when making ajax calls

Location:

pinpointe-form-integration/trunk

Files:

• includes/pinpointe-form.inc.php (modified) (1 diff)
• includes/pinpointe-plugin-structure.inc.php (modified) (1 diff)
• includes/pinpointe-prepare-form.inc.php (modified) (2 diffs)
• includes/pinpointe-service.class.php (modified) (2 diffs)
• includes/pinpointe-widget.class.php (modified) (1 diff)
• pinpointe-signup-form.php (modified) (3 diffs)
• readme.txt (modified) (2 diffs)

pinpointe-form-integration/trunk/includes/pinpointe-form.inc.php

@@ -29 +29 @@
     }
 }
-
-?>

pinpointe-form-integration/trunk/includes/pinpointe-plugin-structure.inc.php

@@ -608 +608 @@
     }
 }
-
-?>

pinpointe-form-integration/trunk/includes/pinpointe-prepare-form.inc.php

@@ -250 +250 @@
         // Title
         if ($is_popup) {
-            $html .= '<header>' . $title . '</header><i id="pinpointe_popup_close" class="icon-append fa-times" style="padding:10px 10px 0 0;cursor:pointer;"></i>';
+            $html .= '<header>' . $title . '</header><i id="pinpointe_popup_close" class="icon-append fa-regular fa-circle-xmark" style="padding:10px 10px 0 0;cursor:pointer;"></i>';
         }
         else if (!empty($title)) {
@@ -551 +551 @@
     }
 }
-
-?>

pinpointe-form-integration/trunk/includes/pinpointe-service.class.php

@@ -127 +127 @@
             
             $response = wp_remote_post($this->apiUrl, $args);
-            
+
+            $responseBody = wp_remote_retrieve_body($response);
+
             if (is_wp_error($response) || wp_remote_retrieve_response_code($response) !== 200) {
+             
+                if (is_array($response)) {
+
+                    $error_data = !$is_json ? json_encode($responseBody) : $responseBody;
+
+                    $error_message = reset(json_decode($error_data, true)['errormessage']);
+                } else {
+                    $error_message = $response->get_error_message();
+                }
+
                 throw new \Exception(
-                    sprintf('API call of type %s failed: %s', $type , $response->get_error_message())
+                    sprintf('API call of type %s failed: %s', $type , $error_message)
                 );
             }
-            
-            $responseBody = wp_remote_retrieve_body($response);
 
             $response = $is_json ? json_decode($responseBody) : simplexml_load_string($responseBody);
 
-            if ($response->status == 'SUCCESS') {
+            if ($response->status === 'SUCCESS') {
                 if (isset($data['id']) && $data['id'] == '-999') {
                     return true;
                 }
                 return $this->xmlToArray($response->data);
-            } 
-            else {
-                throw new \Exception(sprintf('There was a problem: %s', $responseBody));
-            }
+            }
+
+            throw new \Exception(sprintf('There was a problem: %s', $responseBody));
         }
 
@@ -342 +351 @@
          */
         public function lists_subscribe($id, $email, $merge_vars = array(), $email_type = 'html',
-                                        $add_to_autoresponders = false, $update_existing = false, $tag_ids, $send_confirmation = false, $custom_data = []) {
+                                        $add_to_autoresponders = false, $update_existing = false, $tag_ids = [], $send_confirmation = false, $custom_data = []) {
             if(!is_string($email)) {
                 $email = $email['email'];

pinpointe-form-integration/trunk/includes/pinpointe-widget.class.php

@@ -154 +154 @@
     }
 }
-
-?>

pinpointe-form-integration/trunk/pinpointe-signup-form.php

@@ -4 +4 @@
  * Plugin URI: https://help.pinpointe.com/support/solutions/articles/5000664320-wordpress-plugin-download
  * Description: Add Pinpointe forms to your WordPress site
- * Version: 1.6
+ * Version: 1.7
  * Author: Pinpointe
  * Author URI: http://www.pinpointe.com/
@@ -3131 +3131 @@
                     return $results;
                 }
-                else {
-                    return true;
-                }
+
+                return true;
             }
             catch (Exception $e) {
@@ -4693 +4692 @@
 
 $GLOBALS['PinpointeSignupForm'] = PinpointeSignupForm::get_instance();
-
-?>

pinpointe-form-integration/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 3.5
 Tested up to: 6.4.2
-Stable tag: 1.6
+Stable tag: 1.7
 Requires PHP: 5.4
 License: GPLv3 or later
@@ -60 +60 @@
 
 == Changelog ==
+1.7
+* Replace deprecated Jquery chosen plugin with Tom Select.
+* Update Font Awesome 4 to Font Awesome 6
+* Fixed undefined method get_error_message() on array when making a request using wp_remote_post
+* Fixed popup modal not showing on frontend pages.
+* Upgrade dependencies to their latest versions.
+* Add nonce to all ajax handlers.
+* Ensure a mailing list is selected on both admin and frontend
+
 1.6
 * Added ability to display multiple mailing lists on the subscription form