upd to 0.11.7

darkfriend · darkfriend · commit f00e13094b71 · 2025-06-26T00:04:12.000+03:00
diff --git a/utf8/dev2fun.imagecompress/install/version.php b/utf8/dev2fun.imagecompress/install/version.php
@@ -1,5 +1,5 @@
 <?php
 $arModuleVersion = [
-    'VERSION' => '0.11.6',
-    'VERSION_DATE' => '2025-06-25 23:25:00',
+    'VERSION' => '0.11.7',
+    'VERSION_DATE' => '2025-06-26 00:25:00',
 ];
diff --git a/utf8/dev2fun.imagecompress/lib/Gif.php b/utf8/dev2fun.imagecompress/lib/Gif.php
@@ -2,7 +2,7 @@
 /**
  * @author darkfriend <hi@darkfriend.ru>
  * @copyright dev2fun
- * @version 0.11.6
+ * @version 0.11.7
  */
 
 namespace Dev2fun\ImageCompress;
diff --git a/utf8/dev2fun.imagecompress/lib/Jpegoptim.php b/utf8/dev2fun.imagecompress/lib/Jpegoptim.php
@@ -2,7 +2,7 @@
 /**
  * @author darkfriend <hi@darkfriend.ru>
  * @copyright dev2fun
- * @version 0.11.6
+ * @version 0.11.7
  */
 
 namespace Dev2fun\ImageCompress;
diff --git a/utf8/dev2fun.imagecompress/lib/Optipng.php b/utf8/dev2fun.imagecompress/lib/Optipng.php
@@ -2,7 +2,7 @@
 /**
  * @author darkfriend <hi@darkfriend.ru>
  * @copyright dev2fun
- * @version 0.11.6
+ * @version 0.11.7
  */
 
 namespace Dev2fun\ImageCompress;
diff --git a/utf8/dev2fun.imagecompress/lib/Ps2Pdf.php b/utf8/dev2fun.imagecompress/lib/Ps2Pdf.php
@@ -2,7 +2,7 @@
 /**
  * @author darkfriend <hi@darkfriend.ru>
  * @copyright dev2fun
- * @version 0.11.6
+ * @version 0.11.7
  */
 
 namespace Dev2fun\ImageCompress;
diff --git a/utf8/dev2fun.imagecompress/lib/Svg.php b/utf8/dev2fun.imagecompress/lib/Svg.php
@@ -2,7 +2,7 @@
 /**
  * @author darkfriend <hi@darkfriend.ru>
  * @copyright dev2fun
- * @version 0.11.6
+ * @version 0.11.7
  */
 
 namespace Dev2fun\ImageCompress;
diff --git a/utf8/dev2fun.imagecompress/lib/Webp.php b/utf8/dev2fun.imagecompress/lib/Webp.php
@@ -2,7 +2,7 @@
 /**
  * @author darkfriend <hi@darkfriend.ru>
  * @copyright dev2fun
- * @version 0.11.6
+ * @version 0.11.7
  */
 
 namespace Dev2fun\ImageCompress;
diff --git a/utf8/dev2fun.imagecompress/options.php b/utf8/dev2fun.imagecompress/options.php
@@ -2,7 +2,7 @@
 /**
  * @author darkfriend <hi@darkfriend.ru>
  * @copyright dev2fun
- * @version 0.11.6
+ * @version 0.11.7
  */
 
 defined('B_PROLOG_INCLUDED') and (B_PROLOG_INCLUDED === true) or die();
diff --git a/win1251/dev2fun.imagecompress/install/version.php b/win1251/dev2fun.imagecompress/install/version.php
@@ -1,5 +1,5 @@
 <?php
 $arModuleVersion = [
-    'VERSION' => '0.11.6',
-    'VERSION_DATE' => '2025-06-25 23:25:00',
+    'VERSION' => '0.11.7',
+    'VERSION_DATE' => '2025-06-26 00:25:00',
 ];
diff --git a/win1251/dev2fun.imagecompress/lib/Gif.php b/win1251/dev2fun.imagecompress/lib/Gif.php
@@ -2,7 +2,7 @@
 /**
  * @author darkfriend <hi@darkfriend.ru>
  * @copyright dev2fun
- * @version 0.11.6
+ * @version 0.11.7
  */
 
 namespace Dev2fun\ImageCompress;
