Cleaner handling of media domains.

Author: B-Interactive

README.md

@@ -5,6 +5,7 @@ A fork from the official Cloudflare Stream plugin 1.0.5 for WordPress. This fork
 * Take full advantage of Cloudflare Stream's security features.
 * Uses signed URL's / tokens, so video access can be strictly controlled and limited.
 * Uses a limited access API token for API access, eliminating the use of the global API key which presents a huge security risk.
+* Incorporate additional features and new features as they're made available.
 
 The Gutenberg Block method of adding videos appears to be broken (in the original plugin also). I've only left code related to the Gutenberg Block in this fork, so as to not break existing content should you switch from the official plugin. Adding new block content will fail as the global API key it's expecting to use is no longer stored in this plugin.  Note the Gutenberg Block as it currently exists, does not support signed URL's / tokens.
 
@@ -57,16 +58,16 @@ The admin area has been completely revised from the official plugin.  Instead of
 ![admin-settings](https://user-images.githubusercontent.com/16984998/188538819-ac0b9905-7d62-4118-81ff-d92a78ba7ea7.png)
 
 
+### API Account ID ###
+* **Cloudflare** > [domain] > **Overview** > [scroll down to API section on the right and copy the Account ID].
+
 ### API Token ###
 An API token must be created in your Cloudflare dashboard, for this plugin. For security sake, the token should only be used for this plugin and provide only the permissions necesarry for the plugin to work.  I'd recommend setting up Client IP Address Filtering when creating the token too.  Where feasible, restrict access to only the IP addresses that need it (eg: your webserver's IP where WordPress is installed).
 * **Cloudflare** > **My Profile** > **API Tokens** > **API Tokens** > [Create Token]
 Must have permission for: **Account - Stream:Edit**
 
-### API Account ID ###
-* **Cloudflare** > [domain] > **Overview** > [scroll down to API section on the right and copy the Account ID].
-
 ### Use Signed URLs ###
-When this is checked [x], videos are accessed using a temporary time-limited token, aka signed URL.  This alone does not secure your content however.  Please see **Securing Video Access** below for further details on how to do that.
+When this is checked [x], videos are accessed using a temporary time-limited token, aka signed URL.  This alone does not secure your content however.  Please see **[Securing Video Access](#securing-video-access)** below for further details on how to do that.
 
 ### Signed URL Expiration ###
 When **Use Signed URLs** is checked [x], this setting controls how long any particular token / signed ULR is valid for **in minutes**. The Cloudflare default, is 60 minutes. Generally, you'd want to make sure this is larger than your longest video.

src/inc/class-cloudflare-stream-api.php

@@ -255,7 +255,7 @@ public function get_video_embed( $uid, $args = array(), $return_headers = false
 		$standard_uri =          ' src="https://iframe.' . $media_domain . '/' . $uid . '?';
 		$account_subdomain_uri = ' src="https://' . $media_domain . '/' . $uid . '/iframe?';
 
-		$src_uri = ( $media_domain == "cloudflarestream.com" || $media_domain == "videodelivery.net" ) ? $standard_uri : $account_subdomain_uri;
+		$src_uri = ( in_array( $media_domain, Cloudflare_Stream_Settings::STANDARD_MEDIA_DOMAINS ) ) ? $standard_uri : $account_subdomain_uri;
 
 		$video_embed = '<div style="position: relative; padding-top: 56.25%"><iframe'
 			. $src_uri

src/inc/class-cloudflare-stream-settings.php

@@ -33,6 +33,7 @@ class Cloudflare_Stream_Settings {
 	const OPTION_SIGNED_URLS          = 'cloudflare_stream_signed_urls';
 	const OPTION_SIGNED_URLS_DURATION = 'cloudflare_stream_signed_urls_duration';
 	const OPTION_MEDIA_DOMAIN         = 'cloudflare_stream_media_domain';
+	const STANDARD_MEDIA_DOMAINS      = [ 'cloudflarestream.com', 'videodelivery.net' ];
 
 	/**
 	 * Singleton
@@ -176,8 +177,11 @@ public function api_signed_urls_duration_cb() {
 	 */
 	public function media_domain_cb() {
 		$media_domain = get_option( self::OPTION_MEDIA_DOMAIN );
-		echo '<label for="cloudflare_stream_media_domain_0"><input type="radio" class="radio-option" name="cloudflare_stream_media_domain" id="cloudflare_stream_media_domain_0" value="cloudflarestream.com" ' . checked( "cloudflarestream.com", $media_domain, false ) . ' >cloudflarestream.com (default)</label>'
-		   . '<label for="cloudflare_stream_media_domain_"><input type="radio" class="radio-option" name="cloudflare_stream_media_domain" id="cloudflare_stream_media_domain_1" value="videodelivery.net" ' . checked( "videodelivery.net", $media_domain, false ) . ' >videodelivery.net</label>';
+
+		for ( $i = 0; $i < count( self::STANDARD_MEDIA_DOMAINS ); $i++ ) {
+			$default =  !$i  ? ' (default)' : '';
+			echo '<label for="cloudflare_stream_media_domain_' . $i . '"><input type="radio" class="radio-option" name="cloudflare_stream_media_domain" id="cloudflare_stream_media_domain_' . $i . '" value="' . self::STANDARD_MEDIA_DOMAINS[$i] . '" ' . checked( self::STANDARD_MEDIA_DOMAINS[$i], $media_domain, false ) . ' >' . self::STANDARD_MEDIA_DOMAINS[$i] . $default . '</label>';
+		}
 
 		// The account subdomain option is only presented if it was able to be retrieved from the API.
 		$account_subdomain = self::get_account_subdomain();