From fb9c7c1789b63610b36ae18e8d224ece1682df24 Mon Sep 17 00:00:00 2001 From: Evan Herman Date: Thu, 20 Oct 2016 14:36:17 -0400 Subject: [PATCH 1/2] Update helpers.php Prepend the URL scheme. Check that 'path' is set in the `$url_parts` array before appending it. Sanitize the URL before returning it. --- helpers.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/helpers.php b/helpers.php index cd45ef2..70f4e2f 100644 --- a/helpers.php +++ b/helpers.php @@ -80,13 +80,14 @@ static function trim_url( $url, $path = false ) { /** Remove www. */ $url_parts = parse_url( $url ); - $domain = preg_replace( '/^www\./', '', $url_parts['host'] ) . ( ! empty( $url_parts['port'] ) ? ':' . $url_parts['port'] : '' ); + $domain = $url_parts['scheme'] . '://' . preg_replace( '/^www\./', '', $url_parts['host'] ) . ( ! empty( $url_parts['port'] ) ? ':' . $url_parts['port'] : '' ); /** Add directory path if needed **/ - if ( $path && $url_parts['path'] ) + if ( $path && isset( $url_parts['path'] ) ) $domain .= $url_parts['path']; - return $domain; + return sanitize_url( $domain ); + } /** Returns and unique hash to identify the environment. */ From ae8b52a054991c7505e479475cf9b95c6fc3ee5a Mon Sep 17 00:00:00 2001 From: Evan Herman Date: Thu, 20 Oct 2016 15:08:04 -0400 Subject: [PATCH 2/2] Update helpers.php --- helpers.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helpers.php b/helpers.php index 70f4e2f..f82a064 100644 --- a/helpers.php +++ b/helpers.php @@ -80,13 +80,13 @@ static function trim_url( $url, $path = false ) { /** Remove www. */ $url_parts = parse_url( $url ); - $domain = $url_parts['scheme'] . '://' . preg_replace( '/^www\./', '', $url_parts['host'] ) . ( ! empty( $url_parts['port'] ) ? ':' . $url_parts['port'] : '' ); + $domain = preg_replace( '/^www\./', '', $url_parts['host'] ) . ( ! empty( $url_parts['port'] ) ? ':' . $url_parts['port'] : '' ); /** Add directory path if needed **/ if ( $path && isset( $url_parts['path'] ) ) $domain .= $url_parts['path']; - return sanitize_url( $domain ); + return sanitize_url( $url_parts['scheme'] . '://' . $domain ); }