Changeset 3186733

Timestamp:

11/12/2024 09:12:37 PM (15 months ago)

Author:

reenhanced

Message:

power-form-7 v2.6.0

Location:

power-form-7/trunk

Files:

• api/class-power-form-7-api.php (modified) (8 diffs)
• includes/class-power-form-7.php (modified) (1 diff)
• power-form-7.php (modified) (3 diffs)
• readme.txt (modified) (2 diffs)

power-form-7/trunk/api/class-power-form-7-api.php

@@ -20 +20 @@
  */
 class Power_Form_7_Api {
-    protected $_api_version = 'v1'; 
+    protected $_api_version = 'v1';
 
     /**
      * The array of routes we want to protect with our authorization
-     * 
+     *
      * @since   1.0.0
      * @var     array   $routes The routes that are protected with authorization
@@ -38 +38 @@
             return self::$_instance;
     }
-    
+
     public function get_namespace() {
         return $this->plugin_name . '/' . $this->_api_version;
@@ -68 +68 @@
         $this->plugin_name = $plugin_name;
         $this->version = $version;
-        
+
         $this->routes = array();
 
@@ -78 +78 @@
     /**
      * Used by controllers to register routes
-     * 
+     *
      * @since 1.0.0
      * @param   string    $resource_name  The resource name, used for defining route path
@@ -114 +114 @@
     /**
      * Authentication handler allows users to authenticate to the API using their license key
-     * 
+     *
      * Stock wordpress rest API does not include any authentication methods. We can't rely on auth plugins or wordpress.com for our clients
      * Therefore we need to build out own authentication method.
      * This authentication routes can be the license key for our product.
-     * 
+     *
      * This allows us to:
      * - Allow capabilities required by our plugin
@@ -156 +156 @@
     }
 
+    /**
+     * Modify incoming REST API request data for the Contact Form 7 feedback endpoint.
+     *
+     * This filter intercepts and modifies incoming POST requests to the
+     * `contact-form-7/v1/contact-forms/<id>/feedback` endpoint before the data
+     * reaches the callback function, allowing custom adjustments to be made
+     * to the request parameters.
+     *
+     * The `rest_pre_dispatch` filter is applied in the WordPress core within
+     * the `WP_REST_Server::dispatch()` method, providing an opportunity to
+     * short-circuit or modify a request before it is executed.
+     *
+     * @link https://developer.wordpress.org/reference/hooks/rest_pre_dispatch/
+     *
+     * @param mixed           $result  Response to replace the requested version, can short-circuit request.
+     * @param WP_REST_Server  $server  Server instance handling the request.
+     * @param WP_REST_Request $request The current request object.
+     *
+     * @return mixed Filtered response, or null to proceed to the next stage in processing.
+     */
+    public function request_pre_handler( $result, $server, $request ) {
+        if ( preg_match( '#^/contact-form-7/v1/contact-forms/\d+/feedback$#', $request->get_route() ) &&
+                 'POST' === $request->get_method() ) {
+
+            // Check the license and make sure this request is ours
+            $license_opt = $this->plugin()->get_app_setting('license_key');
+            $auth_header = $_SERVER['HTTP_LICENSE_AUTHORIZATION'];
+
+            if ( $auth_header !== $license_opt || empty( $auth_header ) ) {
+                return $result;
+            }
+
+            $this->plugin()->log_debug( __METHOD__ . '() - Intercepting request to CF7 feedback endpoint' );
+
+            $content_type = $request->get_header( 'Content-Type' );
+            if ( ! str_starts_with( $content_type, 'multipart/form-data' ) ) {
+                // Check if it is application/json. If so, change the content type to multipart/form-data and set the parameters from the json body.
+                if ( str_starts_with( $content_type, 'application/json' ) ) {
+                    $request->set_header( 'Content-Type', 'multipart/form-data' );
+
+                    // Get the JSON body.
+                    $body = $request->get_body();
+                    $data = json_decode( $body, true );
+
+                    // Set the parameters from the JSON body.
+                    if ( is_array( $data ) ) {
+                        foreach ( $data as $key => $value ) {
+                            $request->set_param( $key, $value );
+                            $_POST[ $key ] = $value;
+                        }
+                    }
+                }
+            }
+
+            $unit_tag = $request->get_param( '_wpcf7_unit_tag' );
+            if ( empty( $unit_tag ) ) {
+                // Source: contact-form-7/includes/contact-form.php function generate_unit_tag()
+                $unit_tag = sprintf( 'wpcf7-f%d-o1', $request->get_param( 'id' ) );
+
+                $request->set_param( '_wpcf7_unit_tag', $unit_tag );
+            }
+        }
+
+        return $result;
+
+    }
+
     /*********************** PRIVATE */
 
@@ -180 +247 @@
      */
     private static $_instance = null;
-    
+
     private function require_dependencies() {
     }
-    
+
     private function load_controllers() {
         // Load each controller class here
@@ -219 +286 @@
         return $route_array;
     }
-    
+
 }

power-form-7/trunk/includes/class-power-form-7.php

@@ -299 +299 @@
         $this->loader->add_action( 'rest_api_init', $plugin_api, 'rest_api_init' );
         $this->loader->add_filter( 'determine_current_user', $plugin_api, 'license_auth_handler');
+        $this->loader->add_filter( 'rest_pre_dispatch', $plugin_api, 'request_pre_handler', 10, 3 );
     }
 

power-form-7/trunk/power-form-7.php

@@ -17 +17 @@
  * Plugin URI:        https://www.powerform7.com/
  * Description:       Power Form 7 integrates Contact Form 7 with Microsoft Power Automate.
- * Version:           2.2.7
+ * Version:           2.6.0
  * Requires at least: 5.4
  * Requires PHP:      5.6
@@ -25 +25 @@
  * Domain Path:       /languages
  *
- * Copyright 2020 Reenhanced LLC. All Rights Reserved.
+ * Copyright 2024 Reenhanced LLC. All Rights Reserved.
  */
 
@@ -36 +36 @@
  * Current plugin version.
  */
-define( 'PF7_VERSION', '2.2.7' );
+define( 'PF7_VERSION', '2.6.0' );
 
 //define( 'PF7_SERVICE_HOST', 'http://docker-host:3000/pf7');

power-form-7/trunk/readme.txt

@@ -3 +3 @@
 Tags: cf7, contact form, power automate, integration, contact form 7, flow, reenhanced
 Requires at least: 5.4
-Tested up to: 6.6.0
-Stable tag: 2.2.6
+Tested up to: 6.6.2
+Stable tag: 2.6.0
 Requires PHP: 5.6
 License: GPLv2 or later
@@ -84 +84 @@
 == Changelog ==
 
+= 2.6.0 =
+* Compability with Contact Form 6.0
+* New versioning scheme will attempt to sync with CF7 versioning so you can easily see compatibility. (New features may change this.)
+
 = 2.2.7 =
 * Compatibility with WordPress 6.6.0