Fix support for forwarded URLs

- Remove support for ForwardHQ
- Fix support for ngrok.io

Author: justinstern

README.md

@@ -5,7 +5,7 @@ This is a simple and opinionated plugin for helping develop/debug WooCommerce &
 
 ### Use Forwarded URLs
 
-Once activated, this plugin will make WordPress use `HTTP_X_FORWARDED_HOST` or `HTTP_X_ORIGINAL_HOST` for all your links instead of your site URL. No configuration needed.
+Once activated, this plugin will make WordPress use `HTTP_X_FORWARDED_FOR` for all your links instead of your site URL. No configuration needed.
 
 We like to use [NGrok](http://ngrok.com/) for this.
 
@@ -44,8 +44,10 @@ Download and install just like any other WordPress plugin. If you want to be rea
 
 ## Changelog
 
-### 1.0.1 - 2020.nn.nn 
- * Tweak - Add a field at checkout when selecting the bogus payment gateway to specify the desired payment result 
+### 1.0.1 - 2021.nn.nn
+ * Tweak - Add a field at checkout when selecting the bogus payment gateway to specify the desired payment result
+  * Fix - Fix support for ngrok.io
+  * Misc - Remove support for ForwardHQ
 
 ### 1.0.0 - 2018-11-06
  * Refactor - Use namespaces and rename classes
@@ -63,7 +65,7 @@ Download and install just like any other WordPress plugin. If you want to be rea
 ### 0.7.0 - 2017.04.12
  * Feature - Use the Bogus gateway for Subscriptions automatic renewals
  * Fix - Subscriptions integration throwing a warning in WooCommerce 3.0+
- 
+
 ### 0.6.0 - 2017.02.18
  * Feature - Adds a bogus gateway that calls `$order->payment_complete()` when used
 

includes/Forwarded_URLs.php

@@ -51,7 +51,9 @@ public function __construct() {
 		}
 
 		// save for URL replacement
-		$this->non_forwarded_host = parse_url( get_option( 'siteurl' ), PHP_URL_HOST );
+		$host = parse_url( get_option( 'siteurl' ), PHP_URL_HOST );
+		$port = parse_url( get_option( 'siteurl' ), PHP_URL_PORT );
+		$this->non_forwarded_host = $host . ($port ? ':' . $port : null);
 
 		// from https://github.com/50east/wp-forwarded-host-urls/
 		$filters = array(
@@ -122,7 +124,7 @@ public function __construct() {
 	 */
 	private function has_forwarded_host() {
 
-		return array_key_exists( 'HTTP_X_FORWARDED_HOST', $_SERVER ) || array_key_exists( 'HTTP_X_ORIGINAL_HOST', $_SERVER );
+		return array_key_exists( 'HTTP_X_FORWARDED_FOR', $_SERVER );
 	}
 
 
@@ -134,13 +136,7 @@ private function has_forwarded_host() {
 	 */
 	public function get_forwarded_host() {
 
-		// are we using Forward HQ?
-		$host = isset( $_SERVER['HTTP_X_FORWARDED_HOST'] ) ? $_SERVER['HTTP_X_FORWARDED_HOST'] : $_SERVER['HTTP_HOST'];
-
-		// if not, check if we're using ngrok
-		$host = isset( $_SERVER['HTTP_X_ORIGINAL_HOST'] ) ? $_SERVER['HTTP_X_ORIGINAL_HOST'] : $host;
-
-		return $host;
+		return $_SERVER['HTTP_HOST'];
 	}