Merge pull request #2104 from MGatner/bugfix-file-extensions

File & UploadFile Fixes

Author: lonnieezell

system/Files/File.php

@@ -150,7 +150,9 @@ public function getMimeType(): string
 	 */
 	public function getRandomName(): string
 	{
-		return time() . '_' . bin2hex(random_bytes(10)) . '.' . $this->getExtension();
+		$extension = $this->getExtension();
+		$extension = empty($extension) ? '' : '.' . $extension;	
+		return time() . '_' . bin2hex(random_bytes(10)) . $extension;
 	}
 
 	//--------------------------------------------------------------------
@@ -203,6 +205,7 @@ public function getDestination(string $destination, string $delimiter = '_', int
 		while (is_file($destination))
 		{
 			$info = pathinfo($destination);
+			$extension = isset($info['extension']) ? '.' . $info['extension'] : '';
 			if (strpos($info['filename'], $delimiter) !== false)
 			{
 				$parts = explode($delimiter, $info['filename']);
@@ -211,16 +214,16 @@ public function getDestination(string $destination, string $delimiter = '_', int
 					$i = end($parts);
 					array_pop($parts);
 					array_push($parts, ++ $i);
-					$destination = $info['dirname'] . '/' . implode($delimiter, $parts) . '.' . $info['extension'];
+					$destination = $info['dirname'] . '/' . implode($delimiter, $parts) . $extension;
 				}
 				else
 				{
-					$destination = $info['dirname'] . '/' . $info['filename'] . $delimiter . ++ $i . '.' . $info['extension'];
+					$destination = $info['dirname'] . '/' . $info['filename'] . $delimiter . ++ $i . $extension;
 				}
 			}
 			else
 			{
-				$destination = $info['dirname'] . '/' . $info['filename'] . $delimiter . ++ $i . '.' . $info['extension'];
+				$destination = $info['dirname'] . '/' . $info['filename'] . $delimiter . ++ $i . $extension;
 			}
 		}
 		return $destination;

user_guide_src/source/libraries/uploaded_files.rst

@@ -200,12 +200,12 @@ trusted version, use ``getExtension()`` instead::
 
 	$ext = $file->getClientExtension();
 
-**getClientType()**
+**getClientMimeType()**
 
 Returns the mime type (mime type) of the file as provided by the client. This is NOT a trusted value. For a trusted
-version, use ``getType()`` instead::
+version, use ``getMimeType()`` instead::
 
-	$type = $file->getClientType();
+	$type = $file->getClientMimeType();
 
 	echo $type; // image/png