Merge pull request #111 from cloudinary/develop

develop - master
Accepted as a RC-1 for version 2.1.3

Author: David Cramer

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.2
+ * Version: 2.1.3
  * Author:  Cloudinary Ltd., XWP
  * Author URI: https://cloudinary.com/
  * License: GPLv2+

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

@@ -208,3 +208,11 @@
 		}
 	}
 }
+
+.settings-warning {
+	display: inline-block;
+	padding: 5px 7px;
+	background-color: #ffea98;
+	border-left: 4px solid #ffcc00;
+	box-shadow: 0px 0px 5px 0px rgba(112,112,112,0.4);
+}

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

@@ -1,5 +1,26 @@
 (function() {
 
+	// Disable the "off" dropdown option for Autoplay if
+	// the player isn't set to Cloudinary or if Show Controls if unchecked.
+	const disableAutoplayOff = function() {
+		const player = jQuery( '#field-video_player' ).val();
+		const showControls = jQuery( '#field-video_controls' ).prop( 'checked' );
+		const offSelection = jQuery( '#field-video_autoplay_mode option[value="off"]' );
+
+		if ( player === 'cld' && ! showControls ) {
+			offSelection.prop( 'disabled', true );
+			if ( offSelection.prop( 'selected' ) ) {
+				offSelection.next().prop( 'selected', true );
+			}
+		} else {
+			offSelection.prop( 'disabled', false );
+		}
+	}
+
+	disableAutoplayOff();
+	jQuery( document ).on( 'change', '#field-video_player', disableAutoplayOff );
+	jQuery( document ).on( 'change', '#field-video_controls', disableAutoplayOff );
+
 	jQuery( document ).ready( function( $ ) {
 
 		// Initilize instance events

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

@@ -363,7 +363,8 @@ public function get_usage_stat( $type, $stat = null ) {
 				if ( 'limit' === $stat && isset( $this->usage[ $type ]['usage'] ) ) {
 					$value = $this->usage[ $type ]['usage'];
 				} elseif ( 'used_percent' === $stat && isset( $this->usage[ $type ]['credits_usage'] ) ) {
-					$value = $this->usage[ $type ]['credits_usage'];
+					// Calculate percentage based on credit limit and usage.
+					$value = round( $this->usage[ $type ]['credits_usage']/$this->usage['credits']['limit'] * 100, 2 );
 				}
 			}
 		}
@@ -432,28 +433,27 @@ public function get_config() {
 	 */
 	public function usage_notices() {
 		if ( ! empty( $this->usage ) ) {
-			$usage_type = 'used_percent';
-			if ( isset( $this->usage['credits'] ) ) {
-				$usage_type = 'credits_usage';
-			}
 			foreach ( $this->usage as $stat => $values ) {
 
-				if ( ! is_array( $values ) || ! isset( $values[ $usage_type ] ) || 0 > $values[ $usage_type ] ) {
+				if ( ! is_array( $values ) ) {
+					continue;
+				}
+				$usage = $this->get_usage_stat( $stat, 'used_percent' );
+				if ( empty ( $usage ) ) {
 					continue;
 				}
-
 				$link      = null;
 				$link_text = null;
-				if ( 90 <= $values[ $usage_type ] ) {
+				if ( 90 <= $usage ) {
 					// 90% used - show error.
 					$level     = 'error';
 					$link      = 'https://cloudinary.com/console/lui/upgrade_options';
 					$link_text = __( 'upgrade your account', 'cloudinary' );
-				} elseif ( 80 <= $values[ $usage_type ] ) {
-					$level = 'warning';
+				} elseif ( 80 <= $usage ) {
+					$level     = 'warning';
 					$link_text = __( 'upgrade your account', 'cloudinary' );
-				} elseif ( 70 <= $values[ $usage_type ] ) {
-					$level = 'neutral';
+				} elseif ( 70 <= $usage ) {
+					$level     = 'neutral';
 					$link_text = __( 'upgrade your account', 'cloudinary' );
 				} else {
 					continue;
@@ -465,7 +465,7 @@ public function usage_notices() {
 						'cloudinary'
 					),
 					ucwords( $stat ),
-					$values[ $usage_type ] . '%',
+					$usage . '%',
 					$link,
 					$link_text
 				);

cloudinary-image-management-and-manipulation-in-the-cloud-cdn/js/src/components/settings-page.js

@@ -1027,7 +1027,7 @@ public function down_sync_asset() {
 			if ( $format !== $file_info['extension'] ) {
 				// Format transformation.
 				$this->set_transformation( $transformations, 'fetch_format', $file_info['extension'] );
-				$url = $file_info['dirname'] . '/' . $file_info['filename'] . '.' . $format;
+				$url = $file_info['dirname'] . '/' . $file_info['filename'] . '.' . $file_info['extension'];
 			}
 			// Try to find the Attachment ID in context meta data.
 			$attachment_id = $this->get_id_from_sync_key( $sync_key );

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

@@ -48,6 +48,7 @@ class Sync implements Setup, Assets {
 		'transformation' => '_transformations',
 		'sync_error'     => '_sync_error',
 		'cloudinary'     => '_cloudinary_v2',
+		'folder_sync'    => '_folder_sync',
 	);
 
 	/**
@@ -100,8 +101,9 @@ public function is_active() {
 	 */
 	public function is_synced( $post_id ) {
 		$return    = false;
-		$signature = $this->plugin->components['media']->get_post_meta( $post_id, self::META_KEYS['signature'], true );
-		if ( ! empty( $signature ) && $this->generate_signature( $post_id ) === $signature ) {
+		$signature = $this->get_signature( $post_id );
+		$expecting = $this->generate_signature( $post_id );
+		if ( ! empty( $signature ) && ! empty( $expecting ) && $expecting === $signature ) {
 			$return = $signature;
 		}
 
@@ -113,10 +115,16 @@ public function is_synced( $post_id ) {
 	 *
 	 * @param int $post_id The post id to generate a signature for.
 	 *
-	 * @return string
+	 * @return string|bool
 	 */
 	public function generate_signature( $post_id ) {
-		$upload               = $this->managers['push']->prepare_upload( $post_id );
+		$upload = $this->managers['push']->prepare_upload( $post_id );
+		// Check if has an error (ususally due to file quotas).
+		if ( is_wp_error( $upload ) ) {
+			$this->plugin->components['media']->get_post_meta( $post_id, self::META_KEYS['sync_error'], $upload->get_error_message() );
+
+			return false;
+		}
 		$credentials          = $this->plugin->components['connect']->get_credentials();
 		$upload['cloud_name'] = $credentials['cloud_name'];
 		$return               = array_map(
@@ -133,6 +141,31 @@ function ( $item ) {
 		return $return;
 	}
 
+	/**
+	 * Get the current sync signature of an asset.
+	 *
+	 * @param int $post_id The post ID.
+	 *
+	 * @return array|bool
+	 */
+	public function get_signature( $post_id ) {
+		static $signatures = array(); // Cache signatures already fetched.
+
+		$return = false;
+		if ( ! empty( $signatures[ $post_id ] ) ) {
+			$return = $signatures[ $post_id ];
+		} else {
+			$signature = $this->plugin->components['media']->get_post_meta( $post_id, self::META_KEYS['signature'], true );
+			if ( ! empty( $signature ) ) {
+				$base_signatures        = $this->generate_signature( $post_id );
+				$signatures[ $post_id ] = wp_parse_args( $signature, $base_signatures );
+				$return                 = $signatures[ $post_id ];
+			}
+		}
+
+		return $return;
+	}
+
 	/**
 	 * Additional component setup.
 	 */

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

@@ -189,14 +189,17 @@ function ( $item ) use ( $transformation_index ) {
 				if ( is_string ( $item ) ) {
 					return $item;
 				}
+
 				foreach ( $item as $type => $value ) { // phpcs:ignore
 					$key = array_search( $type, $transformation_index, true );
-					if ( 'wpsize' === $type ) {
+					if ( false !== strpos( $type, 'wpsize' ) ) {
 						if ( ! empty( $item['clean'] ) ) {
 							continue;
 						}
+
 						$value = '!' . $value . '!';
 					}
+
 					if ( false !== $key ) {
 						$transform[] = $key . '_' . $value;
 					}
@@ -236,13 +239,19 @@ public function cloudinary_url( $public_id, $args = array(), $size = array(), $c
 			$args['version'] = 'v1';
 		}
 
+		// Determine if we're dealing with a fetched 
+		// ...or uploaded image and update the URL accordingly.
+		$asset_endpoint = filter_var( $public_id, FILTER_VALIDATE_URL ) ? 'fetch' : 'upload';
+
 		$url_parts = array(
 			'https:/',
-			$this->url( $args['resource_type'], 'upload' ),
+			$this->url( $args['resource_type'], $asset_endpoint ),
 		);
+
 		if ( ! empty( $args['transformation'] ) ) {
 			$url_parts[] = self::generate_transformation_string( $args['transformation'] );
 		}
+
 		// Add size.
 		if ( ! empty( $size ) && is_array( $size ) ) {
 			if ( true === $clean ) {
@@ -252,7 +261,6 @@ public function cloudinary_url( $public_id, $args = array(), $size = array(), $c
 		}
 
 		$url_parts[] = $args['version'];
-
 		$url_parts[] = $public_id;
 
 		// Clear out empty parts.

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

@@ -46,7 +46,10 @@ public function __construct( \Cloudinary\Media $media ) {
 	public function check_cloudinary_version( $cloudinary_id, $attachment_id ) {
 		if ( false === $cloudinary_id ) {
 			// Backwards compat.
-			$meta      = wp_get_attachment_metadata( $attachment_id );
+			$meta = wp_get_attachment_metadata( $attachment_id );
+			if ( ! empty( $meta[ Sync::META_KEYS['cloudinary'] ] ) ) {
+				return $cloudinary_id; // Current version.
+			}
 			$public_id = $this->media->get_post_meta( $attachment_id, Sync::META_KEYS['public_id'], true );
 
 			/*
@@ -59,6 +62,24 @@ public function check_cloudinary_version( $cloudinary_id, $attachment_id ) {
 				// Has public ID, but not  fully down synced.
 				$cloudinary_id = $public_id;
 			}
+		} else {
+			// Backwards compat.
+			$folder_sync = $this->media->get_post_meta( $attachment_id, Sync::META_KEYS['folder_sync'], true );
+			if ( 0 === strlen( $folder_sync ) ) {
+				// Does not exist, add it to be compatible with v1.2.2.
+				$public_id = $this->media->get_post_meta( $attachment_id, Sync::META_KEYS['public_id'], true );
+				// Set the folder sync to 0 to flag it by default as not synced.
+				$this->media->update_post_meta( $attachment_id, Sync::META_KEYS['folder_sync'], '0' );
+				if ( false !== strpos( $public_id, '/' ) ) {
+					$path              = pathinfo( $public_id );
+					$asset_folder      = trailingslashit( $path['dirname'] );
+					$cloudinary_folder = trailingslashit( $this->media->plugin->config['settings']['sync_media']['cloudinary_folder'] );
+					if ( $asset_folder === $cloudinary_folder ) {
+						// The asset folder matches the defined cloudinary folder, flag it as being in a folder sync.
+						$this->media->update_post_meta( $attachment_id, Sync::META_KEYS['folder_sync'], '1' );
+					}
+				}
+			}
 		}
 
 		return $cloudinary_id;