Changeset 3656274

Timestamp:

08/20/2026 08:48:38 AM (2 months ago)

Author:

gaconnector

Message:

Update to version 0.9.1 from GitHub

Location:

ga-connector-crm-ga-integration

Files:

• tags/0.9.1 (copied) (copied from ga-connector-crm-ga-integration/trunk )
• tags/0.9.1/ga-connector-crm-ga-integration.php (modified) (2 diffs)
• tags/0.9.1/readme.txt (modified) (1 diff)
• tags/0.9.1/src/Rest/PageviewController.php (modified) (2 diffs)
• tags/0.9.1/src/Support/ClientIp.php (added)
• trunk/ga-connector-crm-ga-integration.php (modified) (2 diffs)
• trunk/readme.txt (modified) (1 diff)
• trunk/src/Rest/PageviewController.php (modified) (2 diffs)
• trunk/src/Support/ClientIp.php (added)

ga-connector-crm-ga-integration/tags/0.9.1/ga-connector-crm-ga-integration.php

@@ -3 +3 @@
  * Plugin Name:       GA Connector – CRM & GA integration
  * Description:       Connect your CRM with Google Analytics and find out where your sales are really coming from.
- * Version:           0.9.0
+ * Version:           0.9.1
  * Requires at least: 5.7
  * Requires PHP:      7.4
@@ -24 +24 @@
 }
 
-define( 'GA_CONNECTOR_VERSION', '0.9.0' );
+define( 'GA_CONNECTOR_VERSION', '0.9.1' );
 define( 'GA_CONNECTOR_PLUGIN_FILE', __FILE__ );
 define( 'GA_CONNECTOR_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );

ga-connector-crm-ga-integration/tags/0.9.1/readme.txt

@@ -5 +5 @@
 Tested up to: 7.0
 Requires PHP: 7.4
-Stable tag: 0.9.0
+Stable tag: 0.9.1
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html

ga-connector-crm-ga-integration/tags/0.9.1/src/Rest/PageviewController.php

@@ -12 +12 @@
 
 use GA_Connector\Api\TrackingApiClient;
+use GA_Connector\Support\ClientIp;
 use GA_Connector\Support\Options;
 use WP_REST_Request;
@@ -83 +84 @@
 
         /**
-         * Pulls the visitor's IP from request headers, preferring a single
-         * well-formed address from common reverse-proxy headers, falling back
-         * to REMOTE_ADDR, and using `-` as the last resort sentinel.
+         * Pulls the visitor's IP using the same algorithm as the PHP library's
+         * Request::clientIp() (CDN headers in priority order, then public
+         * REMOTE_ADDR, else the shared default IP).
          */
         public static function resolve_client_ip(): string {
-                $candidates = array();
-
-                if ( ! empty( $_SERVER['HTTP_X_FORWARDED_FOR'] ) ) {
-                        $forwarded    = (string) wp_unslash( $_SERVER['HTTP_X_FORWARDED_FOR'] ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
-                        $parts        = explode( ',', $forwarded );
-                        $candidates[] = trim( (string) reset( $parts ) );
-                }
-                if ( ! empty( $_SERVER['HTTP_X_REAL_IP'] ) ) {
-                        $candidates[] = trim( (string) wp_unslash( $_SERVER['HTTP_X_REAL_IP'] ) ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
-                }
-                if ( ! empty( $_SERVER['HTTP_CF_CONNECTING_IP'] ) ) {
-                        $candidates[] = trim( (string) wp_unslash( $_SERVER['HTTP_CF_CONNECTING_IP'] ) ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
-                }
-                if ( ! empty( $_SERVER['REMOTE_ADDR'] ) ) {
-                        $candidates[] = trim( (string) wp_unslash( $_SERVER['REMOTE_ADDR'] ) ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
-                }
-
-                foreach ( $candidates as $candidate ) {
-                        if ( '' === $candidate ) {
-                                continue;
-                        }
-                        if ( false !== filter_var( $candidate, FILTER_VALIDATE_IP ) ) {
-                                return $candidate;
-                        }
-                }
-
-                return '-';
+                return ClientIp::resolve();
         }
 }

ga-connector-crm-ga-integration/trunk/ga-connector-crm-ga-integration.php

@@ -3 +3 @@
  * Plugin Name:       GA Connector – CRM & GA integration
  * Description:       Connect your CRM with Google Analytics and find out where your sales are really coming from.
- * Version:           0.9.0
+ * Version:           0.9.1
  * Requires at least: 5.7
  * Requires PHP:      7.4
@@ -24 +24 @@
 }
 
-define( 'GA_CONNECTOR_VERSION', '0.9.0' );
+define( 'GA_CONNECTOR_VERSION', '0.9.1' );
 define( 'GA_CONNECTOR_PLUGIN_FILE', __FILE__ );
 define( 'GA_CONNECTOR_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );

ga-connector-crm-ga-integration/trunk/readme.txt

@@ -5 +5 @@
 Tested up to: 7.0
 Requires PHP: 7.4
-Stable tag: 0.9.0
+Stable tag: 0.9.1
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html

ga-connector-crm-ga-integration/trunk/src/Rest/PageviewController.php

@@ -12 +12 @@
 
 use GA_Connector\Api\TrackingApiClient;
+use GA_Connector\Support\ClientIp;
 use GA_Connector\Support\Options;
 use WP_REST_Request;
@@ -83 +84 @@
 
         /**
-         * Pulls the visitor's IP from request headers, preferring a single
-         * well-formed address from common reverse-proxy headers, falling back
-         * to REMOTE_ADDR, and using `-` as the last resort sentinel.
+         * Pulls the visitor's IP using the same algorithm as the PHP library's
+         * Request::clientIp() (CDN headers in priority order, then public
+         * REMOTE_ADDR, else the shared default IP).
          */
         public static function resolve_client_ip(): string {
-                $candidates = array();
-
-                if ( ! empty( $_SERVER['HTTP_X_FORWARDED_FOR'] ) ) {
-                        $forwarded    = (string) wp_unslash( $_SERVER['HTTP_X_FORWARDED_FOR'] ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
-                        $parts        = explode( ',', $forwarded );
-                        $candidates[] = trim( (string) reset( $parts ) );
-                }
-                if ( ! empty( $_SERVER['HTTP_X_REAL_IP'] ) ) {
-                        $candidates[] = trim( (string) wp_unslash( $_SERVER['HTTP_X_REAL_IP'] ) ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
-                }
-                if ( ! empty( $_SERVER['HTTP_CF_CONNECTING_IP'] ) ) {
-                        $candidates[] = trim( (string) wp_unslash( $_SERVER['HTTP_CF_CONNECTING_IP'] ) ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
-                }
-                if ( ! empty( $_SERVER['REMOTE_ADDR'] ) ) {
-                        $candidates[] = trim( (string) wp_unslash( $_SERVER['REMOTE_ADDR'] ) ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
-                }
-
-                foreach ( $candidates as $candidate ) {
-                        if ( '' === $candidate ) {
-                                continue;
-                        }
-                        if ( false !== filter_var( $candidate, FILTER_VALIDATE_IP ) ) {
-                                return $candidate;
-                        }
-                }
-
-                return '-';
+                return ClientIp::resolve();
         }
 }