From 61b7e2716e5f9e720d735c080c88965313cd7eec Mon Sep 17 00:00:00 2001
From: Sasha Rybkin <ribkin@dominion.ru>
Date: Wed, 3 Sep 2025 16:52:00 +0300
Subject: [PATCH] =?UTF-8?q?#116680=20=D0=9C=D0=BE=D0=B4=D0=B5=D1=80=D0=B0?=
 =?UTF-8?q?=D1=86=D0=B8=D1=8F.=20=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE?=
 =?UTF-8?q?=D1=82=D0=BA=D0=B0=20=D0=BF=D0=BE=20Rich-=D0=BA=D0=BE=D0=BD?=
 =?UTF-8?q?=D1=82=D0=B5=D0=BD=D1=82=D1=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 File.php | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/File.php b/File.php
index 993b3de..4fc12d9 100644
--- a/File.php
+++ b/File.php
@@ -532,12 +532,17 @@ class File extends \yii\db\ActiveRecord
         return $border;
     }
 
-    public function loadFile($module, $url, $id = false)
+    public static function loadFile($module, $url, $fileName= false, $description='', $id = false, $convertJpg = true)
     {
         $file = @file_get_contents($url);
         if ($file !== false)
         {
-            $temp = $this->getFilePathCache();
+            if (!$id || ($model = File::findOne($id)) === null)
+            {
+                $model = new File();
+                $model->module = $module;
+            }
+            $temp = $model->getFilePathCache();
             file_put_contents($temp, $file);
             unset($file);
             if (!$id || ($model = File::findOne($id)) === null)
@@ -548,13 +553,15 @@ class File extends \yii\db\ActiveRecord
             $arName = explode('/', $url);
             $model->file = new UploadedFile(
                 [
-                'name' => array_pop($arName),
+                'name' => $fileName ? $fileName : array_pop($arName),
                 'tempName' => $temp,
                 'type' => mime_content_type($temp),
                 'size' => filesize($temp),
                 'error' => UPLOAD_ERR_OK,
                 ]
             );
+            $model->description = $description;
+            $model->convertJpg = $convertJpg;
             $model->save();
             return $model->id;
         }
@@ -568,7 +575,7 @@ class File extends \yii\db\ActiveRecord
      * @param type $id
      * @return type
      */
-    public static function saveBase64File($module, $fileBase64, $fileName, $id = false, $convertJpg = true)
+    public static function saveBase64File($module, $fileBase64, $fileName, $description='', $id = false, $convertJpg = true)
     {
         if (!$id || ($model = File::findOne($id)) === null)
         {
@@ -586,6 +593,7 @@ class File extends \yii\db\ActiveRecord
             'error' => UPLOAD_ERR_OK,
             ]
         );
+        $model->description = $description;
         $model->convertJpg = $convertJpg;
         $model->save();