Changeset 2750662

Timestamp:

07/01/2022 08:33:18 AM (3 years ago)

Author:

anthonyeden

Message:

Version 2.3.0

Location:

profiler-donations-gravityforms/trunk

Files:

• class-profilercommon.php (modified) (6 diffs)
• class-profilerdonate-gfaddon.php (modified) (2 diffs)
• class-profilerevents-gfaddon.php (modified) (1 diff)
• class-profilerinteraction-gfaddon.php (modified) (1 diff)
• class-profilerlists-gfaddon.php (modified) (1 diff)
• class-profilerlistsbasic-gfaddon.php (modified) (1 diff)
• class-profilermembership-gfaddon.php (modified) (1 diff)
• class-profilerpostdonate-gfaddon.php (modified) (2 diffs)
• class-profilerupdate-gfaddon.php (modified) (1 diff)
• index.php (modified) (3 diffs)
• readme.txt (modified) (2 diffs)
• sync_users.php (modified) (1 diff)

profiler-donations-gravityforms/trunk/class-profilercommon.php

@@ -6 +6 @@
     protected $_url = "";
     protected $_title = "Profiler / Gravity Forms - Integration Feed";
-
-    protected $_capabilities_form_settings = 'gravityforms_edit_settings';
 
     protected $apifield_apikey = "apikey";
@@ -25 +23 @@
         add_action('gform_stripe_customer_after_create',    array($this, 'stripe_customer_id_save'), 10, 4);
         add_filter('gform_stripe_charge_pre_create',        array($this, 'stripe_payment_intent'), 10, 5);
+        add_filter('gform_stripe_charge_description',       array($this, 'stripe_payment_description'), 10, 5);
     }
 
@@ -356 +355 @@
         if(method_exists($this, 'process_feed_custom')) {
             $postData = $this->process_feed_custom($feed, $entry, $form, $postData, $fromValidatorProcessPFGateway);
+
+            if($postData === false) {
+                return false;
+            }
+
         }
 
@@ -827 +831 @@
     protected function creditcard_mask($number) {
         // Returns a credit card with all but the first six and last four numbers masked
+
+        if(strlen($number) < 11) {
+            // Prevents a fatal error on str_repeat in PHP8
+            return '';
+        }
+
         return implode("-", str_split(substr($number, 0, 6) . str_repeat("X", strlen($number) - 10) . substr($number, -4), 4));
     }
@@ -925 +935 @@
         // Create a new customer
         $customer_meta = array();
-        $customer_meta['description'] = $email_address . ' ' . $name;
+        $customer_meta['description'] = $email . ' ' . $name;
         $customer_meta['name'] = $name;
-        $customer_meta['email'] = $email_address;
+        $customer_meta['email'] = $email;
 
         $customer = gf_stripe()->create_customer($customer_meta, $feed, $entry, $form);
@@ -943 +953 @@
         return $charge_meta;
     }
+
+    public function stripe_payment_description($description, $strings, $entry, $submission_data, $feed) {
+
+        if(!class_exists('GFAPI') || !isset($entry['form_id'])) {
+            return $description;
+        }
+
+        $description = 'Form #' . $entry['form_id'] . ', Entry #' . $entry['id'];
+
+        // Find Name field
+        $form = GFAPI::get_form($entry['form_id']);
+        foreach($form['fields'] as $fieldKey => $field) {
+            if($field->type == "name") {
+                $description .= ' - ' . $entry[$field->id . '.3'] . ' ' . $entry[$field->id . '.6'];
+            }
+        }
+
+        return $description;
+
+    }
 }
 

profiler-donations-gravityforms/trunk/class-profilerdonate-gfaddon.php

@@ -25 +25 @@
 
         self::$_instance->form = self::$_instance->get_current_form();
-        self::$_instance->formid = self::$_instance->form["id"];
+        if(is_array(self::$_instance->form)) {
+            self::$_instance->formid = self::$_instance->form["id"];
+        }
 
         return self::$_instance;
@@ -579 +581 @@
         }
 
