Merge pull request #16 from gumlet/new-version

New version release

Author: akbansa

changelog.txt

@@ -1,8 +1,10 @@
 == Changelog ==
 
-= 1.3.20 =
-* Added control to disable resizing images.
+= 1.4.0 =
+* Advanced setting: Auto Resize (auto_resize). When disabled, img src is set directly to the Gumlet URL instead of the placeholder pixel (no viewport-based resize via gumlet.js for those tags).
+* Fix DOM parsing for img/source tags: do not entity-encode the whole tag before loadHTML (was preventing any img from being found).
 * Support SVG URLs in replace_image_url.
+* Normalize JSON-style escapes in fragments (wp_unslash, \/) before parsing.
 
 = 1.3.19 =
 * Fix fatal errors related to PHP 8.4 compatibility.

gumlet.php

@@ -11,7 +11,7 @@
  * Plugin Name: Gumlet
  * Plugin URI:  https://github.com/gumlet/wordpress-plugin
  * Description: A WordPress plugin to automatically load all your existing (and future) WordPress images via the <a href="http://www.gumlet.com" target="_blank">Gumlet</a> service for smaller, faster, and better looking images.
- * Version:     1.3.20
+ * Version:     1.4.0
  * Author:      Gumlet
  * Text Domain: gumlet
  * Author URI:  https://www.gumlet.com
@@ -30,6 +30,7 @@
 
 include('includes/compability.php');
 include('includes/logger.php');
+include('includes/gumlet-html-fragment.php');
 include('includes/class-gumlet.php');
 include('includes/options-page.php');
 
@@ -51,7 +52,7 @@ function gumlet_plugin_activate()
 {
     // plugin activation code here...
     if (!get_option('gumlet_settings')) {
-        update_option('gumlet_settings', ["lazy_load" => 1, "original_images" => 1, "auto_compress"=> 1, "server_webp"=> 0]);
+        update_option('gumlet_settings', ["lazy_load" => 1, "original_images" => 1, "auto_compress"=> 1, "server_webp"=> 0, "auto_resize" => 1]);
     }
 }
 

includes/class-gumlet.php

