Update jetpack 6.8.1

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>

1 files changed, 207 insertions, 153 deletions

diff --git a/plugins/jetpack/modules/videopress/class.videopress-player.php b/plugins/jetpack/modules/videopress/class.videopress-player.php
index e301802b..669523c9 100644
--- a/plugins/jetpack/modules/videopress/class.videopress-player.php
+++ b/plugins/jetpack/modules/videopress/class.videopress-player.php
@@ -52,36 +52,41 @@ class VideoPress_Player {
 	 * @var array $options player customizations
 	 */
 	public function __construct( $guid, $maxwidth = 0, $options = array() ) {
-		if ( empty( self::$shown[ $guid ] ) )
+		if ( empty( self::$shown[ $guid ] ) ) {
 			self::$shown[ $guid ] = 0;
+		}
 
 		self::$shown[ $guid ]++;
 
 		$this->video_container_id = 'v-' . $guid . '-' . self::$shown[ $guid ];
-		$this->video_id = $this->video_container_id . '-video';
+		$this->video_id           = $this->video_container_id . '-video';
 
-		if ( is_array( $options ) )
+		if ( is_array( $options ) ) {
 			$this->options = $options;
-		else
+		} else {
 			$this->options = array();
+		}
 
 		// set up the video
 		$cache_key = null;
 
 		// disable cache in debug mode
-		if ( defined('WP_DEBUG') && WP_DEBUG === true ) {
+		if ( defined( 'WP_DEBUG' ) && WP_DEBUG === true ) {
 			$cached_video = null;
 		} else {
 			$cache_key_pieces = array( 'video' );
 
-			if ( is_multisite() && is_subdomain_install() )
+			if ( is_multisite() && is_subdomain_install() ) {
 				$cache_key_pieces[] = get_current_blog_id();
+			}
 
 			$cache_key_pieces[] = $guid;
-			if ( $maxwidth > 0 )
+			if ( $maxwidth > 0 ) {
 				$cache_key_pieces[] = $maxwidth;
-			if ( is_ssl() )
+			}
+			if ( is_ssl() ) {
 				$cache_key_pieces[] = 'ssl';
+			}
 			$cache_key = implode( '-', $cache_key_pieces );
 			unset( $cache_key_pieces );
 			$cached_video = wp_cache_get( $cache_key, 'video' );
@@ -105,8 +110,9 @@ class VideoPress_Player {
 				$expire = 3600;
 				if ( isset( $video->expires ) && is_int( $video->expires ) ) {
 					$expires_diff = time() - $video->expires;
-					if ( $expires_diff > 0 && $expires_diff < 86400 ) // allowed range: 1 second to 1 day
+					if ( $expires_diff > 0 && $expires_diff < 86400 ) { // allowed range: 1 second to 1 day
 						$expire = $expires_diff;
+					}
 					unset( $expires_diff );
 				}
 
@@ -128,10 +134,11 @@ class VideoPress_Player {
 	 * @return string HTML string or blank string if nothing to wrap
 	 */
 	private function html_wrapper( $content ) {
-		if ( empty( $content ) )
+		if ( empty( $content ) ) {
 			return '';
-		else
+		} else {
 			return '<div id="' . esc_attr( $this->video_container_id ) . '" class="video-player">' . $content . '</div>';
+		}
 	}
 
 	/**
@@ -159,6 +166,7 @@ class VideoPress_Player {
 
 	/**
 	 * Video player markup for best matching the current request and publisher options
+	 *
 	 * @since 1.3
 	 * @return string HTML markup string or empty string if no video property found
 	 */
@@ -180,7 +188,6 @@ class VideoPress_Player {
 			} else {
 				$content = $this->html5_dynamic();
 			}
-
 		} elseif ( isset( $this->options['freedom'] ) && true === $this->options['freedom'] ) {
 			$content = $this->html5_static();
 
@@ -200,12 +207,13 @@ class VideoPress_Player {
 	 * @return string HTML string
 	 */
 	private function error_message( $error ) {
-		if ( ! current_user_can( 'edit_posts' ) || empty( $error ) )
+		if ( ! current_user_can( 'edit_posts' ) || empty( $error ) ) {
 			return '';
+		}
 
-		$html = '<div class="videopress-error" style="background-color:rgb(255,0,0);color:rgb(255,255,255);font-family:font-family:\'Helvetica Neue\',Arial,Helvetica,\'Nimbus Sans L\',sans-serif;font-size:140%;min-height:10em;padding-top:1.5em;padding-bottom:1.5em">';
+		$html  = '<div class="videopress-error" style="background-color:rgb(255,0,0);color:rgb(255,255,255);font-family:font-family:\'Helvetica Neue\',Arial,Helvetica,\'Nimbus Sans L\',sans-serif;font-size:140%;min-height:10em;padding-top:1.5em;padding-bottom:1.5em">';
 		$html .= '<h1 style="font-size:180%;font-style:bold;line-height:130%;text-decoration:underline">' . esc_html( sprintf( __( '%s Error', 'jetpack' ), 'VideoPress' ) ) . '</h1>';
-		foreach( $error->get_error_messages() as $message ) {
+		foreach ( $error->get_error_messages() as $message ) {
 			$html .= $message;
 		}
 		$html .= '</div>';
@@ -220,10 +228,11 @@ class VideoPress_Player {
 	 * @return bool true if video requires the viewer verify he or she is 17 years of age or older
 	 */
 	private function age_gate_required() {
-		if ( isset( $this->video->age_rating ) && $this->video->age_rating >= 17 )
+		if ( isset( $this->video->age_rating ) && $this->video->age_rating >= 17 ) {
 			return true;
-		else
+		} else {
 			return false;
+		}
 	}
 
 	/**
@@ -235,28 +244,31 @@ class VideoPress_Player {
 	private function html_age_gate() {
 		global $wp_locale;
 		$text_align = 'left';
-		if ( $this->video->text_direction === 'rtl' )
+		if ( $this->video->text_direction === 'rtl' ) {
 			$text_align = 'right';
+		}
 
-		$html = '<div class="videopress-age-gate" style="margin:0 60px">';
-		$html .= '<p class="instructions" style="color:rgb(255, 255, 255);font-size:21px;padding-top:60px;padding-bottom:20px;text-align:' . $text_align . '">' . esc_html( __( 'This video is intended for mature audiences.', 'jetpack' ) ) . '<br />' . esc_html( __( 'Please verify your birthday.', 'jetpack' ) ) . '</p>';
-		$html .= '<fieldset id="birthday" style="border:0 none;text-align:' . $text_align . ';padding:0;">';
+		$html         = '<div class="videopress-age-gate" style="margin:0 60px">';
+		$html        .= '<p class="instructions" style="color:rgb(255, 255, 255);font-size:21px;padding-top:60px;padding-bottom:20px;text-align:' . $text_align . '">' . esc_html( __( 'This video is intended for mature audiences.', 'jetpack' ) ) . '<br />' . esc_html( __( 'Please verify your birthday.', 'jetpack' ) ) . '</p>';
+		$html        .= '<fieldset id="birthday" style="border:0 none;text-align:' . $text_align . ';padding:0;">';
 		$inputs_style = 'border:1px solid #444;margin-';
-		if ( $this->video->text_direction === 'rtl' )
+		if ( $this->video->text_direction === 'rtl' ) {
 			$inputs_style .= 'left';
-		else
+		} else {
 			$inputs_style .= 'right';
+		}
 		$inputs_style .= ':10px;background-color:rgb(0, 0, 0);font-size:14px;color:rgb(255,255,255);padding:4px 6px;line-height: 2em;vertical-align: middle';
 
 		/**
 		 * Display a list of months in the Gregorian calendar.
 		 * Set values to 0-based to match JavaScript Date.
+		 *
 		 * @link https://developer.mozilla.org/en/JavaScript/Reference/global_objects/date Mozilla JavaScript Reference: Date
 		 */
 		$html .= '<select name="month" style="' . $inputs_style . '">';
 
-		for( $i=0; $i<12; $i++ ) {
-			$html .= '<option value="' . esc_attr( $i ) . '">' . esc_html( $wp_locale->get_month( $i + 1 ) )  . '</option>';
+		for ( $i = 0; $i < 12; $i++ ) {
+			$html .= '<option value="' . esc_attr( $i ) . '">' . esc_html( $wp_locale->get_month( $i + 1 ) ) . '</option>';
 		}
 		$html .= '</select>';
 
@@ -264,7 +276,7 @@ class VideoPress_Player {
 		 * todo: numdays variance by month
 		 */
 		$html .= '<select name="day" style="' . $inputs_style . '">';
-		for ( $i=1; $i<32; $i++ ) {
+		for ( $i = 1; $i < 32; $i++ ) {
 			$html .= '<option>' . $i . '</option>';
 		}
 		$html .= '</select>';
@@ -274,14 +286,15 @@ class VideoPress_Player {
 		 * Don't ask infants younger than 2 for their birthday
 		 * Default to 13
 		 */
-		$html .= '<select name="year" style="' . $inputs_style . '">';
-		$start_year = date('Y') - 2;
+		$html        .= '<select name="year" style="' . $inputs_style . '">';
+		$start_year   = date( 'Y' ) - 2;
 		$default_year = $start_year - 11;
-		$end_year = $start_year - 128;
-		for ( $year=$start_year; $year>$end_year; $year-- ) {
+		$end_year     = $start_year - 128;
+		for ( $year = $start_year; $year > $end_year; $year-- ) {
 			$html .= '<option';
-			if ( $year === $default_year )
+			if ( $year === $default_year ) {
 				$html .= ' selected="selected"';
+			}
 			$html .= '>' . $year . '</option>';
 		}
 		unset( $start_year );
@@ -292,7 +305,7 @@ class VideoPress_Player {
 		$html .= '<input type="submit" value="' . __( 'Submit', 'jetpack' ) . '" style="cursor:pointer;border-radius: 1em;border:1px solid #333;background-color:#333;background:-webkit-gradient( linear, left top, left bottom, color-stop(0.0, #444), color-stop(1, #111) );background:-moz-linear-gradient(center top, #444 0%, #111 100%);font-size:13px;padding:4px 10px 5px;line-height:1em;vertical-align:top;color:white;text-decoration:none;margin:0" />';
 
 		$html .= '</fieldset>';
-		$html .= '<p style="padding-top:20px;padding-bottom:60px;text-align:' . $text_align . ';"><a rel="nofollow" href="http://videopress.com/" rel="noopener noreferrer" target="_blank" style="color:rgb(128,128,128);text-decoration:underline;font-size:15px">' . __( 'More information', 'jetpack' ) . '</a></p>';
+		$html .= '<p style="padding-top:20px;padding-bottom:60px;text-align:' . $text_align . ';"><a rel="nofollow noopener noreferrer" href="http://videopress.com/" target="_blank" style="color:rgb(128,128,128);text-decoration:underline;font-size:15px">' . __( 'More information', 'jetpack' ) . '</a></p>';
 
 		$html .= '</div>';
 		return $html;
@@ -310,20 +323,24 @@ class VideoPress_Player {
 	private function html5_static() {
 		wp_enqueue_script( 'videopress' );
 		$thumbnail = esc_url( $this->video->poster_frame_uri );
-		$html = "<video id=\"{$this->video_id}\" width=\"{$this->video->calculated_width}\" height=\"{$this->video->calculated_height}\" poster=\"$thumbnail\" controls=\"true\"";
-		if ( isset( $this->options['autoplay'] ) && $this->options['autoplay'] === true )
+		$html      = "<video id=\"{$this->video_id}\" width=\"{$this->video->calculated_width}\" height=\"{$this->video->calculated_height}\" poster=\"$thumbnail\" controls=\"true\"";
+		if ( isset( $this->options['autoplay'] ) && $this->options['autoplay'] === true ) {
 			$html .= ' autoplay="true"';
-		else
+		} else {
 			$html .= ' preload="metadata"';
-		if ( isset( $this->video->text_direction ) )
+		}
+		if ( isset( $this->video->text_direction ) ) {
 			$html .= ' dir="' . esc_attr( $this->video->text_direction ) . '"';
-		if ( isset( $this->video->language ) )
+		}
+		if ( isset( $this->video->language ) ) {
 			$html .= ' lang="' . esc_attr( $this->video->language ) . '"';
+		}
 		$html .= '>';
 		if ( ! isset( $this->options['freedom'] ) || $this->options['freedom'] === false ) {
 			$mp4 = $this->video->videos->mp4->url;
-			if ( ! empty( $mp4 ) )
+			if ( ! empty( $mp4 ) ) {
 				$html .= '<source src="' . esc_url( $mp4 ) . '" type="video/mp4; codecs=&quot;' . esc_attr( $this->video->videos->mp4->codecs ) . '&quot;" />';
+			}
 			unset( $mp4 );
 		}
 
@@ -337,13 +354,15 @@ class VideoPress_Player {
 		}
 
 		$html .= '<div><img alt="';
-		if ( isset( $this->video->title ) )
+		if ( isset( $this->video->title ) ) {
 			$html .= esc_attr( $this->video->title );
+		}
 		$html .= '" src="' . $thumbnail . '" width="' . $this->video->calculated_width . '" height="' . $this->video->calculated_height . '" /></div>';
-		if ( isset( $this->options['freedom'] ) && $this->options['freedom'] === true )
-			$html .= '<p class="robots-nocontent">' . sprintf( __( 'You do not have sufficient <a rel="nofollow" href="%s" rel="noopener noreferrer" target="_blank">freedom levels</a> to view this video. Support free software and upgrade.', 'jetpack' ), 'http://www.gnu.org/philosophy/free-sw.html' ) . '</p>';
-		elseif ( isset( $this->video->title ) )
+		if ( isset( $this->options['freedom'] ) && $this->options['freedom'] === true ) {
+			$html .= '<p class="robots-nocontent">' . sprintf( __( 'You do not have sufficient <a rel="nofollow noopener noreferrer" href="%s" target="_blank">freedom levels</a> to view this video. Support free software and upgrade.', 'jetpack' ), 'http://www.gnu.org/philosophy/free-sw.html' ) . '</p>';
+		} elseif ( isset( $this->video->title ) ) {
 			$html .= '<p>' . esc_html( $this->video->title ) . '</p>';
+		}
 		$html .= '</video>';
 		return $html;
 	}
@@ -382,18 +401,20 @@ class VideoPress_Player {
 
 		wp_enqueue_script( 'videopress' );
 		$video_placeholder_id = $this->video_container_id . '-placeholder';
-		$age_gate_required = $this->age_gate_required();
-		$width = absint( $this->video->calculated_width );
-		$height = absint( $this->video->calculated_height );
+		$age_gate_required    = $this->age_gate_required();
+		$width                = absint( $this->video->calculated_width );
+		$height               = absint( $this->video->calculated_height );
 
 		$html = '<div id="' . $video_placeholder_id . '" class="videopress-placeholder" style="';
-		if ( $age_gate_required )
+		if ( $age_gate_required ) {
 			$html .= "min-width:{$width}px;min-height:{$height}px";
-		else
+		} else {
 			$html .= "width:{$width}px;height:{$height}px";
+		}
 		$html .= ';display:none;cursor:pointer !important;position:relative;';
-		if ( isset( $this->video->skin ) && isset( $this->video->skin->background_color ) )
+		if ( isset( $this->video->skin ) && isset( $this->video->skin->background_color ) ) {
 			$html .= 'background-color:' . esc_attr( $this->video->skin->background_color ) . ';';
+		}
 		$html .= 'font-family: \'Helvetica Neue\',Arial,Helvetica,\'Nimbus Sans L\',sans-serif;font-weight:bold;font-size:18px">' . PHP_EOL;
 
 		/**
@@ -402,38 +423,43 @@ class VideoPress_Player {
 		if ( ! $age_gate_required ) {
 			if ( ! empty( $this->video->title ) ) {
 				$html .= '<div class="videopress-title" style="display:inline;position:absolute;margin:20px 20px 0 20px;padding:4px 8px;vertical-align:top;text-align:';
-				if ( $this->video->text_direction === 'rtl' )
+				if ( $this->video->text_direction === 'rtl' ) {
 					$html .= 'right" dir="rtl"';
-				else
+				} else {
 					$html .= 'left" dir="ltr"';
-				if ( isset( $this->video->language ) )
+				}
+				if ( isset( $this->video->language ) ) {
 					$html .= ' lang="' . esc_attr( $this->video->language ) . '"';
+				}
 				$html .= '><span style="padding:3px 0;line-height:1.5em;';
 				if ( isset( $this->video->skin ) && isset( $this->video->skin->background_color ) ) {
 					$html .= 'background-color:';
-					if ( $this->video->skin->background_color === 'rgb(0,0,0)' )
+					if ( $this->video->skin->background_color === 'rgb(0,0,0)' ) {
 						$html .= 'rgba(0,0,0,0.8)';
-					else
+					} else {
 						$html .= esc_attr( $this->video->skin->background_color );
+					}
 					$html .= ';';
 				}
 				$html .= 'color:rgb(255,255,255)">' . esc_html( $this->video->title ) . '</span></div>';
 			}
 			$html .= '<img class="videopress-poster" alt="';
-			if ( ! empty( $this->video->title ) )
+			if ( ! empty( $this->video->title ) ) {
 				$html .= esc_attr( $this->video->title ) . '" title="' . esc_attr( sprintf( _x( 'Watch: %s', 'watch a video title', 'jetpack' ), $this->video->title ) );
+			}
 			$html .= '" src="' . esc_url( $this->video->poster_frame_uri, array( 'http', 'https' ) ) . '" width="' . $width . '" height="' . $height . '" />' . PHP_EOL;
 
-			//style a play button hovered over the poster frame
+			// style a play button hovered over the poster frame
 			$html .= '<div class="play-button"><span style="z-index:2;display:block;position:absolute;top:50%;left:50%;text-align:center;vertical-align:middle;color:rgb(255,255,255);opacity:0.9;margin:0 0 0 -0.45em;padding:0;line-height:0;font-size:500%;text-shadow:0 0 40px rgba(0,0,0,0.5)">&#9654;</span></div>' . PHP_EOL;
 
 			// watermark
 			if ( isset( $this->video->skin ) && isset( $this->video->skin->watermark ) ) {
 				$html .= '<div style="position:relative;margin-top:-40px;height:25px;margin-bottom:35px;';
-				if ( $this->video->text_direction === 'rtl' )
+				if ( $this->video->text_direction === 'rtl' ) {
 					$html .= 'margin-left:20px;text-align:left;';
-				else
+				} else {
 					$html .= 'margin-right:20px;text-align:right;';
+				}
 				$html .= 'vertical-align:bottom;z-index:3">';
 				$html .= '<img alt="" src="' . esc_url( $this->video->skin->watermark, array( 'http', 'https' ) ) . '" width="90" height="13" style="background-color:transparent;background-image:none;background-repeat:no-repeat;border:none;margin:0;padding:0"/>';
 				$html .= '</div>' . PHP_EOL;
@@ -441,38 +467,48 @@ class VideoPress_Player {
 		}
 
 		$data = array(
-			'blog' => absint( $this->video->blog_id ),
-			'post' => absint( $this->video->post_id ),
-			'duration'=> absint( $this->video->duration ),
-			'poster' => esc_url_raw( $this->video->poster_frame_uri, array( 'http', 'https' ) ),
-			'hd' => (bool) $this->options['hd']
+			'blog'     => absint( $this->video->blog_id ),
+			'post'     => absint( $this->video->post_id ),
+			'duration' => absint( $this->video->duration ),
+			'poster'   => esc_url_raw( $this->video->poster_frame_uri, array( 'http', 'https' ) ),
+			'hd'       => (bool) $this->options['hd'],
 		);
 		if ( isset( $this->video->videos ) ) {
-			if ( isset( $this->video->videos->mp4 ) && isset( $this->video->videos->mp4->url ) )
-				$data['mp4'] = array( 'size' => $this->video->videos->mp4->format, 'uri' => esc_url_raw( $this->video->videos->mp4->url, array( 'http', 'https' ) ) );
-			if ( isset( $this->video->videos->ogv ) && isset( $this->video->videos->ogv->url ) )
-				$data['ogv'] = array( 'size' => 'std', 'uri' => esc_url_raw( $this->video->videos->ogv->url, array( 'http', 'https' ) ) );
+			if ( isset( $this->video->videos->mp4 ) && isset( $this->video->videos->mp4->url ) ) {
+				$data['mp4'] = array(
+					'size' => $this->video->videos->mp4->format,
+					'uri'  => esc_url_raw( $this->video->videos->mp4->url, array( 'http', 'https' ) ),
+				);
+			}
+			if ( isset( $this->video->videos->ogv ) && isset( $this->video->videos->ogv->url ) ) {
+				$data['ogv'] = array(
+					'size' => 'std',
+					'uri'  => esc_url_raw( $this->video->videos->ogv->url, array( 'http', 'https' ) ),
+				);
+			}
 		}
 		$locale = array( 'dir' => $this->video->text_direction );
-		if ( isset( $this->video->language ) )
+		if ( isset( $this->video->language ) ) {
 			$locale['lang'] = $this->video->language;
+		}
 		$data['locale'] = $locale;
 		unset( $locale );
 
-		$guid = $this->video->guid;
+		$guid    = $this->video->guid;
 		$guid_js = json_encode( $guid );
-		$html .= '<script type="text/javascript">' . PHP_EOL;
-		$html .= 'jQuery(document).ready(function() {';
+		$html   .= '<script type="text/javascript">' . PHP_EOL;
+		$html   .= 'jQuery(document).ready(function() {';
 
-		$html .= 'if ( !jQuery.VideoPress.data[' . json_encode($guid) . '] ) { jQuery.VideoPress.data[' . json_encode($guid) . '] = new Array(); }' . PHP_EOL;
-		$html .= 'jQuery.VideoPress.data[' . json_encode( $guid ) . '][' . self::$shown[ $guid ] . ']=' . json_encode($data) . ';' . PHP_EOL;
+		$html .= 'if ( !jQuery.VideoPress.data[' . json_encode( $guid ) . '] ) { jQuery.VideoPress.data[' . json_encode( $guid ) . '] = new Array(); }' . PHP_EOL;
+		$html .= 'jQuery.VideoPress.data[' . json_encode( $guid ) . '][' . self::$shown[ $guid ] . ']=' . json_encode( $data ) . ';' . PHP_EOL;
 		unset( $data );
 
-		$jq_container = json_encode( '#' . $this->video_container_id );
+		$jq_container   = json_encode( '#' . $this->video_container_id );
 		$jq_placeholder = json_encode( '#' . $video_placeholder_id );
-		$player_config = "{width:{$width},height:{$height},";
-		if ( isset( $this->options['freedom'] ) && $this->options['freedom'] === true )
+		$player_config  = "{width:{$width},height:{$height},";
+		if ( isset( $this->options['freedom'] ) && $this->options['freedom'] === true ) {
 			$player_config .= 'freedom:"true",';
+		}
 		$player_config .= 'container:jQuery(' . $jq_container . ')}';
 
 		$html .= "jQuery({$jq_placeholder}).show(0,function(){jQuery.VideoPress.analytics.impression({$guid_js})});" . PHP_EOL;
@@ -482,30 +518,34 @@ class VideoPress_Player {
 			/**
 			 * @link http://code.google.com/p/swfobject/wiki/api#swfobject.embedSWF(swfUrlStr,_replaceElemIdStr,_widthStr,_height
 			 */
-			$html .= 'swfobject.embedSWF(' . implode( ',', array(
-				'jQuery.VideoPress.video.flash.player_uri',
-				json_encode( $this->video_container_id ),
-				json_encode( $width ),
-				json_encode( $height ),
-				'jQuery.VideoPress.video.flash.min_version',
-				'jQuery.VideoPress.video.flash.expressinstall', // attempt to upgrade the Flash player if less than min_version. requires a 310x137 container or larger but we will always try to include
-				'{guid:' . $guid_js . '}', // FlashVars
-				'jQuery.VideoPress.video.flash.params',
-				'null', // no attributes
-				'jQuery.VideoPress.video.flash.embedCallback' // error fallback
-			) ) . ');';
+			$html .= 'swfobject.embedSWF(' . implode(
+				',',
+				array(
+					'jQuery.VideoPress.video.flash.player_uri',
+					json_encode( $this->video_container_id ),
+					json_encode( $width ),
+					json_encode( $height ),
+					'jQuery.VideoPress.video.flash.min_version',
+					'jQuery.VideoPress.video.flash.expressinstall', // attempt to upgrade the Flash player if less than min_version. requires a 310x137 container or larger but we will always try to include
+					'{guid:' . $guid_js . '}', // FlashVars
+					'jQuery.VideoPress.video.flash.params',
+					'null', // no attributes
+					'jQuery.VideoPress.video.flash.embedCallback', // error fallback
+				)
+			) . ');';
 			$html .= '} else {' . PHP_EOL;
 			$html .= "if ( jQuery.VideoPress.video.prepare({$guid_js},{$player_config}," . self::$shown[ $guid ] . ') ) {' . PHP_EOL;
-			$html .= 'if ( jQuery(' . $jq_container . ').data( "player" ) === "flash" ){jQuery.VideoPress.video.play(jQuery(' . json_encode('#' . $this->video_container_id) . '));}else{';
+			$html .= 'if ( jQuery(' . $jq_container . ').data( "player" ) === "flash" ){jQuery.VideoPress.video.play(jQuery(' . json_encode( '#' . $this->video_container_id ) . '));}else{';
 			$html .= 'jQuery(' . $jq_placeholder . ').html(' . json_encode( $this->html_age_date() ) . ');' . PHP_EOL;
 			$html .= 'jQuery(' . json_encode( '#' . $video_placeholder_id . ' input[type=submit]' ) . ').one("click", function(event){jQuery.VideoPress.requirements.isSufficientAge(jQuery(' . $jq_container . '),' . absint( $this->video->age_rating ) . ')});' . PHP_EOL;
 			$html .= '}}}' . PHP_EOL;
 		} else {
 			$html .= "if ( jQuery.VideoPress.video.prepare({$guid_js}, {$player_config}," . self::$shown[ $guid ] . ') ) {' . PHP_EOL;
-			if ( isset( $this->options['autoplay'] ) && $this->options['autoplay'] === true )
+			if ( isset( $this->options['autoplay'] ) && $this->options['autoplay'] === true ) {
 				$html .= "jQuery.VideoPress.video.play(jQuery({$jq_container}));";
-			else
-				$html .= 'jQuery(' . $jq_placeholder .  ').one("click",function(){jQuery.VideoPress.video.play(jQuery(' . $jq_container . '))});';
+			} else {
+				$html .= 'jQuery(' . $jq_placeholder . ').one("click",function(){jQuery.VideoPress.video.play(jQuery(' . $jq_container . '))});';
+			}
 			$html .= '}';
 
 			// close the jQuery(document).ready() function
@@ -520,26 +560,30 @@ class VideoPress_Player {
 		$noun = __( 'this video', 'jetpack' );
 		if ( ! $age_gate_required ) {
 			$vid_type = '';
-			if ( ( isset( $this->options['freedom'] ) && $this->options['freedom'] === true ) && ( isset( $this->video->videos->ogv ) && isset( $this->video->videos->ogv->url ) ) )
+			if ( ( isset( $this->options['freedom'] ) && $this->options['freedom'] === true ) && ( isset( $this->video->videos->ogv ) && isset( $this->video->videos->ogv->url ) ) ) {
 				$vid_type = 'ogv';
-			elseif ( isset( $this->video->videos->mp4 ) && isset( $this->video->videos->mp4->url ) )
+			} elseif ( isset( $this->video->videos->mp4 ) && isset( $this->video->videos->mp4->url ) ) {
 				$vid_type = 'mp4';
-			elseif ( isset( $this->video->videos->ogv ) && isset( $this->video->videos->ogv->url ) )
+			} elseif ( isset( $this->video->videos->ogv ) && isset( $this->video->videos->ogv->url ) ) {
 				$vid_type = 'ogv';
+			}
 
 			if ( $vid_type !== '' ) {
 				$noun = '<a ';
-				if ( isset( $this->video->language ) )
+				if ( isset( $this->video->language ) ) {
 					$noun .= 'hreflang="' . esc_attr( $this->video->language ) . '" ';
-				if ( $vid_type === 'mp4' )
+				}
+				if ( $vid_type === 'mp4' ) {
 					$noun .= 'type="video/mp4" href="' . esc_url( $this->video->videos->mp4->url, array( 'http', 'https' ) );
-				elseif ( $vid_type === 'ogv' )
+				} elseif ( $vid_type === 'ogv' ) {
 					$noun .= 'type="video/ogv" href="' . esc_url( $this->video->videos->ogv->url, array( 'http', 'https' ) );
+				}
 				$noun .= '">';
-				if ( isset( $this->video->title ) )
+				if ( isset( $this->video->title ) ) {
 					$noun .= esc_html( $this->video->title );
-				else
+				} else {
 					$noun .= __( 'this video', 'jetpack' );
+				}
 				$noun .= '</a>';
 			} elseif ( ! empty( $this->title ) ) {
 				$noun = esc_html( $this->title );
@@ -579,7 +623,7 @@ class VideoPress_Player {
 		}
 
 		$videopress_options = array(
-			'width' => absint( $this->video->calculated_width ),
+			'width'  => absint( $this->video->calculated_width ),
 			'height' => absint( $this->video->calculated_height ),
 		);
 		foreach ( $this->options as $option => $value ) {
@@ -630,7 +674,7 @@ class VideoPress_Player {
 
 		} else {
 			$videopress_options = json_encode( $videopress_options );
-			$js_url = 'https://s0.wp.com/wp-content/plugins/video/assets/js/next/videopress.js';
+			$js_url             = 'https://s0.wp.com/wp-content/plugins/video/assets/js/next/videopress.js';
 
 			return "<div id='{$video_container_id}'></div>
 				<script src='{$js_url}'></script>
@@ -654,40 +698,42 @@ class VideoPress_Player {
 	 */
 	public static function esc_flash_params( $flash_params ) {
 		$allowed_params = array(
-			'swliveconnect' => array('true', 'false'),
-			'play' => array('true', 'false'),
-			'loop' => array('true', 'false'),
-			'menu' => array('true', 'false'),
-			'quality' => array('low', 'autolow', 'autohigh', 'medium', 'high', 'best'),
-			'scale' => array('default', 'noborder', 'exactfit', 'noscale'),
-			'align' => array('l', 'r', 't'),
-			'salign' => array('l', 'r', 't', 'tl', 'tr', 'bl', 'br'),
-			'wmode' => array('window', 'opaque', 'transparent','direct','gpu'),
-			'devicefont' => array('_sans', '_serif', '_typewriter'),
-			'allowscriptaccess' => array('always', 'samedomain', 'never'),
-			'allownetworking' => array('all','internal', 'none'),
-			'seamlesstabbing' => array('true', 'false'),
-			'allowfullscreen' => array('true', 'false'),
-			'fullScreenAspectRatio' => array('portrait', 'landscape'),
+			'swliveconnect'         => array( 'true', 'false' ),
+			'play'                  => array( 'true', 'false' ),
+			'loop'                  => array( 'true', 'false' ),
+			'menu'                  => array( 'true', 'false' ),
+			'quality'               => array( 'low', 'autolow', 'autohigh', 'medium', 'high', 'best' ),
+			'scale'                 => array( 'default', 'noborder', 'exactfit', 'noscale' ),
+			'align'                 => array( 'l', 'r', 't' ),
+			'salign'                => array( 'l', 'r', 't', 'tl', 'tr', 'bl', 'br' ),
+			'wmode'                 => array( 'window', 'opaque', 'transparent', 'direct', 'gpu' ),
+			'devicefont'            => array( '_sans', '_serif', '_typewriter' ),
+			'allowscriptaccess'     => array( 'always', 'samedomain', 'never' ),
+			'allownetworking'       => array( 'all', 'internal', 'none' ),
+			'seamlesstabbing'       => array( 'true', 'false' ),
+			'allowfullscreen'       => array( 'true', 'false' ),
+			'fullScreenAspectRatio' => array( 'portrait', 'landscape' ),
 			'base',
 			'bgcolor',
-			'flashvars'
+			'flashvars',
 		);
 
 		$allowed_params_keys = array_keys( $allowed_params );
 
 		$filtered_params = array();
-		foreach( $flash_params as $param=>$value ) {
-			if ( empty($param) || empty($value) )
+		foreach ( $flash_params as $param => $value ) {
+			if ( empty( $param ) || empty( $value ) ) {
 				continue;
-			$param = strtolower($param);
-			if ( in_array($param, $allowed_params_keys) ) {
-				if ( isset( $allowed_params[$param] ) && is_array( $allowed_params[$param] ) ) {
-					$value = strtolower($value);
-					if ( in_array( $value, $allowed_params[$param] ) )
-						$filtered_params[$param] = $value;
+			}
+			$param = strtolower( $param );
+			if ( in_array( $param, $allowed_params_keys ) ) {
+				if ( isset( $allowed_params[ $param ] ) && is_array( $allowed_params[ $param ] ) ) {
+					$value = strtolower( $value );
+					if ( in_array( $value, $allowed_params[ $param ] ) ) {
+						$filtered_params[ $param ] = $value;
+					}
 				} else {
-					$filtered_params[$param] = $value;
+					$filtered_params[ $param ] = $value;
 				}
 			}
 		}
@@ -696,8 +742,9 @@ class VideoPress_Player {
 		/**
 		 * Flash specifies sameDomain, not samedomain. change from lowercase value for preciseness
 		 */
-		if ( isset( $filtered_params['allowscriptaccess'] ) && $filtered_params['allowscriptaccess'] === 'samedomain' )
+		if ( isset( $filtered_params['allowscriptaccess'] ) && $filtered_params['allowscriptaccess'] === 'samedomain' ) {
 			$filtered_params['allowscriptaccess'] = 'sameDomain';
+		}
 
 		return $filtered_params;
 	}
@@ -709,12 +756,14 @@ class VideoPress_Player {
 	 * @return array Flash variable key value pairs
 	 */
 	private function get_flash_variables() {
-		if ( ! isset( $this->video->players->swf->vars ) )
+		if ( ! isset( $this->video->players->swf->vars ) ) {
 			return array();
+		}
 
 		$flashvars = (array) $this->video->players->swf->vars;
-		if ( isset( $this->options['autoplay'] ) && $this->options['autoplay'] === true )
+		if ( isset( $this->options['autoplay'] ) && $this->options['autoplay'] === true ) {
 			$flashvars['autoPlay'] = 'true';
+		}
 		return $flashvars;
 	}
 
@@ -725,21 +774,22 @@ class VideoPress_Player {
 	 * @return array Flash parameters passed through key and value validation
 	 */
 	private function get_flash_parameters() {
-		if ( ! isset( $this->video->players->swf->params ) )
+		if ( ! isset( $this->video->players->swf->params ) ) {
 			return array();
-		else
+		} else {
 			return self::esc_flash_params(
 				/**
-				 * Filters the Flash parameters of the VideoPress player.
-				 *
-				 * @module videopress
-				 *
-				 * @since 1.2.0
-				 *
-				 * @param array $this->video->players->swf->params Array of swf parameters for the VideoPress flash player.
-				 */
+						 * Filters the Flash parameters of the VideoPress player.
+						 *
+						 * @module videopress
+						 *
+						 * @since 1.2.0
+						 *
+						 * @param array $this->video->players->swf->params Array of swf parameters for the VideoPress flash player.
+						 */
 				apply_filters( 'video_flash_params', (array) $this->video->players->swf->params, 10, 1 )
 			);
+		}
 	}
 
 	/**
@@ -752,18 +802,20 @@ class VideoPress_Player {
 	 */
 	private function flash_embed() {
 		wp_enqueue_script( 'videopress' );
-		if ( ! isset( $this->video->players->swf ) || ! isset( $this->video->players->swf->url ) )
+		if ( ! isset( $this->video->players->swf ) || ! isset( $this->video->players->swf->url ) ) {
 			return '';
+		}
 
 		$embed = array(
-			'id' => $this->video_id,
-			'src' => esc_url_raw( $this->video->players->swf->url . '&' . http_build_query( $this->get_flash_variables(), null, '&' ) , array( 'http', 'https' ) ),
-			'type' => 'application/x-shockwave-flash',
-			'width' => $this->video->calculated_width,
-			'height' => $this->video->calculated_height
+			'id'     => $this->video_id,
+			'src'    => esc_url_raw( $this->video->players->swf->url . '&' . http_build_query( $this->get_flash_variables(), null, '&' ), array( 'http', 'https' ) ),
+			'type'   => 'application/x-shockwave-flash',
+			'width'  => $this->video->calculated_width,
+			'height' => $this->video->calculated_height,
 		);
-		if ( isset( $this->video->title ) )
+		if ( isset( $this->video->title ) ) {
 			$embed['title'] = $this->video->title;
+		}
 		$embed = array_merge( $embed, $this->get_flash_parameters() );
 
 		$html = '<embed';
@@ -783,23 +835,25 @@ class VideoPress_Player {
 	 */
 	private function flash_object() {
 		wp_enqueue_script( 'videopress' );
-		if ( ! isset( $this->video->players->swf ) || ! isset( $this->video->players->swf->url ) )
+		if ( ! isset( $this->video->players->swf ) || ! isset( $this->video->players->swf->url ) ) {
 			return '';
+		}
 
 		$thumbnail_html = '<img alt="';
-		if ( isset( $this->video->title ) )
+		if ( isset( $this->video->title ) ) {
 			$thumbnail_html .= esc_attr( $this->video->title );
+		}
 		$thumbnail_html .= '" src="' . esc_url( $this->video->poster_frame_uri, array( 'http', 'https' ) ) . '" width="' . $this->video->calculated_width . '" height="' . $this->video->calculated_height . '" />';
-		$flash_vars = esc_attr( http_build_query( $this->get_flash_variables(), null, '&' ) );
-		$flash_params = '';
+		$flash_vars      = esc_attr( http_build_query( $this->get_flash_variables(), null, '&' ) );
+		$flash_params    = '';
 		foreach ( $this->get_flash_parameters() as $attribute => $value ) {
 			$flash_params .= '<param name="' . esc_attr( $attribute ) . '" value="' . esc_attr( $value ) . '" />';
 		}
-		$flash_help = sprintf( __( 'This video requires <a rel="nofollow" href="%s" rel="noopener noreferrer" target="_blank">Adobe Flash</a> for playback.', 'jetpack' ), 'http://www.adobe.com/go/getflashplayer');
+		$flash_help       = sprintf( __( 'This video requires <a rel="nofollow noopener noreferrer" href="%s" target="_blank">Adobe Flash</a> for playback.', 'jetpack' ), 'http://www.adobe.com/go/getflashplayer' );
 		$flash_player_url = esc_url( $this->video->players->swf->url, array( 'http', 'https' ) );
-		$description = '';
+		$description      = '';
 		if ( isset( $this->video->title ) ) {
-			$standby = $this->video->title;
+			$standby     = $this->video->title;
 			$description = '<p><strong>' . esc_html( $this->video->title ) . '</strong></p>';
 		} else {
 			$standby = __( 'Loading video...', 'jetpack' );