From 85cde75db0c5c9019c9ed7e835889270eef7ec39 Mon Sep 17 00:00:00 2001 From: Vladimir Fomichev Date: Thu, 4 Sep 2025 12:49:10 +0300 Subject: [PATCH] =?utf8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?= =?utf8?q?=D0=9F=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80=20=D1=83=D0=B4?= =?utf8?q?=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B2=D1=80=D0=B5=D0=BC?= =?utf8?q?=D0=B5=D0=BD=D0=BD=D1=8B=D1=85=20=D1=84=D0=B0=D0=B9=D0=BB=D0=BE?= =?utf8?q?=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/controllers/MatrixErpController.php | 2 +- erp24/records/Images.php | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/erp24/controllers/MatrixErpController.php b/erp24/controllers/MatrixErpController.php index 26fa85be..aec0f927 100644 --- a/erp24/controllers/MatrixErpController.php +++ b/erp24/controllers/MatrixErpController.php @@ -427,7 +427,7 @@ class MatrixErpController extends Controller if ($uploadImage) { if (Images::isImageFile($uploadImage, ['png', 'jpg', 'jpeg', 'webp', 'gif'])) { $image = new Images(); - $imageId = $image->loadImage($uploadImage); + $imageId = $image->loadImage($uploadImage, false); if (!empty($imageId)) { $matrixProductProperty->image_id = $imageId; diff --git a/erp24/records/Images.php b/erp24/records/Images.php index 01460daa..b2500e63 100644 --- a/erp24/records/Images.php +++ b/erp24/records/Images.php @@ -72,7 +72,7 @@ class Images extends \yii\db\ActiveRecord * @param UploadedFile $file_obj * @return bool|int|null */ - public function loadImage(UploadedFile $file_obj = null) + public function loadImage(UploadedFile $file_obj = null, $deleteTempFile = true) { if (!$file_obj) { return null; @@ -94,7 +94,7 @@ class Images extends \yii\db\ActiveRecord mkdir($imageDirPath); } - if ($file_obj->saveAs($imageDirPath . '/' . $file_name, false)) { + if ($file_obj->saveAs($imageDirPath . '/' . $file_name, $deleteTempFile)) { $this->original_name = $file_obj->baseName; $this->filename = $file_name; $this->size = $file_obj->size; @@ -106,6 +106,7 @@ class Images extends \yii\db\ActiveRecord $validate = $this->validate(); if ($validate) { $this->save(); + if (preg_match('/^\.jpe?g$/i', $ext)) { exec('jpegoptim --all-progressive -v --strip-all ' . Yii::getAlias('uploads/images/' . $dir_name . '/' . $file_name)); } elseif (preg_match('/^\.png$/i', $ext)) { -- 2.39.5