Changeset 3186406

Timestamp:

11/12/2024 10:22:29 AM (15 months ago)

Author:

sirv

Message:

Release 7.3.1

Location:

sirv/trunk

Files:

• plugdata/css/wp-options.css (modified) (2 diffs)
• plugdata/css/wp-sirv.css (modified) (1 diff)
• plugdata/htmlBuilders/elementor/SirvControl.php (modified) (1 diff)
• plugdata/includes/classes/utils.class.php (modified) (1 diff)
• plugdata/includes/classes/wc.product.helper.class.php (modified) (4 diffs)
• plugdata/includes/classes/woo.class.php (modified) (12 diffs)
• plugdata/js/wp-sirv.js (modified) (7 diffs)
• plugdata/media_library.php (modified) (1 diff)
• plugdata/submenu_pages/sync.php (modified) (4 diffs)
• readme.txt (modified) (2 diffs)
• sirv.php (modified) (27 diffs)

sirv/trunk/plugdata/css/wp-options.css

@@ -771 +771 @@
 
 .optiontable.form-table h3 {
-    margin: 0px 0 10px 0;
+    margin: 5px 0 10px 0;
 }
 
@@ -2116 +2116 @@
     height: 40px;
 }
+
+.sirv-media-lib-title{
+    padding: 0 10px !important;
+}
+.sirv-media-lib-title h3{
+    margin-bottom: 0 !important;
+}

sirv/trunk/plugdata/css/wp-sirv.css

@@ -1364 +1364 @@
     width: 100%;
 }
+
+
+.ui-tooltip {
+    padding: 8px;
+    position: absolute;
+    z-index: 99999999;
+    max-width: 400px;
+    background-color: white !important;
+    background-image: none;
+}
+
+.sirv-ui-widget-content {
+    border: none;
+    background-image: none;
+}
+
+/* Corner radius */
+.sirv-ui-corner-all {
+    border-radius: 3px;
+}
+
+.sirv-ui-widget-shadow {
+    box-shadow: 0px 0px 5px #666666 !important;
+}

sirv/trunk/plugdata/htmlBuilders/elementor/SirvControl.php

@@ -26 +26 @@
         wp_register_style( 'sirv_mce_style', SIRV_PLUGIN_SUBDIR_URL_PATH . 'css/wp-sirv-shortcode-view.css' );
         wp_enqueue_style('sirv_mce_style');
-        wp_register_script( 'sirv_logic', SIRV_PLUGIN_SUBDIR_URL_PATH . 'js/wp-sirv.js', array( 'jquery', 'jquery-ui-sortable, sirv_toast_js' ), false);
+        wp_register_script( 'sirv_logic', SIRV_PLUGIN_SUBDIR_URL_PATH . 'js/wp-sirv.js', array( 'jquery','jquery-ui-core', 'jquery-ui-sortable', 'jquery-ui-tooltip', 'sirv_toast_js' ), false);
         wp_localize_script( 'sirv_logic', 'sirv_ajax_object', array(
             'ajaxurl' => admin_url( 'admin-ajax.php' ),

sirv/trunk/plugdata/includes/classes/utils.class.php

@@ -103 +103 @@
   public static function get_file_extension($filepath){
     return pathinfo($filepath, PATHINFO_EXTENSION);
+  }
+
+
+  public static function parse_html_tag_attrs($html_data){
+  $tag_metadata = array();
+
+  if ( ! empty($html_data) ) {
+    preg_match_all('/\s(\w*)=\"([^"]*)\"/ims', $html_data, $matches_tag_attrs, PREG_SET_ORDER);
+    $tag_metadata = self::convert_matches_to_assoc_array($matches_tag_attrs);
+  }
+
+  return $tag_metadata;
+}
+
+
+  public static function convert_matches_to_assoc_array($matches){
+    $assoc_array = array();
+
+    for ($i=0; $i < count($matches); $i++) {
+      $assoc_array[$matches[$i][1]] = $matches[$i][2];
+    }
+
+    return $assoc_array;
+  }
+
+
+  public static function join_tag_attrs($tag_metadata, $skip_attrs = array()){
+    $tag_attrs = array();
+
+    foreach ($tag_metadata as $attr_name => $value) {
+      if( in_array($attr_name, $skip_attrs) ) continue;
+
+      $tag_attrs[] = $attr_name . '="' . $value . '"';
+    }
+
+    return implode(' ', $tag_attrs);
+  }
+
+
+
+  public static function get_sirv_item_info($sirv_url){
+    $context = stream_context_create(array('http' => array('method' => "GET")));
+    $sirv_item_metadata = @json_decode(@file_get_contents($sirv_url . '?info', false, $context));
+
+    return empty($sirv_item_metadata) ? false : $sirv_item_metadata;
+  }
+
+
+  public static function build_html_tag($tag_name, $tag_metadata, $skip_attrs = array()){
+    $tag_attrs = self::join_tag_attrs($tag_metadata, $skip_attrs);
+
+    return '<' . $tag_name . ' ' . $tag_attrs . '>';
   }
 

sirv/trunk/plugdata/includes/classes/wc.product.helper.class.php

@@ -26 +26 @@
         "_wp_attachment_image_alt" => preg_replace('/\.[^.]+$/', '', basename($sirv_url)),
         "sirv_woo_product_image_attachment" => $sirv_url,
-        "_wp_attachment_metadata" => self::get_sirv_item_metadata($sirv_url, $sirv_item_type_data['sirv_type']),
+        "_wp_attachment_metadata" => self::get_sirv_item_metadata($sirv_url, $sirv_item_type_data),
       ),
     );