@@ -161,7 +161,7 @@ protected function isWelcome()
 
     public function enqueue_script()
     {
-        if (!empty($this->options['cdn_link']) && $this->isWelcome()) {
+        if (!empty($this->options['cdn_link']) && $this->isWelcome() && $this->is_auto_resize_enabled()) {
             if (isset($this->options['external_cdn_link'])) {
                 $external_cdn_host = parse_url($this->options['external_cdn_link'], PHP_URL_HOST);
             }
@@ -247,6 +247,16 @@ public function get_option($key, $default = null)
         return array_key_exists($key, $this->options) ? $this->options[$key] : $default;
     }
 
+    /**
+     * Auto Resize: placeholder + gumlet.js viewport sizing. When false, src is set to the Gumlet URL and gumlet.js is not loaded.
+     *
+     * @return bool
+     */
+    protected function is_auto_resize_enabled()
+    {
+        return (int) $this->get_option('auto_resize', 1) === 1;
+    }
+
     /**
      * Override options from settings.
      * Used in unit tests.
@@ -275,7 +285,7 @@ public function replace_image_url($url)
                 && ($parsed_url['host'] === parse_url(home_url('/'), PHP_URL_HOST) 
                 || (isset($this->options['external_cdn_link']) && ! empty($this->options['external_cdn_link']) 
                 && strpos($this->options['external_cdn_link'], $parsed_url['host']) !== false))
-                && preg_match('/\.(jpg|jpeg|png|gif|svg)$/i', $parsed_url['path'])
+                && preg_match('/\.(jpg|jpeg|png|gif|svg|webp)$/i', $parsed_url['path'])
             ) 
             {
                 $cdn = parse_url($this->options['cdn_link']);
@@ -296,7 +306,6 @@ public function replace_image_url($url)
                 }
                 $url = http_build_url($parsed_url);
                 $url = add_query_arg($this->get_global_params(), $url);
-                $this->logger->log("URL:", $url);
             }
         }
         return $url;
@@ -546,7 +555,7 @@ public function replace_src_in_imgtag($matches, $content, $gumlet_host, $going_t
     {
         $this->logger->log("Matched regex:", $matches);
         foreach ($matches[0] as $unconverted_img_tag) {
-            $this->logger->log("Processing img:", $unconverted_img_tag);
+            $this->logger->log('Processing img: ' . $unconverted_img_tag);
 
             try {
                 $doc = new DOMDocument();
@@ -616,20 +625,28 @@ public function replace_src_in_imgtag($matches, $content, $gumlet_host, $going_t
                 }
 
                 if (parse_url($src, PHP_URL_HOST) == $going_to_be_replaced_host || parse_url($src, PHP_URL_HOST) == $gumlet_host || !parse_url($src, PHP_URL_HOST)) {
-                    $imageTag->setAttribute("data-gmsrc", $src);
-                    $imageTag->setAttribute("src", plugins_url('assets/images/pixel.png', __DIR__));
+                    $gumlet_url = $this->replace_image_url($src);
+                    $auto_resize_on = $this->is_auto_resize_enabled();
+
+                    if ($auto_resize_on) {
+                        $imageTag->setAttribute("data-gmsrc", $gumlet_url);
+                        $imageTag->setAttribute("src", plugins_url('assets/images/pixel.png', __DIR__));
+                    } else {
+                        $imageTag->setAttribute("src", $gumlet_url);
+                        $imageTag->removeAttribute("data-gmsrc");
+                    }
                     $imageTag->removeAttribute("srcset");
                     $imageTag->removeAttribute("data-src");
                     $imageTag->removeAttribute("data-srcset");
                     $imageTag->removeAttribute("data-lazy-srcset");
                     $imageTag->removeAttribute("data-lazy-src");
 
-                    if (strpos($imageTag->getAttribute("class"), "wp-post-image") !== false && $imageTag->getAttribute("data-large_image_width") != '') {
-                        $imageTag->setAttribute("data-src", $src);
+                    if ($auto_resize_on && strpos($imageTag->getAttribute("class"), "wp-post-image") !== false && $imageTag->getAttribute("data-large_image_width") != '') {
+                        $imageTag->setAttribute("data-src", $gumlet_url);
                     }
 
                     $new_img_tag = $doc->saveHTML($imageTag);
-                    $this->logger->log("New img tag:", $new_img_tag);
+                    $this->logger->log('New img tag: ' . $new_img_tag);
                     $content = str_replace($unconverted_img_tag, $new_img_tag, $content);
                 } else {
                     $this->logger->log("Skipping due to mismatched host to be replaced.");
@@ -741,15 +758,16 @@ public function replace_src_in_css($matches,$content,$going_to_be_replaced_host,
     }
 
     /**
-     * Convert img tag to UTF-8 encoding.
+     * Prepare a matched tag for DOMDocument::loadHTML.
+     *
+     * Do not entity-encode the whole fragment: htmlspecialchars turns `<img` into `&lt;img`,
+     * so libxml never produces an img node (getElementsByTagName('img') stays empty).
      *
      * @param  string $unconverted_img_tag
      * @return string
      */
     public function convert_to_utf($unconverted_img_tag) {
-        // Use htmlspecialchars with ENT_QUOTES to handle both single and double quotes
-        // and ENT_HTML5 for better HTML5 compatibility
-        return htmlspecialchars($unconverted_img_tag, ENT_QUOTES | ENT_HTML5, 'UTF-8');
+        return gumlet_normalize_html_fragment_for_dom($unconverted_img_tag);
     }
 
     /**

includes/gumlet-html-fragment.php

@@ -0,0 +1,22 @@
+<?php
+/**
+ * Normalize HTML snippets before DOMDocument::loadHTML (JSON-escaped quotes/slashes).
+ *
+ * @package gumlet-wordpress
+ * @param string $fragment Raw matched tag from output buffer.
+ * @return string
+ */
+function gumlet_normalize_html_fragment_for_dom($fragment)
+{
+    if (!is_string($fragment) || $fragment === '') {
+        return $fragment;
+    }
+    if (function_exists('wp_unslash')) {
+        $fragment = wp_unslash($fragment);
+    } else {
+        $fragment = stripslashes($fragment);
+    }
+    // JSON encodes forward slashes in URLs as \/ — libxml needs real slashes.
+    $fragment = str_replace('\\/', '/', $fragment);
+    return $fragment;
+}

includes/options-page.php

@@ -150,6 +150,20 @@ class="regular-text code" />
             <div class="tab">
                 <table class="form-table">
                     <tbody>
+                        <tr>
+                            <th>
+                                <label class="description" for="gumlet_settings_auto_resize">
+                                    <?php esc_html_e('Auto Resize', 'gumlet'); ?>
+                                </label>
+                            </th>
+                            <td>
+                                <input type="hidden" name="gumlet_settings[auto_resize]" value="0" />
+                                <input id="gumlet_settings_auto_resize" type="checkbox"
+                                    name="gumlet_settings[auto_resize]" value="1" <?php
+                                    checked($this->get_option('auto_resize', true)) ?> />
+                                <p style="color: #666"><?php esc_html_e('When enabled, images use a placeholder and Gumlet.js resizes per viewport (including lazy loading, if enabled). When disabled, Gumlet.js is not loaded: the image src is set directly to the Gumlet URL (no placeholder and no lazy loading).', 'gumlet'); ?></p>
+                            </td>
+                        </tr>
                         <tr>
                             <th>
                                 <label class="description" for="gumlet_settings[original_images]">
@@ -314,12 +328,13 @@ public function gumlet_register_settings()
      * Get option and handle if option is not set
      *
      * @param string $key
-     *
+     * @param mixed  $default Returned when the key is not present in the array.
      * @return mixed
      */
-    protected function get_option($key)
+    protected function get_option($key, $default = '')
     {
-        return isset($this->options[ $key ]) ? $this->options[ $key ] : '';
+        // array_key_exists: key exists but value is null → still use null (isset() would treat as missing).
+        return array_key_exists($key, $this->options) ? $this->options[ $key ] : $default;
     }
 }
 

readme.txt

@@ -8,7 +8,7 @@ Author URI: https://www.gumlet.com
 Requires at least: 3.3
 Requires PHP: 5.6.3
 Tested up to: 6.8
-Stable tag: 1.3.20
+Stable tag: 1.4.0
 License: BSD-2
 License URI: http://opensource.org/licenses/BSD-2-Clause
 
@@ -141,9 +141,11 @@ If you need any help, you can reach out to us at support@gumlet.com.
 
 == Changelog ==
 
-= 1.3.20 =
-* Added control to disable resizing images.
+= 1.4.0 =
+* Advanced setting: Auto Resize (auto_resize). When disabled, img src is set directly to the Gumlet URL instead of the placeholder pixel.
+* Fix DOM parsing for img/source tags: do not entity-encode the whole tag before loadHTML (was preventing any img from being found).
 * Support SVG URLs in replace_image_url.
+* Normalize JSON-style escapes in fragments (wp_unslash, \/) before parsing.
 
 
 = 1.3.19 =

tests/fragment-normalize-test.php

@@ -0,0 +1,29 @@
+<?php
+/**
+ * CLI regression: gumlet_normalize_html_fragment_for_dom (no WordPress).
+ * Run: php tests/fragment-normalize-test.php
+ */
+
+if (!function_exists('wp_unslash')) {
+    function wp_unslash($value)
+    {
+        return stripslashes($value);
+    }
+}
+
+require_once dirname(__DIR__) . '/includes/gumlet-html-fragment.php';
+
+$escaped = '<img fetchpriority="high" src="http:\/\/wordpress.turingiq.com\/wp-content\/uploads\/2025\/03\/screenshot-7-1024x545.png" srcset="https:\/\/wordpress.turingiq.com\/wp-content\/uploads\/2025\/03\/screenshot-7.png 1440w" />';
+
+$normalized = gumlet_normalize_html_fragment_for_dom($escaped);
+
+$ok = strpos($normalized, 'http://wordpress.turingiq.com/wp-content') !== false
+    && strpos($normalized, 'https://wordpress.turingiq.com/wp-content') !== false
+    && strpos($normalized, '\\/') === false;
+
+if (!$ok) {
+    fwrite(STDERR, "FAIL: expected unescaped URLs in fragment.\nGot: $normalized\n");
+    exit(1);
+}
+
+echo "OK: fragment normalize\n";