+        if($useAsGateway == false && isset($entry['payment_status']) && $entry['payment_status'] == "Failed") {
+            GFCommon::log_error("GFProfilerDonate: Skipped sending to Profiler due to Failed payment_status");
+            return false;
+        }
+
         if($useAsGateway == true) {
             // Profiler processes this payment

profiler-donations-gravityforms/trunk/class-profilerevents-gfaddon.php

@@ -20 +20 @@
         
         self::$_instance->form = self::$_instance->get_current_form();
-        self::$_instance->formid = self::$_instance->form["id"];
+        if(is_array(self::$_instance->form)) {
+            self::$_instance->formid = self::$_instance->form["id"];
+        }
         
         return self::$_instance;

profiler-donations-gravityforms/trunk/class-profilerinteraction-gfaddon.php

@@ -25 +25 @@
 
         self::$_instance->form = self::$_instance->get_current_form();
-        self::$_instance->formid = self::$_instance->form["id"];
+        if(is_array(self::$_instance->form)) {
+            self::$_instance->formid = self::$_instance->form["id"];
+        }
 
         return self::$_instance;

profiler-donations-gravityforms/trunk/class-profilerlists-gfaddon.php

@@ -21 +21 @@
 
         self::$_instance->form = self::$_instance->get_current_form();
-        self::$_instance->formid = self::$_instance->form["id"];
+        if(is_array(self::$_instance->form)) {
+            self::$_instance->formid = self::$_instance->form["id"];
+        }
 
         return self::$_instance;

profiler-donations-gravityforms/trunk/class-profilerlistsbasic-gfaddon.php

@@ -20 +20 @@
 
         self::$_instance->form = self::$_instance->get_current_form();
-        self::$_instance->formid = self::$_instance->form["id"];
+        if(is_array(self::$_instance->form)) {
+            self::$_instance->formid = self::$_instance->form["id"];
+        }
 
         return self::$_instance;

profiler-donations-gravityforms/trunk/class-profilermembership-gfaddon.php

@@ -23 +23 @@
 
         self::$_instance->form = self::$_instance->get_current_form();
-        self::$_instance->formid = self::$_instance->form["id"];
+        if(is_array(self::$_instance->form)) {
+            self::$_instance->formid = self::$_instance->form["id"];
+        }
 
         return self::$_instance;

profiler-donations-gravityforms/trunk/class-profilerpostdonate-gfaddon.php

@@ -25 +25 @@
 
         self::$_instance->form = self::$_instance->get_current_form();
-        self::$_instance->formid = self::$_instance->form["id"];
+        if(is_array(self::$_instance->form)) {
+            self::$_instance->formid = self::$_instance->form["id"];
+        }
 
         return self::$_instance;
@@ -127 +129 @@
         $token = $this->get_field_value($form, $entry, $feed['meta']['profilerdonation_token']);
 
-        $token_required = md5(password_hash($pfIntegrationId . "/" . $gfEntryId, PASSWORD_DEFAULT, array('salt' => NONCE_SALT)));
+        $token_required = md5(crypt($pfIntegrationId . "/" . $gfEntryId, '$6$rounds=5000$' . md5(NONCE_SALT) . '$'));
 
         if($token !== $token_required) {

profiler-donations-gravityforms/trunk/class-profilerupdate-gfaddon.php

@@ -24 +24 @@
 
         self::$_instance->form = self::$_instance->get_current_form();
-        self::$_instance->formid = self::$_instance->form["id"];
+        if(is_array(self::$_instance->form)) {
+            self::$_instance->formid = self::$_instance->form["id"];
+        }
 
         return self::$_instance;

profiler-donations-gravityforms/trunk/index.php

@@ -4 +4 @@
 Plugin URI: https://mediarealm.com.au/
 Description: Integrates Gravity Forms with Profiler, enabling donation data and more to be sent directly to Profiler.
-Version: 2.2.0
+Version: 2.3.0
 
 Author: Media Realm
@@ -11 +11 @@
 License: GPL2
 
-'Profiler Donation Gravity Forms' is free software: you can redistribute it and/or modify
+'Profiler Donations - Gravity Forms Add-On' is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 2 of the License, or
 any later version.
  
-'Profiler Donation Gravity Forms' is distributed in the hope that it will be useful,
+'Profiler Donations - Gravity Forms Add-On' is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -22 +22 @@
  
 You should have received a copy of the GNU General Public License
-along with 'Profiler Donation Gravity Forms'. If not, see https://www.gnu.org/licenses/gpl-2.0.html.
+along with 'Profiler Donations - Gravity Forms Add-On'. If not, see https://www.gnu.org/licenses/gpl-2.0.html.
 
 */

profiler-donations-gravityforms/trunk/readme.txt

@@ -3 +3 @@
 Tags: gravity-forms, fundraising, crm, donation, profiler
 Requires at least: 5.0
-Tested up to: 5.9.2
+Tested up to: 6.0.0
 Stable tag: trunk
 Requires PHP: 7.4.0
@@ -22 +22 @@
 
 == Changelog ==
+
+= 2.3.0 =
+
+* BREAKING CHANGE: If you use the post-donate feed, you must update your token generation code to use crypt() instead of password_hash()
+* PHP 8 Compatibility
+* No longer sends data to Profiler if GF's Payment_Status field is 'Failed'
+* Catch empty data returned from process_feed_custom
+* Adjust permissions needed to edit feed
+* Stripe: Fix customer meta fields, and add charge description override
 
 = 2.2.0 =

profiler-donations-gravityforms/trunk/sync_users.php

@@ -167 +167 @@
         $api_data = $this->api_list_subscriptions();
 
+        if(!is_array($api_data)) {
+            return;
+        }
+
         if($api_data['httpstatus'] != 200) {
             $this->log("HTTP Status from Profiler API: " . $api_data['httpstatus']);