@@ -41 +41 @@
 
   public static function get_sirv_item_type($sirv_url){
-    $sirv_type = array("sirv_type" => '');
+    $sirv_type = array("type" => '', "ext" => '', "mime_type" => '');
 
-    $filetype = wp_check_filetype(basename($sirv_url), null);
+    $filetype = wp_check_filetype(basename($sirv_url));
 
-    if( !empty($filetype) && !empty($filetype['type'])){
+    if( !empty($filetype['type']) ){
       $sirv_type['ext'] = $filetype['ext'];
-      $sirv_type['type'] = $filetype['type'];
+      $sirv_type['mime_type'] = $filetype['type'];
       list($type, $ext) = explode('/', $filetype['type']);
       switch ($type) {
         case 'sirv':
-          if($ext == 'spin') $sirv_type['sirv_type'] = 'spin';
+          if($ext == 'spin') $sirv_type['type'] = 'spin';
           break;
 
         default:
-          $sirv_type['sirv_type'] = $type;
+          $sirv_type['type'] = $type;
           break;
       }
+    }else{
+      $sirv_type['ext'] = pathinfo($sirv_url, PATHINFO_EXTENSION);
     }
 
@@ -64 +66 @@
 
 
-  protected static function get_sirv_item_metadata($sirv_url, $sirv_item_type){
+  protected static function get_sirv_item_metadata($sirv_url, $sirv_item_type_data){
 
-    $sirv_metadata = array("sirv_type" => $sirv_item_type);
-
+    $sirv_metadata = array("sirv_type" => '');
     $allow_dimensions_types = array('image', 'video');
 
-    if( in_array($sirv_item_type, $allow_dimensions_types) ){
-      $string_metadata = @file_get_contents($sirv_url . '?info');
+    $sirv_item_metadata = Utils::get_sirv_item_info($sirv_url);
 
-      if( !empty($string_metadata)){
-        $metadata = json_decode($string_metadata, true);
+    if ( $sirv_item_type_data['type'] ) {
+      $sirv_metadata["sirv_type"] = $sirv_item_type_data['type'];
+    } else {
+      if( $sirv_item_metadata ){
+        if (isset($sirv_item_metadata->original->File->MIMEType)) {
+          $sirv_metadata['sirv_type'] = explode('/', $sirv_item_metadata->original->File->MIMEType)[0];
+        }
 
+        if (isset($sirv_item_metadata->layers)) {
+          $sirv_metadata['sirv_type'] = 'spin';
+        }
+      }else{
+        $sirv_metadata['sirv_type'] = 'image';
+      }
 
-        if (isset($metadata['original']['width'])) $sirv_metadata['width'] = $metadata['original']['width'];
-        if (isset($metadata['original']['height'])) $sirv_metadata['height'] = $metadata['original']['height'];
+    }
+
+    if( in_array($sirv_metadata['sirv_type'], $allow_dimensions_types) ){
+
+      if( !empty($sirv_item_metadata)){
+
+        if ( isset($sirv_item_metadata->original->width) ) $sirv_metadata['width'] = $sirv_item_metadata->original->width;
+        if ( isset($sirv_item_metadata->original->height) ) $sirv_metadata['height'] = $sirv_item_metadata->original->height;
       }
     }else{
@@ -89 +106 @@
     }
 
-    $filesize = self::get_filesize($sirv_url, $sirv_item_type);
+    $filesize = self::get_filesize($sirv_url, $sirv_metadata['sirv_type'])  ;
 
     if( !empty($filesize) ) $sirv_metadata['filesize'] = $filesize;

sirv/trunk/plugdata/includes/classes/woo.class.php

@@ -40 +40 @@
         $cached_data = self::get_post_sirv_data($id, '_sirv_woo_viewf_data');
         $prod_path = $this->getProductPath($id, $isVariation);
-        $headers = $this->get_HEAD_request($prod_path . '.view');
+        //$headers = $this->get_HEAD_request($prod_path . '.view');
+        $headers = Utils::get_head_request($prod_path . '.view');
         if ((!isset($cached_data->file_version) && isset($headers['X-File-VersionId'])) || (isset($headers['X-File-VersionId']) && $cached_data->file_version !== $headers['X-File-VersionId'])) {
 
@@ -322 +323 @@
       <div class="sirv-woo-gallery-toolbar hide-if-no-js">
         <div class="sirv-woo-gallery-toolbar-main">
-          <a class="button button-primary button-large sirv-woo-add-media" data-type="<?php echo $type; ?>" data-id="<?php echo $id; ?>">Add Sirv Media</a>
-          <a class="button button-primary button-large sirv-woo-add-online-video" data-id="<?php echo $id; ?>">Add Online Video</a>
+          <a class="button button-primary button-large sirv-woo-add-media" data-type="<?php echo $type; ?>" data-id="<?php echo $id; ?>">Add Sirv media</a>
+          <a class="button button-primary button-large sirv-woo-add-online-video" data-id="<?php echo $id; ?>">Add online video</a>
         </div>
         <div class="sirv-add-online-videos-container" id="sirv-add-online-videos-container_<?php echo $id; ?>">
@@ -400 +401 @@
     if (!isset($sirv_remote_data->items)) $sirv_remote_data->items = array();
 
+    $sirv_data = $this->merge_object_data($sirv_local_data->items, $sirv_remote_data->items, true);
+
     $main_product_image_data = $this->get_main_image($this->product_id);
-
-    $sirv_data = $this->merge_object_data($sirv_local_data->items, $sirv_remote_data->items, true);
 
     $wc_gallery = $this->parse_wc_gallery($this->product_id);
@@ -413 +414 @@
 
     return $html;
+  }
+
+
+  protected function get_sirv_items_data($isVariation){
+    $sirv_local_data = (object) $this->get_sirv_local_data($this->product_id);
+    $sirv_remote_data = (object) $this->get_sirv_remote_data($this->product_id, $isVariation);
+
+    if (!isset($sirv_local_data->items)) $sirv_local_data->items = array();
+    if (!isset($sirv_remote_data->items)) $sirv_remote_data->items = array();
+
+    return $this->merge_object_data($sirv_local_data->items, $sirv_remote_data->items, true);
+  }
+
+
+  public function get_export_data_to_csv_column($isVariation){
+    $sirv_gallery = $this->get_sirv_items_data($isVariation);
+    $sirv_item_urls = array();
+
+    if( !$isVariation && $this->isSirvProductImage($this->product_id) ){
+        $sirv_main_image_url = self::get_post_sirv_data($this->product_id, 'sirv_woo_product_image', false, false);
+
+        if( $sirv_main_image_url ){
+          $sirv_item_urls[] = $sirv_main_image_url;
+        }
+    }
+
+    foreach ($sirv_gallery as $sirv_item) {
+      $sirv_item_urls[] = $sirv_item->url;
+    }
+
+    return implode(", ", $sirv_item_urls);
   }
 
@@ -550 +582 @@
   protected function get_HEAD_request($url)
   {
-    //TODO: use curl to get HEAD request.
-    $default_stream = stream_context_get_default();
-    $default_stream_options = stream_context_get_options($default_stream);
-
-    stream_context_set_default(
+
+    $context = stream_context_create(
       array(
         'http' => array(
@@ -562 +591 @@
     );
 
-    $headers = get_headers($url, true);
-
-    stream_context_set_default(array());
+    $headers = get_headers($url, true, $context);
 
     return $headers;
@@ -746 +773 @@
   protected function get_product_sku($product_id)
   {
-    $product = new WC_Product($product_id);
-    $sku = $product->get_sku();
-    $sku = empty($sku) ? 'error-no-sku' : $sku;
+    try{
+      $product = new WC_Product($product_id);
+      $sku = $product->get_sku();
+      $sku = empty($sku) ? 'error-no-sku' : $sku;
+    }catch(Exception $e){
+      $sku = 'error-no-sku';
+    }
 
     return $sku;
@@ -974 +1005 @@
     $sirv_remote_variation = $this->get_sirv_remote_data($variation_id, true);
 
-    if (!empty($sirv_local_variation->items) && !empty($sirv_remote_variation->items)) {
+    $sirv_local_variation = $this->fix_item_viewIds($variation_id, $sirv_local_variation);
+
+
+    if (!empty($sirv_local_variation->items) && !empty($sirv_remote_variation)) {
       $variation_data = $this->merge_object_data($sirv_local_variation->items, $sirv_remote_variation->items, true);
     } else {
@@ -989 +1023 @@
 
     return $variation_data;
+  }
+
+
+  function fix_item_viewIds($currnet_item_id, $sirv_variation_data){
+    if( !empty($sirv_variation_data->items) && $sirv_variation_data->items[0]->viewId !== $currnet_item_id){
+      foreach($sirv_variation_data->items as $item){
+        $item->viewId = $currnet_item_id;
+      }
+      $sirv_variation_data->id = $currnet_item_id;
+    }
+
+    return $sirv_variation_data;
   }
 
@@ -1209 +1255 @@
   }
 
-  protected function remove_script_tag($string)
+  public function remove_script_tag($string)
   {
     return preg_replace('/<(\/)*script.*?>/im', '', $string);
@@ -1419 +1465 @@
     $isCaption = false;
 
-    $mv_custom_options = $this->remove_script_tag(get_option('SIRV_WOO_MV_CUSTOM_OPTIONS'));
-    $mv_custom_options_block = !empty($mv_custom_options) ? '<script nowprocket>' . $mv_custom_options . '</script>' . PHP_EOL : '';
+    /* $mv_custom_options = $this->remove_script_tag(get_option('SIRV_WOO_MV_CUSTOM_OPTIONS'));
+    $mv_custom_options_block = !empty($mv_custom_options) ? '<script nowprocket>' . $mv_custom_options . '</script>' . PHP_EOL : ''; */
 
     $mv_custom_css = get_option('SIRV_WOO_MV_CUSTOM_CSS');
@@ -1484 +1530 @@
     $json_data_block = '<div style="display: none;" ' . $data_item_by_variation_id . 'data-existings-ids=\'' . json_encode($existings_ids, JSON_HEX_QUOT | JSON_HEX_APOS) . '\' id="sirv-woo-gallery_data_' . $this->product_id . '" data-is-caption="' . $isCaption . '"></div>' . PHP_EOL;
 
-    return $json_data_block . '<div class="Sirv' . $opacityClass . '" id="sirv-woo-gallery_' . $this->product_id . '"' . $this->render_viewer_options($viewer_options) . '>' . PHP_EOL . $items_html . '</div>' . PHP_EOL . $mv_custom_options_block . $mv_custom_css . $max_height_style;
+    return /* $mv_custom_options_block . PHP_EOL .  */$json_data_block . '<div class="Sirv' . $opacityClass . '" id="sirv-woo-gallery_' . $this->product_id . '"' . $this->render_viewer_options($viewer_options) . '>' . PHP_EOL . $items_html . '</div>' . PHP_EOL. $mv_custom_css . $max_height_style;
   }
 

sirv/trunk/plugdata/js/wp-sirv.js

@@ -794 +794 @@
                     meta.main = formatVideoDuration(data.meta.duration);
                     break;
+                case 'model':
+                    meta.main = shortDate;
+                    break;
 
                 default:
@@ -1889 +1892 @@
             let groupedImages = groupedFiles(files, maxFileSize, maxFilesCount, sirvFileSizeLimit);
             let countFiles = files.length;
-
             //let currentDir = htmlDecode($('#filesToUpload').attr('data-current-folder'));
             let currentDir = getCurrentDir(hasLastSlash = true);
@@ -1966 +1968 @@
                 let fileItem = overSizedImages[index];
                 let reader = new FileReader();
+
                 uploadImageByChunk(fileItem, 0, reader, 1, totalOverSizedFiles, currentDir);
             }
@@ -1989 +1992 @@
                 data.append('action', 'sirv_upload_file_by_chunks');
                 data.append("_ajax_nonce", sirv_ajax_object.ajaxnonce);
-                data.append("filename", file.name);
+                //data.append("filename", file.name);
+                data.append("filename", fileItem.fullPath);
                 data.append('totalParts', totalSlices);
                 data.append('totalFiles', totalOverSizedFiles);
@@ -2024 +2028 @@
 
                             if(!!json_res.error){
+                                toastr.error(`Error: ${json_res.error}`, "", {preventDuplicates: true, timeOut: 5000, positionClass: "toast-top-center"});
+                            }
+
+                            if(!!json_res.critical_error){
                                 $(".sirv-upload-ajax").hide();
-                                toastr.error(`Error: ${json_res.error}`, "", {preventDuplicates: true, timeOut: 4000, positionClass: "toast-top-center"});
+                                toastr.error(`Error: ${json_res.error}`, "", {preventDuplicates: true, timeOut: 5000, positionClass: "toast-top-center"});
                                 getContentFromSirv(window.sirvGetPath);
                                 return;
-                            }
-
-                            if ( nextSlice < file.size ) {
-                                uploadImageByChunk(fileItem, nextSlice, reader, partNum + 1, totalOverSizedFiles, currentDir);
                             }
 
@@ -2039 +2043 @@
                                 realRequestSize = 0;
                             }
+
+                            if ( nextSlice < file.size ) {
+                                uploadImageByChunk(fileItem, nextSlice, reader, partNum + 1, totalOverSizedFiles, currentDir);
+                            }
+
                         }
                     },
@@ -3873 +3882 @@
         getPhpFilesLimitations();
 
+        $(document).tooltip({
+            classes:{
+                "ui-tooltip": "sirv-ui-widget-content sirv-ui-corner-all sirv-ui-widget-shadow",
+            },
+            show: false,
+            hide: false,
+            position: {
+                my: "left bottom-25",
+                at: "left bottom",
+                collision: "flipfit",
+            },
+        });
+
         if($('.sirv-items-container').length > 0) getContentFromSirv();
 

sirv/trunk/plugdata/media_library.php

@@ -26 +26 @@
         wp_enqueue_style('sirv_style');
 
-        wp_enqueue_script( 'sirv_logic', plugins_url('js/wp-sirv.js', __FILE__), array( 'jquery', 'jquery-ui-sortable', 'sirv_toast_js' ), false);
+        wp_enqueue_script( 'sirv_logic', plugins_url('js/wp-sirv.js', __FILE__), array( 'jquery', 'jquery-ui-core', 'jquery-ui-sortable', 'jquery-ui-tooltip', 'sirv_toast_js' ), false);
         wp_localize_script( 'sirv_logic', 'sirv_ajax_object', array(
             'ajaxurl' => admin_url( 'admin-ajax.php' ),

sirv/trunk/plugdata/submenu_pages/sync.php

@@ -22 +22 @@
     </tr>
     <tr>
-      <td>
-        <h2>WordPress media</h2>
+      <td class="sirv-media-lib-title">
+        <h3>Your WordPress media library</h3>
       </td>
     </tr>
@@ -42 +42 @@
           </div>
           <div class="sirv-calc-library-size-view-column sirv-calc-library-size-view-data">
-            <div class="sirv-calc-library-size-show-analizing"><span class="sirv-traffic-loading-ico"></span>Analizing...<span class="sirv-calc-library-size-analizing-progress">0%</span></div>
+            <div class="sirv-calc-library-size-show-analizing"><span class="sirv-traffic-loading-ico"></span>Analizing...&nbsp<span class="sirv-calc-library-size-analizing-progress">0%</span></div>
             <div class="sirv-calc-media-size-data">
               <span class="sirv-calc-media-size-approx_symbol"><?php echo $approximately_symbol; ?></span>
@@ -71 +71 @@
     <tr>
       <td colspan="2">
-        <h3>Status</h3>
-        <p class="sirv-options-desc">Images are copied to Sirv the first time they are viewed, which can take 1-2 seconds per image. To perform a full synchronization now, click Sync images:</p>
+        <h3>Sync to Sirv</h3>
+        <p class="sirv-options-desc">Your images will automatically copy to Sirv the first time they're viewed. This usually takes 1-2 seconds per image.</p>
       </td>
     </tr>
@@ -204 +204 @@
             <span class="sirv-traffic-loading-ico" style="display: none;"></span>
           </div>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <p>You can pre-sync all images to Sirv. This will remove the 1-2 second delay the first time an image is requested.</p>
         </td>
       </tr>

sirv/trunk/readme.txt

@@ -5 +5 @@
 Requires PHP: 5.6
 Requires at least: 3.0.1
-Tested up to: 6.6
+Tested up to: 6.7
 Stable tag: trunk
 License: GPLv2 or later
@@ -240 +240 @@
 == Changelog ==
 
+= 7.3.1 (2024-11-12) =
+* Tested with the latest WordPress version 6.7.
+* Improved security for uploading large images.
+* Improved integration with WooCommerce variation images.
+* Improved detection of media uploaded to Sirv folders.
+* Improved loading of custom Sirv JS global options.
+* Improved design of the Synchronization tab.
+* Fixed issue with incorrect initialization of Advanced Editor Tools (TinyMCE plugin).
+* Many small fixes and optimizations.
+
 = 7.3.0 (2024-10-03) =
 * Improved plugin security.

sirv/trunk/sirv.php

@@ -5 +5 @@
  * Plugin URI: http://sirv.com
  * Description: Fully-automatic image optimization, next-gen formats (WebP), responsive resizing, lazy loading and CDN delivery. Every best-practice your website needs. Use "Add Sirv Media" button to embed images, galleries, zooms, 360 spins and streaming videos in posts / pages. Stunning media viewer for WooCommerce. Watermarks, text titles... every WordPress site deserves this plugin! <a href="admin.php?page=sirv/data/options.php">Settings</a>
- * Version:           7.3.0
+ * Version:           7.3.1
  * Requires PHP:      5.6
  * Requires at least: 3.0.1
@@ -16 +16 @@
 
 
-define('SIRV_PLUGIN_VERSION', '7.3.0');
+define('SIRV_PLUGIN_VERSION', '7.3.1');
 define('SIRV_PLUGIN_DIR', 'sirv');
 define('SIRV_PLUGIN_SUBDIR', 'plugdata');
@@ -121 +121 @@
 
 
+//filters for export products woo feature
+add_filter('woocommerce_product_export_column_names', 'sirv_add_column_to_export_csv');
+add_filter('woocommerce_product_export_product_default_columns', 'sirv_add_column_to_export_csv');
+function sirv_add_column_to_export_csv( $columns ) {
+
+    // column slug => column name
+    $columns['sirv_woo_all_urls'] = 'Sirv product media URLs';
+
+    return $columns;
+}
+
+
+// Filter you want to hook into will be: 'woocommerce_product_export_product_column_{$column_slug}'.
+add_filter('woocommerce_product_export_product_column_sirv_woo_all_urls', 'sirv_add_export_data', 10, 2);
+function sirv_add_export_data( $value, $product ) {
+  //$product_id = $product->get_id();
+  $post_type = $product->post_type;
+  $is_variation = $post_type == 'product_variation' ? true : false;
+
+  $woo = new Woo($product->get_id());
+    $value = $woo->get_export_data_to_csv_column($is_variation);
+/*   sirv_qdebug($product_id, '$product_id');
+  sirv_qdebug($value, '$value');
+
+  $value = "TEST TEST TEST"; */
+    return $value;
+}
+
+
 add_action('woocommerce_init', 'sirv_wc_init');
 function sirv_wc_init(){
@@ -264 +293 @@
 //TODO: Add posibillity to get size from html
 function sirv_variation_image_html($image_html, $product_id, $variaition_id){
-  $modified_image_html = $image_html;
+  //$modified_image_html = $image_html;
   $sirv_url = '';
 
   if ($variaition_id > 0) {
+    $image_tag_metadata = Utils::parse_html_tag_attrs($image_html);
+    $width = isset($image_tag_metadata['width']) ? $image_tag_metadata['width'] : 300;
+    $height = isset($image_tag_metadata['height']) ? $image_tag_metadata['height'] : 300;
+
     $woo = new Woo($product_id);
 
@@ -275 +308 @@
       if ($wc_variation[0]->provider == 'sirv') {
         $sirv_url = $wc_variation[0]->url;
-        $sirv_parametrized_url = sirv_get_parametrized_url($sirv_url, array(250, 250), true);
-        $modified_image_html = preg_replace('/(src=".*?")/', "src=\"$sirv_parametrized_url\"", $image_html);
+        $sirv_parametrized_url = sirv_get_parametrized_url($sirv_url, array($width, $height), true);
+        //$modified_image_html = preg_replace('/(src=".*?")/', "src=\"$sirv_parametrized_url\"", $image_html);
+        $image_tag_metadata['src'] = $sirv_parametrized_url;
       } else {
         return $image_html;
@@ -291 +325 @@
 
       if (!empty($sirv_url)) {
-        $sirv_parametrized_url = sirv_get_parametrized_url($sirv_url, array(250, 250), true);
-        $modified_image_html = preg_replace('/(src=".*?")/', "src=\"$sirv_parametrized_url\"", $image_html);
+        $sirv_parametrized_url = sirv_get_parametrized_url($sirv_url, array($width, $height), true);
+        //$modified_image_html = preg_replace('/(src=".*?")/', "src=\"$sirv_parametrized_url\"", $image_html);
+        $image_tag_metadata['src'] = $sirv_parametrized_url;
       }
-    }
-  }
-
-  return $modified_image_html;
+      //return $modified_image_html;
+      return Utils::build_html_tag('img', $image_tag_metadata, array('srcset', 'sizes', 'data-src'));
+    }
+  }
+
+    return $image_html;
 }
 
@@ -1363 +1400 @@
   wp_enqueue_style('sirv_mce_style');
 
-  wp_register_script('sirv_logic', SIRV_PLUGIN_SUBDIR_URL_PATH . 'js/wp-sirv.js', array('jquery', 'jquery-ui-sortable', 'sirv_toast_js'), false);
+  wp_register_script('sirv_logic', SIRV_PLUGIN_SUBDIR_URL_PATH . 'js/wp-sirv.js', array('jquery', 'jquery-ui-core', 'jquery-ui-sortable', 'jquery-ui-tooltip', 'sirv_toast_js'), false);
   wp_localize_script('sirv_logic', 'sirv_ajax_object', array(
     'ajaxurl' => admin_url('admin-ajax.php'),
@@ -1454 +1491 @@
       wp_register_style('sirv_mce_style', SIRV_PLUGIN_SUBDIR_URL_PATH . 'css/wp-sirv-shortcode-view.css');
       wp_enqueue_style('sirv_mce_style');
-      wp_register_script('sirv_logic', SIRV_PLUGIN_SUBDIR_URL_PATH . 'js/wp-sirv.js', array('jquery', 'jquery-ui-sortable', 'sirv_toast_js'), '1.1.0');
+      wp_register_script('sirv_logic', SIRV_PLUGIN_SUBDIR_URL_PATH . 'js/wp-sirv.js', array('jquery','jquery-ui-core', 'jquery-ui-sortable', 'jquery-ui-tooltip', 'sirv_toast_js'), '1.1.0');
       wp_localize_script('sirv_logic', 'sirv_ajax_object', array(
         'ajaxurl' => admin_url('admin-ajax.php'),
@@ -1530 +1567 @@
     wp_register_style('sirv_style', SIRV_PLUGIN_SUBDIR_URL_PATH . 'css/wp-sirv.css');
     wp_enqueue_style('sirv_style');
-    wp_enqueue_script('sirv_logic', SIRV_PLUGIN_SUBDIR_URL_PATH . 'js/wp-sirv.js', array('jquery', 'jquery-ui-sortable', 'sirv_toast_js'), false);
+    wp_enqueue_script('sirv_logic', SIRV_PLUGIN_SUBDIR_URL_PATH . 'js/wp-sirv.js', array('jquery','jquery-ui-core', 'jquery-ui-sortable', 'jquery-ui-tooltip', 'sirv_toast_js'), false);
     wp_localize_script('sirv_logic', 'sirv_ajax_object', array(
       'ajaxurl' => admin_url('admin-ajax.php'),
@@ -1571 +1608 @@
 add_filter('mce_external_plugins', 'sirv_tinyMCE_plugin_shortcode_view');
 
-function sirv_tinyMCE_plugin_shortcode_view(){
-  return array('sirvgallery' => SIRV_PLUGIN_SUBDIR_URL_PATH . 'js/wp-sirv-shortcode-view.js');
+function sirv_tinyMCE_plugin_shortcode_view($plugins){
+  $plugins['sirvgallery'] = SIRV_PLUGIN_SUBDIR_URL_PATH . 'js/wp-sirv-shortcode-view.js';
+
+  return $plugins;
 }
 
@@ -1853 +1892 @@
   $sirv_js_path = getValue::getOption('SIRV_JS_FILE');
 
+  global $post;
+
   wp_register_script('sirv-js', $sirv_js_path, array(), false, false);
   wp_enqueue_script('sirv-js');
+
+  if (isset($post->post_type) && $post->post_type == 'product') {
+    $sirv_woo_is_enable_option = get_option('SIRV_WOO_IS_ENABLE');
+    $sirv_woo_is_enable = !empty($sirv_woo_is_enable_option) && $sirv_woo_is_enable_option == '2' ? true : false;
+    if( $sirv_woo_is_enable ){
+      $woo = new Woo($post->ID);
+      $mv_custom_options = $woo->remove_script_tag(get_option('SIRV_WOO_MV_CUSTOM_OPTIONS'));
+
+      wp_add_inline_script('sirv-js', $mv_custom_options, 'after');
+    }
+  }
 }
 
@@ -1896 +1948 @@
         $sirv_js_path = getValue::getOption('SIRV_JS_FILE');
 
+        global $post;
+
+        $mv_custom_options_block = '';
+
+        if (isset($post->post_type) && $post->post_type == 'product') {
+          $sirv_woo_is_enable_option = get_option('SIRV_WOO_IS_ENABLE');
+          $sirv_woo_is_enable = !empty($sirv_woo_is_enable_option) && $sirv_woo_is_enable_option == '2' ? true : false;
+          if ($sirv_woo_is_enable) {
+            $woo = new Woo($post->ID);
+            $mv_custom_options = $woo->remove_script_tag(get_option('SIRV_WOO_MV_CUSTOM_OPTIONS'));
+            $mv_custom_options_block = !empty($mv_custom_options) ?  PHP_EOL . '<script nowprocket>' . PHP_EOL . $mv_custom_options . PHP_EOL . '</script>' . PHP_EOL : '';
+
+          }
+        }
+
         if(preg_match($link_prefetch_pattern, $content) === 1){
-          $content = preg_replace($link_prefetch_pattern, '$1<script src="' . $sirv_js_path . '"></script>', $content, 1);
+          $content = preg_replace($link_prefetch_pattern,  '$1'. PHP_EOL .'<script src="' . $sirv_js_path . '"></script>'. $mv_custom_options_block, $content, 1);
         }else{
           $content = preg_replace('/(<\/head>)/is', '<script src="' . $sirv_js_path . '"></script>$1', $content, 1);
@@ -2029 +2096 @@
   $url = wp_get_attachment_url($attachment_id);
 
+  if( !$url ) return false;
+
   if (sirv_is_sirv_item($url)) {
     $post = get_post($attachment_id);
@@ -2078 +2147 @@
 
 function sirv_is_sirv_item($url){
-    if( empty($url) ) return false;
-    //$sirv_cdn_url = get_option('SIRV_CDN_URL');
-    $sirv_cdn_url = sirv_get_cached_cdn_url();
-    $sirv_url = empty($sirv_cdn_url) ? 'sirv.com' : $sirv_cdn_url;
-    return stripos($url, $sirv_url) !== false;
+  if( empty($url) ) return false;
+
+  //does not give 100% guarantee that this is sirv image
+  $count = substr_count($url, 'http');
+  if( $count > 1 ) return true;
+
+  //$sirv_cdn_url = get_option('SIRV_CDN_URL');
+  $sirv_cdn_url = sirv_get_cached_cdn_url();
+  $sirv_url = empty($sirv_cdn_url) ? 'sirv.com' : $sirv_cdn_url;
+  return stripos($url, $sirv_url) !== false;
   }
 
@@ -2616 +2690 @@
 
   if( empty($size)){
-    if( $sirv_item_type_data['sirv_type'] == 'video' ) return sirv_add_profile($sirv_image . "?thumbnail=500");
-    if( $sirv_item_type_data['sirv_type'] == 'spin' ) return sirv_add_profile($sirv_image . "?thumb");
+    if( $sirv_item_type_data['type'] == 'video' ) return sirv_add_profile($sirv_image . "?thumbnail=500");
+    if( $sirv_item_type_data['type'] == 'spin' ) return sirv_add_profile($sirv_image . "?thumb");
 
     return sirv_add_profile($sirv_image);
@@ -2624 +2698 @@
   $item_show_pattern = '';
 
-  if( $sirv_item_type_data['sirv_type'] == 'video' ){
+  if( $sirv_item_type_data['type'] == 'video' ){
     $image = sirv_get_correct_item_size($size, $isCrop);
     $url = $sirv_image . "?thumbnail=" . $image['width'];
     return sirv_add_profile($url);
 
-  }else if( $sirv_item_type_data['sirv_type'] == 'spin' ){
+  }else if( $sirv_item_type_data['type'] == 'spin' ){
     $item_show_pattern = "?thumb";
   }
@@ -4694 +4768 @@
 function sirv_upload_file_by_chunks_callback(){
   if (!(is_array($_POST) && isset($_POST['binPart']) && defined('DOING_AJAX') && DOING_AJAX)) {
-    return;
+    echo json_encode(array('critical_error' => 'AJAX not allowed'));
+    wp_die();
   }
 
   if (!sirv_is_allow_ajax_connect('sirv_logic_ajax_validation_nonce', 'edit_posts')) {
-    echo json_encode(array('error' => 'Access to the requested resource is forbidden'));
+    echo json_encode(array('critical_error' => 'Access to the requested resource is forbidden'));
     wp_die();
   }
 
+  $response = array();
+  $error = '';
   $is_upload_file = true;
-
   $arr_content = array();
 
@@ -4718 +4794 @@
 
   if( !$tmp_filepath ){
-    echo json_encode(array('error' => 'Can\'t create tmp file. Please check if php tmp path is correctly set.'));
+    echo json_encode(array('critical_error' => 'Can\'t create tmp file. Please check if php tmp path is correctly set'));
     wp_die();
   }
@@ -4736 +4812 @@
 
   if($partNum < $totalParts){
-    echo json_encode(array('status' => 'processing', 'stop' => false));
+    $response['status'] = 'processing';
+    $response['stop'] = false;
 
   }
@@ -4744 +4821 @@
 
     $mime_type = Utils::get_mime_type($tmp_filepath);
-
     if( in_array($mime_type, $disallowed_types) ){
       unlink($tmp_filepath);
-      delete_option($filename);
-
-      echo json_encode(array('error' => 'File type is not allowed'));
-      wp_die();
-    }
-
-    //sanitize svg file before upload
-    if (Utils::get_mime_subtype($tmp_filepath) == 'svg+xml') {
-      $is_upload_file = sirv_sanitize_svg($tmp_filepath);
-    }
-
-
-
-    if($is_upload_file){
-      $APIClient = sirv_getAPIClient();
-      $result = $APIClient->uploadImage($tmp_filepath, $sirv_path);
-
-      unlink($tmp_filepath);
-      delete_option($filename);
-    }else{
-      $filename = basename(urldecode($sirv_path));
-      $result['error'] = "SVG file $filename cannot be sanitized. Upload is forbidden";
-    }
-
-
-    if( isset($result["error"]) ){
-      echo json_encode(array('error' => $result["error"]));
-      wp_die();
-    }
+      sirv_remove_tmp_option($filename);
+
+      $error ="File $filename type is not allowed";
+    }
+
+    if( !$error ){
+      //sanitize svg file before upload
+      if ( Utils::get_mime_subtype($tmp_filepath) == 'svg+xml' ) {
+        $is_upload_file = sirv_sanitize_svg($tmp_filepath);
+      }
+
+      if( $is_upload_file ){
+        $APIClient = sirv_getAPIClient();
+        $result = $APIClient->uploadImage($tmp_filepath, $sirv_path);
+      }else{
+        $filename = basename(urldecode($sirv_path));
+        $error = "SVG file $filename cannot be sanitized. Upload is forbidden";
+      }
+
+
+      @unlink($tmp_filepath);
+      sirv_remove_tmp_option($filename);
+    }
+
 
     session_id("image-uploading-status");
@@ -4788 +4859 @@
 
     if ($arr_content['processedImage'] == $arr_content['count']){
-      echo json_encode(array('stop' => true));
+      $response['stop'] = true;
+      $response['status'] = 'done';
     }else{
-      echo json_encode(array('status' => 'processing', 'stop' => false));
-    }
-  }
-
+      $response['status'] = 'processing';
+      $response['stop'] = false;
+    }
+  }
+
+  if ($error) $response['error'] = $error;
+
+  echo json_encode($response);
   wp_die();
 }
 
 
-function sirv_get_tmp_filename($db_key){
-  $tmp_filepath = get_option($db_key);
+function sirv_get_tmp_filename($raw_option_key){
+
+  $option_key = sirv_get_tmp_option_name($raw_option_key);
+  $tmp_filepath = get_option($option_key);
 
   if( $tmp_filepath ){
@@ -4808 +4886 @@
 
   if($tmp_filepath){
-    update_option($db_key, $tmp_filepath);
+    update_option($option_key, $tmp_filepath);
   }
 
@@ -4815 +4893 @@
   return $tmp_filepath;
 
+}
+
+
+function sirv_get_tmp_option_name($filename){
+  return "SIRV_TMP_FILEPATH" . '_' . md5($filename);
+}
+
+
+function sirv_remove_tmp_option($raw_option_key){
+  $option_key = sirv_get_tmp_option_name($raw_option_key);
+  delete_option($option_key);
 }
 
@@ -5893 +5982 @@
   ); */
   $media_storage_data =  array(
-        'date' => date('\o\n F d, Y'),
+        'date' => date('\o\n F j, Y'),
         'size' => Utils::getFormatedFileSize($upload_space),
         'img_count' => $post_images_count
@@ -5953 +6042 @@
   if( in_array($stored_data['status'], array('initial', 'done', 'stopped')) ){
     $stored_data['all_images_count'] = sirv_get_all_post_images_count();
-    $stored_data['date'] = date('F d, Y');
+    $stored_data['date'] = date('F j, Y');
   }
 
@@ -6476 +6565 @@
   //if (is_admin() || $isAdmin) return;
 
+  $forbidden_actions = array('query-attachments');
+
   if (defined('DOING_AJAX') && DOING_AJAX) {
     $action = '';
@@ -6484 +6575 @@
       $action = isset($_GET['action']) ? $_GET['action'] : '';
     }
+
+    if(in_array($action, $forbidden_actions)) return;
 
     if (!empty($action) && sirv_is_frontend_ajax($action)) {