@@ -61,7 +61,7 @@ public function isOptim(?string $path = null)
             $path = $this->path;
         }
         if (self::$isOptim === null || $path !== $this->path) {
-            if (\Dev2funImageCompress::checkAvailable("{$path}/gifsicle")) {
+            if (!\Dev2funImageCompress::checkAvailable("{$path}/gifsicle")) {
                 throw new \Exception("gifsicle no readable or executable");
             }
             exec($path . '/gifsicle --version', $s);
diff --git a/win1251/dev2fun.imagecompress/lib/Jpegoptim.php b/win1251/dev2fun.imagecompress/lib/Jpegoptim.php
@@ -2,7 +2,7 @@
 /**
  * @author darkfriend <hi@darkfriend.ru>
  * @copyright dev2fun
- * @version 0.11.6
+ * @version 0.11.7
  */
 
 namespace Dev2fun\ImageCompress;
@@ -73,7 +73,7 @@ public function isOptim(?string $path = null)
             $path = $this->jpegOptimPath;
         }
         if (self::$isOptim === null || $path !== $this->jpegOptimPath) {
-            if (\Dev2funImageCompress::checkAvailable("{$path}/jpegoptim")) {
+            if (!\Dev2funImageCompress::checkAvailable("{$path}/jpegoptim")) {
                 throw new \Exception("jpegoptim no readable or executable");
             }
             exec($path . '/jpegoptim --version', $s);
diff --git a/win1251/dev2fun.imagecompress/lib/Optipng.php b/win1251/dev2fun.imagecompress/lib/Optipng.php
@@ -2,7 +2,7 @@
 /**
  * @author darkfriend <hi@darkfriend.ru>
  * @copyright dev2fun
- * @version 0.11.6
+ * @version 0.11.7
  */
 
 namespace Dev2fun\ImageCompress;
@@ -73,7 +73,7 @@ public function isOptim(?string $path = null)
             $path = $this->pngOptimPath;
         }
         if (self::$isOptim === null || $path !== $this->pngOptimPath) {
-            if (\Dev2funImageCompress::checkAvailable("{$path}/optipng")) {
+            if (!\Dev2funImageCompress::checkAvailable("{$path}/optipng")) {
                 throw new \Exception("{$path}/optipng no readable or executable");
             }
             exec($path . '/optipng -v', $s);
diff --git a/win1251/dev2fun.imagecompress/lib/Ps2Pdf.php b/win1251/dev2fun.imagecompress/lib/Ps2Pdf.php
@@ -2,7 +2,7 @@
 /**
  * @author darkfriend <hi@darkfriend.ru>
  * @copyright dev2fun
- * @version 0.11.6
+ * @version 0.11.7
  */
 
 namespace Dev2fun\ImageCompress;
@@ -76,7 +76,7 @@ public function isOptim(?string $path = null)
         if (!$path) {
             $path = $this->path;
         }
-        if (\Dev2funImageCompress::checkAvailable("{$path}/gs")) {
+        if (!\Dev2funImageCompress::checkAvailable("{$path}/gs")) {
             throw new \Exception("{$path}/gs no readable or executable");
         }
         if (self::$isOptim === null || $path !== $this->path) {
diff --git a/win1251/dev2fun.imagecompress/lib/Svg.php b/win1251/dev2fun.imagecompress/lib/Svg.php
@@ -2,7 +2,7 @@
 /**
  * @author darkfriend <hi@darkfriend.ru>
  * @copyright dev2fun
- * @version 0.11.6
+ * @version 0.11.7
  */
 
 namespace Dev2fun\ImageCompress;
@@ -65,13 +65,16 @@ public function isActive(): bool
      */
     public function isOptim(?string $path = null, ?string $pathNodejs = null): bool
     {
+        if (!$this->isActive()) {
+            return true;
+        }
         if (!$path) {
             $path = $this->path;
         }
         if (!$pathNodejs) {
             $pathNodejs = $this->pathNodejs;
         }
-        if (\Dev2funImageCompress::checkAvailable("{$path}/{$this->binaryName}")) {
+        if (!\Dev2funImageCompress::checkAvailable("{$path}/{$this->binaryName}")) {
             throw new \Exception("{$path}/{$this->binaryName} no readable or executable");
         }
         if (self::$isOptim === null || $path !== $this->path || $pathNodejs !== $this->pathNodejs) {
diff --git a/win1251/dev2fun.imagecompress/lib/Webp.php b/win1251/dev2fun.imagecompress/lib/Webp.php
@@ -2,7 +2,7 @@
 /**
  * @author darkfriend <hi@darkfriend.ru>
  * @copyright dev2fun
- * @version 0.11.6
+ * @version 0.11.7
  */
 
 namespace Dev2fun\ImageCompress;
@@ -26,6 +26,7 @@ class Webp
     private static $isOptim = null;
     private $origPicturesMode = false;
     private static $origPictures = [];
+    private $convertAlgorithm = '';
 
     /**
      * @param string|null $siteId
@@ -51,6 +52,13 @@ public function __construct(?string $siteId = null)
         }
 
         $this->multithreading = Option::get($this->MODULE_ID, 'cwebp_multithreading', 'Y', $siteId) === 'Y';
+
+        if (\Dev2funImageCompress::isCli()) {
+            $this->convertAlgorithm = 'phpWebp';
+            $this->enable = true;
+        } else {
+            $this->convertAlgorithm = Option::get($this->MODULE_ID, 'convert_algorithm', 'phpWebp', $siteId);
+        }
     }
 
     /**
@@ -73,11 +81,14 @@ public static function getInstance()
      */
     public function isOptim(?string $path = null)
     {
+        if ($this->convertAlgorithm !== 'cwebp') {
+            return true;
+        }
         if (!$path) {
             $path = $this->path;
         }
         if (self::$isOptim === null || $path !== $this->path) {
-            if (\Dev2funImageCompress::checkAvailable("{$path}/cwebp")) {
+            if (!\Dev2funImageCompress::checkAvailable("{$path}/cwebp")) {
                 throw new \Exception("{$path}/cwebp no readable or executable");
             }
             exec($path . '/cwebp -version', $s);
diff --git a/win1251/dev2fun.imagecompress/options.php b/win1251/dev2fun.imagecompress/options.php
@@ -2,7 +2,7 @@
 /**
  * @author darkfriend <hi@darkfriend.ru>
  * @copyright dev2fun
- * @version 0.11.6
+ * @version 0.11.7
  */
 
 defined('B_PROLOG_INCLUDED') and (B_PROLOG_INCLUDED === true) or die();
@@ -78,16 +78,21 @@
         $error = false;
         $arSite = current($arSites);
 
-        $disableFunctions = ini_get('disable_functions');
-        if ($disableFunctions && in_array('exec', explode(',', $disableFunctions))) {
-            $text[] = Loc::getMessage('D2F_IMAGECOMPRESS_ERROR_CHECK_EXEC');
-        }
+        try {
+            $disableFunctions = ini_get('disable_functions');
+            if ($disableFunctions && in_array('exec', explode(',', $disableFunctions))) {
+                $text[] = Loc::getMessage('D2F_IMAGECOMPRESS_ERROR_CHECK_EXEC');
+            }
 
-        foreach (Check::$optiClasses as $algKey => $algItem) {
-            if(!Check::isOptim($algKey)) {
-                $text[] = Loc::getMessage('D2F_IMAGECOMPRESS_ERROR_CHECK_NOFOUND', ['#MODULE#' => $algKey]);
+            foreach (Check::$optiClasses as $algKey => $algItem) {
+                if(!Check::isOptim($algKey)) {
+                    $text[] = Loc::getMessage('D2F_IMAGECOMPRESS_ERROR_CHECK_NOFOUND', ['#MODULE#' => $algKey]);
+                }
             }
+        } catch (Exception $e) {
+            $text[] =  $e->getMessage();
         }
+
         if (!$text) {
             $text = Loc::getMessage("D2F_COMPRESS_OPTIONS_TESTED");
         } else {
@@ -194,7 +199,7 @@
                 if(!$algorithmJpeg) {
                     throw new Exception(Loc::getMessage('D2F_IMAGECOMPRESS_ALGORITHM_NOT_CHOICE', ['#MODULE#' => 'jpeg']));
                 }
-                if (\Dev2funImageCompress::checkAvailable("{$pthJpeg}/{$algorithmJpeg}")) {
+                if (!\Dev2funImageCompress::checkAvailable("{$pthJpeg}/{$algorithmJpeg}")) {
                     throw new Exception("{$pthJpeg}/{$algorithmJpeg} no readable or executable");
                 }
                 if (!file_exists("{$pthJpeg}/{$algorithmJpeg}")) {
@@ -227,7 +232,7 @@
                 if(!$algorithmPng) {
                     throw new Exception(Loc::getMessage('D2F_IMAGECOMPRESS_ALGORITHM_NOT_CHOICE', ['#MODULE#' => 'png']));
                 }
-                if (\Dev2funImageCompress::checkAvailable("{$pthPng}/{$algorithmPng}")) {
+                if (!\Dev2funImageCompress::checkAvailable("{$pthPng}/{$algorithmPng}")) {
                     throw new Exception("{$pthPng}/{$algorithmPng} no readable or executable");
                 }
                 if (!file_exists($pthPng)) {
@@ -304,7 +309,7 @@
                             throw new Exception(Loc::getMessage('D2F_IMAGECOMPRESS_ERROR_NO_PATH_TO', ['#MODULE#' => 'nodejs']));
                         }
                         $pathNodejs = \rtrim($pathNodejs, '/');
-                        if (\Dev2funImageCompress::checkAvailable($pathNodejs)) {
+                        if (!\Dev2funImageCompress::checkAvailable($pathNodejs)) {
                             throw new Exception("{$pathNodejs} no readable or executable");
                         }
                         if (!file_exists($pathNodejs)) {
