Bug fix for set an unique name of uploading file

Author: itstructure

README.md

@@ -38,12 +38,12 @@ To work with Amazon it uses [AWS SDK](https://github.com/aws/aws-sdk-php).
 
 Via composer:
 
-```composer require itstructure/yii2-multi-format-uploader ^2.1.2```
+```composer require itstructure/yii2-multi-format-uploader ^2.1.3```
 
 or in section **require** of composer.json file set the following:
 ```
 "require": {
-    "itstructure/yii2-multi-format-uploader": "^2.1.2"
+    "itstructure/yii2-multi-format-uploader": "^2.1.3"
 }
 ```
 and command ```composer install```, if you install yii2 project extensions first,

changelog.md

@@ -1,5 +1,8 @@
 ### CHANGE LOG:
 
+**2.1.3 August 19, 2019:**
+- Bug fix for set an unique name of uploading file. Used **microtime()** in ```LocalUpload``` and ```S3Upload``` models.
+
 **2.1.2 June 12, 2019:**
 - Optimize getting module object from a mediafile in **getModule()** function.
 
@@ -8,8 +11,8 @@
   Used in **getPreviewOptions()** module method if **is_callable($previewOptions[$location])**.
 
 **2.1.0 May 18, 2019:**
-- Add urlPrefix parameter in to AlbumController for redirect and view links.
-- Add urlPrefixNeighbor parameter in to AlbumController for view links of neighbor entity.
+- Add **urlPrefix parameter** in to ```AlbumController``` for redirect and view links.
+- Add **urlPrefixNeighbor** parameter in to ```AlbumController``` for view links of neighbor entity.
 
 **2.0.1 August 9, 2018:**
 - Delete duplicates and optimize code.
@@ -21,7 +24,7 @@
     - Renaming controllers and models to a single entity name.
     - Renaming module constants.
     - Some simple code fixes.
-- Add file_exists() check function in to sendFile() of the LocalUpload model.
+- Add **file_exists()** check function in to **sendFile()** of the ```LocalUpload``` model.
 - Fixes for README.
 
 **1.0.0 May 15, 2018:**

src/models/upload/LocalUpload.php

@@ -83,18 +83,18 @@ protected function setParamsForSend(): void
 
         if (!empty($this->subDir)) {
             $uploadDir = $uploadDir .
-                         DIRECTORY_SEPARATOR .
-                         trim(trim($this->subDir, '/'), '\\');
+                DIRECTORY_SEPARATOR .
+                trim(trim($this->subDir, '/'), '\\');
         }
 
         $this->uploadDir = $uploadDir .
-                           DIRECTORY_SEPARATOR . substr(md5(time()), 0, self::DIR_LENGTH_FIRST) .
-                           DIRECTORY_SEPARATOR . substr(md5(time()+1), 0, self::DIR_LENGTH_SECOND);
+            DIRECTORY_SEPARATOR . substr(md5(time()), 0, self::DIR_LENGTH_FIRST) .
+            DIRECTORY_SEPARATOR . substr(md5(microtime().$this->file->tempName), 0, self::DIR_LENGTH_SECOND);
 
         $this->uploadPath = $this->uploadRoot . DIRECTORY_SEPARATOR . $this->uploadDir;
 
         $this->outFileName = $this->renameFiles ?
-            md5(time()+2).'.'.$this->file->extension :
+            md5(md5(microtime()).$this->file->tempName).'.'.$this->file->extension :
             Inflector::slug($this->file->baseName).'.'. $this->file->extension;
 
         $this->databaseUrl = DIRECTORY_SEPARATOR . $this->uploadDir . DIRECTORY_SEPARATOR . $this->outFileName;

src/models/upload/S3Upload.php

@@ -158,10 +158,10 @@ protected function setParamsForSend(): void
 
         $this->uploadDir = $uploadDir .
             self::BUCKET_DIR_SEPARATOR . substr(md5(time()), 0, self::DIR_LENGTH_FIRST) .
-            self::BUCKET_DIR_SEPARATOR . substr(md5(time()+1), 0, self::DIR_LENGTH_SECOND);
+            self::BUCKET_DIR_SEPARATOR . substr(md5(microtime().$this->file->tempName), 0, self::DIR_LENGTH_SECOND);
 
         $this->outFileName = $this->renameFiles ?
-            md5(time()+2).'.'.$this->file->extension :
+            md5(md5(microtime()).$this->file->tempName).'.'.$this->file->extension :
             Inflector::slug($this->file->baseName).'.'. $this->file->extension;
 
         $this->bucketForUpload = null !== $this->owner && isset($this->s3Buckets[$this->owner]) ?