Context Navigation

← Previous Changeset
Next Changeset →

Changeset 3721894

Timestamp:

09/30/2026 07:05:29 PM (2 weeks ago)

Author:

andergmartins

Message:

Update to version 3.113.1 from GitHub

Location:

ml-slider

Files:

: 820 added
: 22 deleted
: 6 edited
: 1 copied

Legend:

: Unmodified
: Added
: Removed

ml-slider/tags/3.113.1/admin/lib/helpers.php

-              r3674480
+              r3721894
+ *
  * @since 3.103
+ * @since 3.113.1 Use the prefixed MSHTMLPurifier classes so another plugin's copy of
+ *                the library can no longer answer for ours.
+ *
  * @param string $content    The HTML content to be purified
 …
+{
     try {
         if ( ! class_exists( 'HTMLPurifier_Config' ) || ! class_exists( 'HTMLPurifier' ) ) {
             $autoloader = METASLIDER_PATH . 'lib/htmlpurifier/library/HTMLPurifier.auto.php';
+        if ( ! class_exists( 'MSHTMLPurifier_Config' ) || ! class_exists( 'MSHTMLPurifier' ) ) {
+            $autoloader = METASLIDER_PATH . 'lib/htmlpurifier/library/MSHTMLPurifier.auto.php';
             if ( ! file_exists( $autoloader ) ) {
                 throw new RuntimeException( 'HTMLPurifier autoloader not found: ' . $autoloader );
 …
             require_once( $autoloader );
+        }
         $config = HTMLPurifier_Config::createDefault();
+        $config = MSHTMLPurifier_Config::createDefault();
         // How to filter:
         // add_filter('metaslider_html_purifier_config', function($config) {
 …
         // });
         $config   = apply_filters('metaslider_html_purifier_config', $config, $slide, $slider_id, $settings);
         $purifier = new HTMLPurifier( $config );
+        $purifier = new MSHTMLPurifier( $config );
         $content  = $purifier->purify( $content );
     } catch ( Throwable $e ) {

ml-slider/tags/3.113.1/inc/slide/metaslide.image.class.php

-              r3700496
+              r3721894
+     *
      * @since 3.101
+     * @since 3.113.1 Placeholder generation moved to lazy_load_placeholder(), which
+     *                falls back to a 1x1 GIF instead of fataling on an unusable size
      */
     public function image_attributes( $attributes, $slide, $slider_id )
 …
+            }
+            try {
+                $width  = $attributes['width'];
+                $height = $attributes['height'];
+                // Create a blank image with lowest ratio
+                for ( $i = $height; $i > 1; $i-- ) {
+                    if ( ( $width % $i ) == 0 && ( $height % $i ) == 0 ) {
+                        $width = $width / $i;
+                        $height = $height / $i;
+                    }
+                }
+                $image = imagecreatetruecolor( $width, $height );
+                // Make it transparent
+                imagesavealpha( $image, true );
+                imagealphablending( $image, false );
+                $white = imagecolorallocatealpha( $image, 255, 255, 255, 127 );
+                imagefill( $image, 0, 0, $white );
+                // Capture the image output
+                ob_start();
+                    imagepng( $image );
+                    $contents = base64_encode( ob_get_contents() );
+                ob_end_clean();
+                // Free up the memory
+                imagedestroy( $image );
+            } catch ( Exception $e ) {
+                // 1x1 pixel backup - Note: might need some creative CSS to make this work given the dimensions
+                $contents = 'data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs=';
+            }
+            // Convert to base64
+            $data_uri = "data:image/jpeg;base64," . $contents;
+            $data_uri = $this->lazy_load_placeholder( $attributes['width'], $attributes['height'] );
             $attributes['data-ms-src'] = $attributes['src'];
 …
         return $attributes;
+    }
+    /**
+     * Transparent placeholder image for lazy loading, as a data URI
+     *
+     * Falls back to a 1x1 transparent GIF when the slideshow has no usable width
+     * or height setting, when the ratio is too large to draw, or when GD is missing -
+     * PHP 8 raises an Error, not an Exception, for a non-numeric or zero size, so it
+     * can't be caught below (#2488)
+     *
+     * @since 3.113.1
+     *
+     * @param mixed $width  Width setting, may be empty or non-numeric
+     * @param mixed $height Height setting, may be empty or non-numeric
+     *
+     * @return string
+     */
+    public function lazy_load_placeholder( $width, $height )
+    {
+        // 1x1 pixel backup - Note: might need some creative CSS to make this work given the dimensions
+        $fallback = 'data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs=';
+        // A placeholder only carries the aspect ratio, so a larger one is a runaway
+        // setting - and allocating it exhausts memory, which PHP cannot catch
+        $max_pixels = 1000000;
+        $width  = is_numeric( $width ) ? absint( $width ) : 0;
+        $height = is_numeric( $height ) ? absint( $height ) : 0;
+        if ( $width < 1 || $height < 1 || ! function_exists( 'imagecreatetruecolor' ) ) {
+            return $fallback;
+        }
+        // Draw at the lowest ratio the size reduces to
+        $divisor = $this->greatest_common_divisor( $width, $height );
+        $width   = intdiv( $width, $divisor );
+        $height  = intdiv( $height, $divisor );
+        if ( ( $width * $height ) > $max_pixels ) {
+            return $fallback;
+        }
+        // Discard a half-filled output buffer if capturing the image throws
+        $ob_level = ob_get_level();
+        try {
+            $image = imagecreatetruecolor( $width, $height );
+            // Make it transparent
+            imagesavealpha( $image, true );
+            imagealphablending( $image, false );
+            $white = imagecolorallocatealpha( $image, 255, 255, 255, 127 );
+            imagefill( $image, 0, 0, $white );
+            // Capture the image output
+            ob_start();
+                imagepng( $image );
+                $contents = base64_encode( ob_get_contents() );
+            ob_end_clean();
+            // Free up the memory
+            imagedestroy( $image );
+        } catch ( Throwable $e ) {
+            while ( ob_get_level() > $ob_level ) {
+                ob_end_clean();
+            }
+            return $fallback;
+        }
+        return 'data:image/png;base64,' . $contents;
+    }
+    /**
+     * Greatest common divisor of two positive integers, used to reduce a
+     * placeholder to the lowest ratio it can be drawn at
+     *
+     * @since 3.113.1
+     *
+     * @param int $a First integer
+     * @param int $b Second integer
+     *
+     * @return int
+     */
+    private function greatest_common_divisor( $a, $b )
+    {
+        while ( $b ) {
+            $remainder = $a % $b;
+            $a = $b;
+            $b = $remainder;
+        }
+        return $a;
+    }
+}

ml-slider/tags/3.113.1/ml-slider.php

-              r3700496
+              r3721894
  * Plugin URI:  https://www.metaslider.com
  * Description: MetaSlider gives you the power to create a beautiful slideshow, carousel, or gallery on your WordPress site.
  * Version:     3.113.0
+ * Version:     3.113.1
  * Author:      MetaSlider
  * Author URI:  https://www.metaslider.com
 …
          * @var string
          */
         public $version = '3.113.0';
+        public $version = '3.113.1';
         /**
 …
                 $assets_version = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? uniqid() : $this->version;
                 define('METASLIDER_VERSION', '3.113.0');
+                define('METASLIDER_VERSION', '3.113.1'); // We need it defined as string due `composer build` doesn't detect $this->version
                 define('METASLIDER_ASSETS_VERSION', $assets_version);
                 define('METASLIDER_BASE_URL', plugin_dir_url(metaslider_plugin_is_installed('ml-slider')));

ml-slider/trunk/admin/lib/helpers.php

-              r3674480
+              r3721894
+ *
  * @since 3.103
+ * @since 3.113.1 Use the prefixed MSHTMLPurifier classes so another plugin's copy of
+ *                the library can no longer answer for ours.
+ *
  * @param string $content    The HTML content to be purified
 …
+{
     try {
         if ( ! class_exists( 'HTMLPurifier_Config' ) || ! class_exists( 'HTMLPurifier' ) ) {
             $autoloader = METASLIDER_PATH . 'lib/htmlpurifier/library/HTMLPurifier.auto.php';
+        if ( ! class_exists( 'MSHTMLPurifier_Config' ) || ! class_exists( 'MSHTMLPurifier' ) ) {
+            $autoloader = METASLIDER_PATH . 'lib/htmlpurifier/library/MSHTMLPurifier.auto.php';
             if ( ! file_exists( $autoloader ) ) {
                 throw new RuntimeException( 'HTMLPurifier autoloader not found: ' . $autoloader );
 …
             require_once( $autoloader );
+        }
         $config = HTMLPurifier_Config::createDefault();
+        $config = MSHTMLPurifier_Config::createDefault();
         // How to filter:
         // add_filter('metaslider_html_purifier_config', function($config) {
 …
         // });
         $config   = apply_filters('metaslider_html_purifier_config', $config, $slide, $slider_id, $settings);
         $purifier = new HTMLPurifier( $config );
+        $purifier = new MSHTMLPurifier( $config );
         $content  = $purifier->purify( $content );
     } catch ( Throwable $e ) {

ml-slider/trunk/inc/slide/metaslide.image.class.php

-              r3700496
+              r3721894
+     *
      * @since 3.101
+     * @since 3.113.1 Placeholder generation moved to lazy_load_placeholder(), which
+     *                falls back to a 1x1 GIF instead of fataling on an unusable size
      */
     public function image_attributes( $attributes, $slide, $slider_id )
 …
+            }
+            try {
+                $width  = $attributes['width'];
+                $height = $attributes['height'];
+                // Create a blank image with lowest ratio
+                for ( $i = $height; $i > 1; $i-- ) {
+                    if ( ( $width % $i ) == 0 && ( $height % $i ) == 0 ) {
+                        $width = $width / $i;
+                        $height = $height / $i;
+                    }
+                }
+                $image = imagecreatetruecolor( $width, $height );
+                // Make it transparent
+                imagesavealpha( $image, true );
+                imagealphablending( $image, false );
+                $white = imagecolorallocatealpha( $image, 255, 255, 255, 127 );
+                imagefill( $image, 0, 0, $white );
+                // Capture the image output
+                ob_start();
+                    imagepng( $image );
+                    $contents = base64_encode( ob_get_contents() );
+                ob_end_clean();
+                // Free up the memory
+                imagedestroy( $image );
+            } catch ( Exception $e ) {
+                // 1x1 pixel backup - Note: might need some creative CSS to make this work given the dimensions
+                $contents = 'data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs=';
+            }
+            // Convert to base64
+            $data_uri = "data:image/jpeg;base64," . $contents;
+            $data_uri = $this->lazy_load_placeholder( $attributes['width'], $attributes['height'] );
             $attributes['data-ms-src'] = $attributes['src'];
 …
         return $attributes;
