Refactoring some of the media urls with @whoami-pwd

Author: colinmurphy

plugins/faustwp/includes/replacement/callbacks.php

@@ -49,12 +49,10 @@ function content_replacement( string $content ): string {
 		return $content;
 	}
 
-	$wp_media_urls       = faustwp_get_wp_media_urls( $wp_site_urls );
-	$relative_upload_url = faustwp_get_relative_upload_url( $wp_site_urls );
-	$frontend_uri        = (string) faustwp_get_setting( 'frontend_uri' );
-	if ( ! $frontend_uri ) {
-		$frontend_uri = '/';
-	}
+	$upload_url          = wp_upload_dir()['baseurl'];
+	$wp_media_urls       = faustwp_get_wp_media_urls( $wp_site_urls, $upload_url );
+	$relative_upload_url = faustwp_get_relative_upload_url( $wp_site_urls, $upload_url );
+	$frontend_uri        = (string) faustwp_get_setting( 'frontend_uri' ) ?? '/';
 
 	if ( $replace_content_urls && $replace_media_urls ) {
 		return str_replace( $wp_site_urls, $frontend_uri, $content );
@@ -100,7 +98,7 @@ function image_source_replacement( $content ) {
  *
  * @link https://developer.wordpress.org/reference/functions/wp_calculate_image_srcset/
  *
- * @param array $sources One or more arrays of source data to include in the 'srcset'.
+ * @param array<string> $sources One or more arrays of source data to include in the 'srcset'.
  *
  * @return array One or more arrays of source data.
  */
@@ -116,9 +114,10 @@ function image_source_srcset_replacement( $sources ) {
 	}
 
 	$replace_media_urls  = ! use_wp_domain_for_media();
-	$wp_media_urls       = faustwp_get_wp_media_urls( $wp_site_urls );
-	$relative_upload_url = faustwp_get_relative_upload_url( $wp_site_urls );
-	$frontend_uri        = faustwp_get_setting( 'frontend_uri' );
+	$upload_url          = wp_upload_dir()['baseurl'];
+	$wp_media_urls       = faustwp_get_wp_media_urls( $wp_site_urls, $upload_url );
+	$relative_upload_url = faustwp_get_relative_upload_url( $wp_site_urls, $upload_url );
+	$frontend_uri        = (string) faustwp_get_setting( 'frontend_uri' );
 	$site_url            = site_url() . '/';
 
 	$wp_media_site_url = $frontend_uri . $relative_upload_url;
@@ -134,16 +133,14 @@ function image_source_srcset_replacement( $sources ) {
 		$url = $source['url'];
 
 		if ( $replace_media_urls ) {
-			$url = ( strpos( $url, $relative_upload_url ) === 0 )
+			$sources[ $width ]['url'] = ( strpos( $url, $relative_upload_url ) === 0 )
 				? $frontend_uri . $url
-				: str_replace( $wp_media_urls, $wp_media_site_url, $url );
-		} else {
-
-			// We need to make sure that the frontend URL or relative URL (legacy) is updated with the site url.
-			$url = preg_replace( $patterns, $site_url, $url );
+				: str_replace( $wp_media_urls, $wp_media_site_url, $source['url'] );
+			continue;
 		}
 
-		$sources[ $width ]['url'] = $url;
+		// We need to make sure that the frontend URL or relative URL (legacy) is updated with the site url.
+		$sources[ $width ]['url'] = preg_replace( $patterns, $site_url, $source['url'] );
 	}
 
 	return $sources;

plugins/faustwp/includes/replacement/functions.php

@@ -126,10 +126,6 @@ function is_ajax_generate_permalink_request(): bool {
  */
 function is_wp_link_ajax_request(): bool {
 	return ( wp_doing_ajax()
-		&& ! empty( $_POST['_ajax_linking_nonce'] )
-		&& wp_verify_nonce( sanitize_text_field( wp_unslash( $_POST['_ajax_linking_nonce'] ) ), 'internal-linking' )
-		&& ! empty( $_POST['action'] )
-		&& 'wp-link-ajax' === $_POST['action'] );
 }
 
 /**
@@ -158,19 +154,20 @@ function faustwp_get_wp_site_urls() {
  * Get all media urls based off the available site urls
  *
  * @param array<string> $wp_site_urls The array of potential site urls.
+ * @param string        $upload_url An array of site URLs.
  *
  * @return array<string> The array of media Urls
  */
-function faustwp_get_wp_media_urls( array $wp_site_urls ) {
-	$upload_url = faustwp_get_relative_upload_url( $wp_site_urls );
+function faustwp_get_wp_media_urls( array $wp_site_urls, string $upload_url ) {
+	$relative_upload_url = faustwp_get_relative_upload_url( $wp_site_urls, $upload_url );
 
-	if ( ! is_string( $upload_url ) ) {
+	if ( ! is_string( $relative_upload_url ) ) {
 		return apply_filters( 'faustwp_get_wp_site_media_urls', array() );
 	}
 
 	$media_urls = array();
 	foreach ( $wp_site_urls as $site_url ) {
-		$media_urls[] = $site_url . $upload_url;
+		$media_urls[] = $site_url . $relative_upload_url;
 	}
 
 	return apply_filters( 'faustwp_get_wp_site_media_urls', $media_urls );
@@ -181,15 +178,15 @@ function faustwp_get_wp_media_urls( array $wp_site_urls ) {
  * Gets the relative wp-content upload URL.
  *
  * @param array<string> $site_urls An array of site URLs.
+ * @param string        $upload_url An array of site URLs.
  *
  * @return string The relative upload URL.
  */
-function faustwp_get_relative_upload_url( $site_urls ) {
-	$upload_dir = wp_upload_dir()['baseurl'];
+function faustwp_get_relative_upload_url( array $site_urls, string $upload_url = '' ): string {
 
 	foreach ( $site_urls as $site_url ) {
-		if ( strpos( $upload_dir, $site_url ) === 0 ) {
-			return (string) str_replace( $site_url, '', $upload_dir );
+		if ( strpos( $upload_url, $site_url ) === 0 ) {
+			return (string) str_replace( $site_url, '', $upload_url );
 		}
 	}