Uat

cloudinary-image-management-and-manipulation-in-the-cloud-cdn/cloudinary.php

@@ -3,7 +3,7 @@
  * Plugin Name: Cloudinary
  * Plugin URI: https://cloudinary.com/documentation/wordpress_integration
  * Description: With the Cloudinary plugin, you can upload and manage your media assets in the cloud, then deliver them to your users through a fast content delivery network, improving your website’s loading speed and overall user experience. Apply multiple transformations and take advantage of a full digital asset management solution without leaving WordPress.
- * Version: 2.1.4
+ * Version: 2.1.9
  * Author:  Cloudinary Ltd., XWP
  * Author URI: https://cloudinary.com/
  * License: GPLv2+

cloudinary-image-management-and-manipulation-in-the-cloud-cdn/css/src/components/_brand.scss

@@ -1,10 +1,10 @@
 @font-face {
 	font-family : 'cloudinary';
-	src         : url('fonts/cloudinary.eot?xr4567gh');
-	src         : url('fonts/cloudinary.eot?xr4567gh#iefix') format('embedded-opentype'),
-	url('fonts/cloudinary.ttf?xr4567gh') format('truetype'),
-	url('fonts/cloudinary.woff?xr4567gh') format('woff'),
-	url('fonts/cloudinary.svg?xr4567gh#cloudinary') format('svg');
+	src         : url('fonts/cloudinary.eot');
+	src         : url('fonts/cloudinary.eot?x#iefix') format('embedded-opentype'),
+	url('fonts/cloudinary.ttf') format('truetype'),
+	url('fonts/cloudinary.woff') format('woff'),
+	url('fonts/cloudinary.svg?x#cloudinary') format('svg');
 	font-weight : normal;
 	font-style  : normal;
 }

cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/class-settings-page.php

@@ -913,4 +913,19 @@ public function set_active_page( $page_slug ) {
 			$this->active_page = $page_slug;
 		}
 	}
+
+	/**
+	 * Checks if auto sync feature is enabled.
+	 *
+	 * @return bool
+	 */
+	public function is_auto_sync_enabled() {
+		$settings = $this->get_config();
+
+		if ( ! empty( $settings['sync_media']['auto_sync'] ) && 'on' === $settings['sync_media']['auto_sync'] ) {
+			return true;
+		}
+
+		return false;
+	}
 }

cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/class-sync.php

@@ -109,7 +109,7 @@ public function is_synced( $post_id ) {
 			return true;
 		}
 
-		if ( apply_filters( 'cloudinary_flag_sync', '__return_false' ) && ! get_post_meta( $post_id, Sync::META_KEYS['downloading'], true ) ) {
+		if ( $this->plugin->components['settings']->is_auto_sync_enabled() && apply_filters( 'cloudinary_flag_sync', '__return_false' ) && ! get_post_meta( $post_id, Sync::META_KEYS['downloading'], true ) ) {
 			update_post_meta( $post_id, Sync::META_KEYS['syncing'], true );
 		}
 

cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/media/class-filter.php

@@ -524,7 +524,7 @@ public function pre_filter_rest_content( $response, $post, $request ) {
 		$context = $request->get_param( 'context' );
 		if ( 'edit' === $context ) {
 			$data                   = $response->get_data();
-			$content                = wp_unslash( $data['content']['raw'] );
+			$content                = $data['content']['raw'];
 			$data['content']['raw'] = $this->filter_out_local( $content );
 
 			$response->set_data( $data );

cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/media/class-upgrade.php

@@ -34,6 +34,20 @@ class Upgrade {
 	 */
 	private $sync;
 
+	/**
+	 * The cron frequency to ensure that the queue is progressing.
+	 *
+	 * @var int
+	 */
+	protected $cron_frequency;
+
+	/**
+	 * The cron offset since the last update.
+	 *
+	 * @var int
+	 */
+	protected $cron_start_offset;
+
 	/**
 	 * Filter constructor.
 	 *
@@ -42,6 +56,10 @@ class Upgrade {
 	public function __construct( \Cloudinary\Media $media ) {
 		$this->media = $media;
 		$this->sync  = $media->plugin->components['sync'];
+
+		$this->cron_frequency    = apply_filters( 'cloudinary_cron_frequency', 600 );
+		$this->cron_start_offset = apply_filters( 'cloudinary_cron_start_offset', 60 );
+
 		$this->setup_hooks();
 	}
 
@@ -167,13 +185,44 @@ function ( $val ) use ( $media ) {
 		update_post_meta( $attachment_id, Sync::META_KEYS['downloading'], true );
 		delete_post_meta( $attachment_id, Sync::META_KEYS['syncing'] );
 
+		if ( ! wp_next_scheduled( 'cloudinary_resume_upgrade' ) ) {
+			wp_schedule_single_event( time() + $this->cron_frequency, 'cloudinary_resume_upgrade' );
+		}
+
 		if ( ! defined( 'DOING_BULK_SYNC' ) ) {
 			$this->sync->managers['upload']->add_to_sync( $attachment_id ); // Auto sync if upgrading outside of bulk sync.
 		}
 
 		return $public_id;
 	}
 
+	/**
+	 * Maybe resume the upgrading assets.
+	 * This is a fallback mechanism to resume the upgrade when it stops unexpectedly.
+	 *
+	 * @return void
+	 */
+	public function maybe_resume_upgrade() {
+		global $wpdb;
+
+		$assets = $wpdb->get_col( // phpcs:ignore WordPress.DB.DirectDatabaseQuery
+			$wpdb->prepare(
+				"SELECT post_id
+				FROM $wpdb->postmeta
+				WHERE meta_key = %s",
+				Sync::META_KEYS['downloading']
+			)
+		);
+
+		if ( ! empty( $assets ) ) {
+			wp_schedule_single_event( time() + $this->cron_frequency, 'cloudinary_resume_upgrade' );
+
+			foreach ( $assets as $asset ) {
+				$this->sync->managers['upload']->add_to_sync( $asset );
+			}
+		}
+	}
+
 	/**
 	 * Setup hooks for the filters.
 	 */
@@ -193,5 +242,7 @@ public function setup_hooks() {
 				}
 			} );
 		}
+
+		add_action( 'cloudinary_resume_upgrade', array( $this, 'maybe_resume_upgrade' ) );
 	}
 }

cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/media/class-video.php

@@ -52,14 +52,14 @@ class Video {
 	 *
 	 * @var string
 	 */
-	const PLAYER_VER = '1.3.3';
+	const PLAYER_VER = '1.4.0';
 
 	/**
 	 * Cloudinary Core Version.
 	 *
 	 * @var string
 	 */
-	const CORE_VER = '2.6.2';
+	const CORE_VER = '2.6.3';
 
 	/**
 	 * Meta key to store usable video transformations for an attachment.
@@ -220,6 +220,7 @@ public function filter_video_shortcode( $html, $attr ) {
 
 		if ( isset( $attr['autoplay'] ) ) {
 			$args['autoplay'] = 'true' === $attr['autoplay'];
+			$args['muted'] = 'true' === $attr['autoplay'];
 		}
 		if ( isset( $attr['loop'] ) ) {
 			$args['loop'] = 'true' === $attr['loop'];
@@ -285,6 +286,7 @@ public function filter_video_tags( $content ) {
 			// Enable Autoplay for this video.
 			if ( false !== strpos( $tag, 'autoplay' ) ) {
 				$args['autoplayMode'] = $this->config['video_autoplay_mode']; // if on, use defined mode.
+				$args['muted'] = 'always' === $this->config['video_autoplay_mode'];
 			}
 			// Enable Loop.
 			if ( false !== strpos( $tag, 'loop' ) ) {
@@ -348,7 +350,6 @@ public function print_video_scripts() {
 				$default       = array(
 					'publicId'    => $cloudinary_id,
 					'sourceTypes' => array( $video['format'] ), // @todo Make this based on eager items as mentioned above.
-					'controls'    => 'on' === $this->config['video_controls'] ? true : false,
 					'autoplay'    => 'off' !== $this->config['video_autoplay_mode'] ? true : false,
 					'loop'        => 'on' === $this->config['video_loop'] ? true : false,
 				);
@@ -363,9 +364,9 @@ public function print_video_scripts() {
 				if ( empty( $config['size'] ) && ! empty( $config['transformation'] ) && ! $this->media->get_crop_from_transformation( $config['transformation'] ) ) {
 					$config['fluid'] = true;
 				}
-
+
+				$config['controls'] = 'on' === $this->config['video_controls'] ? true : false;
 				$cld_videos[ $instance ] = $config;
-
 			}
 
 			if ( empty( $cld_videos ) ) {

cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/sync/class-push-sync.php

@@ -368,6 +368,7 @@ public function prepare_upload( $post, $down_sync = false ) {
 					if ( true === $down_sync ) {
 						$download = $this->plugin->components['sync']->managers['download']->down_sync( $post->ID );
 						if ( is_wp_error( $download ) ) {
+							delete_post_meta( $post->ID, Sync::META_KEYS['downloading'] );
 							update_post_meta( $post->ID, Sync::META_KEYS['sync_error'], $download->get_error_message() );
 
 							return new \WP_Error( 'attachment_download_error', $download->get_error_message() );
@@ -619,6 +620,7 @@ public function push_attachments( $attachments ) {
 				$error           = $result->get_error_message();
 				$stats['fail'][] = $error;
 				$media->update_post_meta( $attachment->ID, Sync::META_KEYS['sync_error'], $error );
+				delete_post_meta( $attachment->ID, Sync::META_KEYS['syncing'] );
 				continue;
 			}
 

cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/sync/class-upload-queue.php

@@ -140,6 +140,7 @@ public function mark( $id, $type = 'done' ) {
 					$queue[ $type ][] = '<div>' . basename( $file ) . ': ' . $state->get_error_message() . '</div>';
 					// Add a flag that this file had an error as to not try process it again.
 					update_post_meta( $id, Sync::META_KEYS['sync_error'], $state->get_error_message() );
+					delete_post_meta( $id, Sync::META_KEYS['syncing'], $state->get_error_message() );
 				}
 			} else {
 				if ( ! in_array( $id, $queue[ $type ], true ) ) {

cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/sync/class-upload-sync.php

@@ -167,7 +167,7 @@ public function handle_bulk_actions( $location, $action, $post_ids ) {
 	 * @return bool
 	 */
 	public function auto_sync_enabled( $enabled, $post_id ) {
-		if ( isset( $this->plugin->config['settings']['sync_media']['auto_sync'] ) && 'on' === $this->plugin->config['settings']['sync_media']['auto_sync'] ) {
+		if ( $this->plugin->components['settings']->is_auto_sync_enabled() ) {
 			$enabled = true;
 		}