+    }
+    /**
+     * Transparent placeholder image for lazy loading, as a data URI
+     *
+     * Falls back to a 1x1 transparent GIF when the slideshow has no usable width
+     * or height setting, when the ratio is too large to draw, or when GD is missing -
+     * PHP 8 raises an Error, not an Exception, for a non-numeric or zero size, so it
+     * can't be caught below (#2488)
+     *
+     * @since 3.113.1
+     *
+     * @param mixed $width  Width setting, may be empty or non-numeric
+     * @param mixed $height Height setting, may be empty or non-numeric
+     *
+     * @return string
+     */
+    public function lazy_load_placeholder( $width, $height )
+    {
+        // 1x1 pixel backup - Note: might need some creative CSS to make this work given the dimensions
+        $fallback = 'data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs=';
+        // A placeholder only carries the aspect ratio, so a larger one is a runaway
+        // setting - and allocating it exhausts memory, which PHP cannot catch
+        $max_pixels = 1000000;
+        $width  = is_numeric( $width ) ? absint( $width ) : 0;
+        $height = is_numeric( $height ) ? absint( $height ) : 0;
+        if ( $width < 1 || $height < 1 || ! function_exists( 'imagecreatetruecolor' ) ) {
+            return $fallback;
+        }
+        // Draw at the lowest ratio the size reduces to
+        $divisor = $this->greatest_common_divisor( $width, $height );
+        $width   = intdiv( $width, $divisor );
+        $height  = intdiv( $height, $divisor );
+        if ( ( $width * $height ) > $max_pixels ) {
+            return $fallback;
+        }
+        // Discard a half-filled output buffer if capturing the image throws
+        $ob_level = ob_get_level();
+        try {
+            $image = imagecreatetruecolor( $width, $height );
+            // Make it transparent
+            imagesavealpha( $image, true );
+            imagealphablending( $image, false );
+            $white = imagecolorallocatealpha( $image, 255, 255, 255, 127 );
+            imagefill( $image, 0, 0, $white );
+            // Capture the image output
+            ob_start();
+                imagepng( $image );
+                $contents = base64_encode( ob_get_contents() );
+            ob_end_clean();
+            // Free up the memory
+            imagedestroy( $image );
+        } catch ( Throwable $e ) {
+            while ( ob_get_level() > $ob_level ) {
+                ob_end_clean();
+            }
+            return $fallback;
+        }
+        return 'data:image/png;base64,' . $contents;
+    }
+    /**
+     * Greatest common divisor of two positive integers, used to reduce a
+     * placeholder to the lowest ratio it can be drawn at
+     *
+     * @since 3.113.1
+     *
+     * @param int $a First integer
+     * @param int $b Second integer
+     *
+     * @return int
+     */
+    private function greatest_common_divisor( $a, $b )
+    {
+        while ( $b ) {
+            $remainder = $a % $b;
+            $a = $b;
+            $b = $remainder;
+        }
+        return $a;
+    }
+}

ml-slider/trunk/ml-slider.php

-              r3700496
+              r3721894
  * Plugin URI:  https://www.metaslider.com
  * Description: MetaSlider gives you the power to create a beautiful slideshow, carousel, or gallery on your WordPress site.
  * Version:     3.113.0
+ * Version:     3.113.1
  * Author:      MetaSlider
  * Author URI:  https://www.metaslider.com
 …
          * @var string
          */
         public $version = '3.113.0';
+        public $version = '3.113.1';
         /**
 …
                 $assets_version = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? uniqid() : $this->version;
                 define('METASLIDER_VERSION', '3.113.0');
+                define('METASLIDER_VERSION', '3.113.1'); // We need it defined as string due `composer build` doesn't detect $this->version
                 define('METASLIDER_ASSETS_VERSION', $assets_version);
                 define('METASLIDER_BASE_URL', plugin_dir_url(metaslider_plugin_is_installed('ml-slider')));

Note: See TracChangeset for help on using the changeset viewer.

Plugin Directory