ERP-417

diff --git a/erp24/records/Images.php b/erp24/records/Images.php
index 5e808cdddc36d0ab1c24ba50b5a3a2b0a783868e..001f22de6566672af1f5eb11a97b3f549746f1a1 100644 (file)
--- a/erp24/records/Images.php
+++ b/erp24/records/Images.php
@@ -80,7 +80,7 @@ class Images extends \yii\db\ActiveRecord
         $ar_size = !empty(getimagesize($file_obj->tempName)) ? getimagesize($file_obj->tempName) : ['', ''];
         $ar_file_name = explode('.', $file_obj->name);
         $ext = '.' . end($ar_file_name);
-        $file_name = md5($file_obj->name . microtime(true) . random_int(10000, 99999)) . $ext;
+        $file_name = pathinfo($file_obj->name, PATHINFO_FILENAME) . '_' . time() . '.' . strtolower(pathinfo($file_obj->name, PATHINFO_EXTENSION));
         $dir_name = substr($file_name, 0, 2);
 
         $uploadDirPath = \Yii::getAlias('@uploads/images');

diff --git a/erp24/services/FileService.php b/erp24/services/FileService.php
index 4f1cd90d045695d13fae484b92e945641fe5f14b..f77b9020efc56ef8d763b2af364d0b520d6b80e2 100755 (executable)
--- a/erp24/services/FileService.php
+++ b/erp24/services/FileService.php
@@ -127,7 +127,7 @@ class FileService
         if (!is_dir($filePath)) {
             mkdir($filePath, 0777, true);
         }
-        $uniqueFileName = md5($file->name . microtime(true) . random_int(10000, 99999)) . '.' . $file->extension;
+        $uniqueFileName = pathinfo($file->name, PATHINFO_FILENAME) . '_' . time() . '.' . $file->extension;
 
         $targetFile = $filePath . $uniqueFileName;
         Yii::warning('Saved file: ' . json_encode($targetFile, JSON_UNESCAPED_UNICODE));