Changeset 3360514

Timestamp:

09/12/2025 12:24:15 PM (5 months ago)

Author:

sirv

Message:

Relese 8.0.2

Location:

sirv/trunk

Files:

• plugdata/css/wp-options.css (modified) (1 diff)
• plugdata/includes/classes/exclude.class.php (modified) (5 diffs)
• plugdata/js/wp-options.js (modified) (5 diffs)
• plugdata/submenu_pages/settings.php (modified) (3 diffs)
• plugdata/woo_templates/woo-product-template.php (modified) (1 diff)
• readme.txt (modified) (2 diffs)
• sirv.php (modified) (4 diffs)

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

@@ -2339 +2339 @@
     gap: 5px;
 }
+
+ul.sirv-option-folder-issues {
+    color: red;
+    margin-top: 0;
+}
+
+ul.sirv-option-folder-issues li {
+    margin-bottom: 0;
+}

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

@@ -12 +12 @@
 
     $excludeInput = get_option($excludeType);
-    if($excludeType == 'SIRV_EXCLUDE_FILES'){
+    if ( $excludeType == 'SIRV_EXCLUDE_FILES' ) {
       $currentPath = self::clearCurrentPath($currentPath);
-    } else if($excludeType == 'SIRV_EXCLUDE_RESPONSIVE_FILES'){
+    } else if ( $excludeType == 'SIRV_EXCLUDE_RESPONSIVE_FILES' ) {
         $currentPath['src'] = self::clearCurrentPath($currentPath['src']);
     }
@@ -42 +42 @@
   protected static function loop($excludePaths, $currentPath){
     for ($i=0; $i < count($excludePaths); $i++) {
-      if(! is_array($currentPath)){
-        if (self::singleCheck($excludePaths[$i], $currentPath)) return true;
-      }else{
-        if(self::multipleCheck($excludePaths[$i], $currentPath)) return true;
+      if ( ! is_array($currentPath) ) {
+        if ( self::singleCheck($excludePaths[$i], $currentPath) ) return true;
+      } else {
+        if( self::multipleCheck($excludePaths[$i], $currentPath) ) return true;
       }
     }
@@ -56 +56 @@
     $expression = self::convertExcludeStrToRegEx($excludePath);
 
+    if ( $excludePath == '/' ) return self::is_homepage($currentPath);
+
     return self::check($currentPath, $expression);
   }
@@ -62 +64 @@
   protected static function multipleCheck($excludePath, $currentPath){
     foreach ($currentPath as $attrName => $attrVal) {
-      if($attrName == 'src'){
+      if ( $attrName == 'src' ) {
         $result = self::singleCheck($excludePath, $attrVal);
-      }else if($attrName == 'class'){
+      } else if ( $attrName == 'class' ) {
         $explodedClasses = explode(" ", $attrVal);
         $result = in_array($excludePath, $explodedClasses);
-      }else{
+      } else {
         $result = $excludePath == $attrVal;
       }
 
-      if($result) return true;
+      if( $result ) return true;
     }
 
@@ -81 +83 @@
     return preg_match('/' . $expression . '/', $path) != false;
   }
+
+  public static function is_homepage($currentPath){
+    if ($currentPath == '/' || is_home() || is_front_page() ) return true;
+
+    $home_url = get_home_url();
+
+    if ( $home_url === "" || $home_url === false ) return false;
+
+    $home_url .= Utils::endsWith($home_url, '/') ? '' : '/';
+
+    $currentPathInfo = parse_url($currentPath);
+    $home_url_info = parse_url($home_url);
+
+    $checkCurrentPath = isset($currentPathInfo['query']) ? $currentPathInfo['path'] . '?' . $currentPathInfo['query'] : $currentPathInfo['path'];
+
+
+    if ( $checkCurrentPath == $home_url_info['path'] ) return true;
+
+    return false;
+  }
+
 }

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

@@ -38 +38 @@
 
         Validator.prototype.email = function(fieldValue){
-            //let regex = /^((?!\.)[\w-_.]*[^.])(@\w+)(\.\w+(\.\w+)?[^.\W])$/i;
-            //let regex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/i;
             let regex = /^[a-z0-9!#$%&'"*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'"*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$/i;
             return !regex.test(fieldValue);
@@ -63 +61 @@
             result = stringsArr.filter(function(str){return fieldValue.indexOf(str) !== -1});
             return result.length > 0;
+        }
+
+
+        Validator.prototype.url = function(fieldValue){
+            const regex = /^http(s)?:\/\//i;
+            return regex.test(fieldValue);
+        }
+
+
+        Validator.prototype.folder = function(fieldValue){
+            const regex = /^[a-zA-Z0-9\-\+\_\.\!\*\'\( \)\/\s]+$/i;
+
+            return !regex.test(fieldValue);
         }
 
@@ -811 +822 @@
         //sanitize folder name on sirv
         $('#sirv-save-options').on('submit', function () {
-            let folderOnSirv = $("[name='SIRV_FOLDER']").val();
-            let sanitizedFolderOnSirv = folderOnSirv == '' ? 'WP_' + get_current_domain() : folderOnSirv.replace(/^[\/]*(.*?)[\/]*$/ig, '$1');
-            if(sanitizedFolderOnSirv == '') sanitizedFolderOnSirv = 'WP_' + get_current_domain();
-            $("[name='SIRV_FOLDER']").val(sanitizedFolderOnSirv);
+            const folderOnSirv = $("[name='SIRV_FOLDER']").val().trim();
+            const $folderOptionIssuesBlock = $(".sirv-option-folder-issues");
+            const validator = new Validator();
+            const issues = [];
+
+            $folderOptionIssuesBlock.empty();
+
+            if(validator.invalidValidate(folderOnSirv, validator.empty)){
+                issues.push("Folder cannot be empty");
+            }
+
+            if (folderOnSirv.startsWith("/") || folderOnSirv.endsWith("/")) {
+                issues.push("Folder cannot start or end with /");
+            }
+
+            if(validator.invalidValidate(folderOnSirv, validator.url)){
+                issues.push("Folder cannot be a URL");
+            }
+
+            if (validator.invalidValidate(folderOnSirv, validator.folder)) {
+                issues.push("Folder can contain only letters, numbers, - + _ . ! * ' ( ) / or space.");
+            }
+
+            if (issues.length > 0) {
+                showInputIssues($folderOptionIssuesBlock, issues);
+
+                return false
+            }
+
+            /* let sanitizedFolderOnSirv = folderOnSirv == '' ? 'WP_' + get_current_domain() : folderOnSirv.replace(/^[\/]*(.*?)[\/]*$/ig, '$1');
+            if(sanitizedFolderOnSirv == '') sanitizedFolderOnSirv = 'WP_' + get_current_domain(); */
+            $("[name='SIRV_FOLDER']").val(folderOnSirv);
 
             return true;
         });
+
+        //event listener for option sirv-text-to-input-option-text-cancel
+        $(document).on('sirv-text-to-input-option-text-cancel', function(e) {
+            const id = e.detail.id;
+
+            switch (id) {
+                case "foldername":
+                    $(".sirv-option-folder-issues").empty();
+                    $(".sirv-warning-on-folder-change").addClass("sirv-hide");
+                    break;
+
+                default:
+                    break;
+            }
+        });
+
+
+        function showInputIssues(element, issues) {
+            const documentFragment = $(document.createDocumentFragment());
+
+            issues.forEach(issue => {
+                documentFragment.append($(`<li>${issue}</li>`));
+            });
+
+            element.append(documentFragment);
+        }
 
 
@@ -855 +920 @@
 
             const $button = $(this);
+            const id = $button.attr('data-id') || "";
             const type = $button.attr('data-type')
             const $showValuePart = $(this).parent().find('.sirv-text-to-input-option-text-part');
@@ -873 +939 @@
                 $showValuePart.show();
                 $inputValuePart.hide();
+
+                if (id){
+                    document.dispatchEvent(
+                        new CustomEvent('sirv-text-to-input-option-text-cancel', {
+                            detail: {
+                                id
+                            },
+                        })
+                    );
+                }
             }
         }

sirv/trunk/plugdata/submenu_pages/settings.php

@@ -70 +70 @@
           <?php
           if ($is_accountInfo_muted) {
-            //$domains_mute_message = 'Option is disabled due to exceeding API usage rate limit. Refresh this page in <b>' . Utils::get_minutes(sirv_get_mute_expired_at($accountInfoEndpoint)) . ' minutes</b>';
             $domains_mute_message = 'You\'ve exceeded your hourly API limit. This option is temporarily inaccessible for <b>' . Utils::get_minutes(sirv_get_mute_expired_at($accountInfoEndpoint)) . ' minutes</b>. Please try again after that or inform the <a href="https://sirv.com/help/support/#support" target="_blank">Sirv support team</a> if you keep seeing this message.';
             echo '<div class="sirv-message-container">' . Utils::showMessage($domains_mute_message, 'warning') . '</div>';
@@ -90 +89 @@
             ?>
           </select>
+
+          <?php if ($is_accountInfo_muted || count($domains) <= 1) { ?>
+            <input type="hidden" id="sirv_choose_domain" name="SIRV_CDN_URL" value="<?php echo $sirvCDNurl; ?>">
+          <?php } ?>
+
         </td>
       </tr>
@@ -114 +118 @@
                   type="text"
                   style="min-width: auto;"
-                  placeholder="<?php echo htmlspecialchars($sirv_folder); ?>"
+                  placeholder="e.g. WordPress or WP/media"
                   value="<?php echo htmlspecialchars($sirv_folder); ?>"
-                  name="SIRV_FOLDER" data-restore-value="<?php echo htmlspecialchars($sirv_folder); ?>"
-                >
+                  name="SIRV_FOLDER" data-restore-value="<?php echo htmlspecialchars($sirv_folder); ?>">
               </div>
-              <a class="sirv-option-edit" href="#" data-type="render">Change</a>
+              <a class="sirv-option-edit" href="#" data-type="render" data-id="foldername">Change</a>
             </div>
           </div>
+          <ul class="sirv-option-folder-issues"></ul>
           <div class="sirv-push-message-container sirv-push-message-warning sirv-hide sirv-warning-on-folder-change">
             <div class="sirv-push-message sirv-push-message-warning-icon">

sirv/trunk/plugdata/woo_templates/woo-product-template.php

@@ -5 +5 @@
  * This template for displaying Sirv Media Viewer in WC product pages
  *
- * @version 9.0.0
+ * @version 9.7.0
  */
 

sirv/trunk/readme.txt

@@ -6 +6 @@
 Requires at least: 3.0.1
 Tested up to: 6.8.2
-Stable tag: 8.0.1
+Stable tag: 8.0.2
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
@@ -224 +224 @@
 == Changelog ==
 
+= 8.0.2 (2025-09-12) =
+* Fixed issue with incorrect display of "Folder name on Sirv".
+* Added validation for option "Folder name on Sirv".
+* Added option to use "/" to exclude home page from image replacement.
+
 = 8.0.1 (2025-08-11) =
 * Fixed issue that could prevent "Folder name on Sirv" from working.

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:           8.0.1
+ * Version:           8.0.2
  * Requires PHP:      5.6
  * Requires at least: 3.0.1
@@ -16 +16 @@
 
 
-define('SIRV_PLUGIN_VERSION', '8.0.1');
+define('SIRV_PLUGIN_VERSION', '8.0.2');
 define('SIRV_PLUGIN_DIR', 'sirv');
 define('SIRV_PLUGIN_SUBDIR', 'plugdata');
@@ -2024 +2024 @@
   $exclude_str = '';
 
-  if(!empty($new_data)){
+  if( !empty($new_data) ){
     $data = Exclude::parseExcludePaths($new_data);
     $home_url = home_url();
@@ -6069 +6069 @@
 
   $email = trim(strtolower($_POST['email']));
-  $alias = $_POST['sirv_account'];
+  $account_token = $_POST['sirv_account'];
 
   $sirvAPIClient = sirv_getAPIClient();
 
-  if ( !empty($alias) ) {
-    $response = $sirvAPIClient->setupClientCredentials($alias);
+  if ( !empty($account_token) ) {
+    $response = $sirvAPIClient->setupClientCredentials($account_token);
     if ( $response['status'] ) {
       update_option('SIRV_ACCOUNT_EMAIL', sanitize_email($email));