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();