Moved base64 decoding to FormData

src/FormData/UserEditFormData.php

@@ -22,7 +22,7 @@ class UserEditFormData implements \Szurubooru\IValidatable
 				$this->accessRank = \Szurubooru\Helpers\EnumHelper::accessRankFromString($inputReader->accessRank);
 			if ($inputReader->avatarStyle !== null)
 				$this->avatarStyle = \Szurubooru\Helpers\EnumHelper::avatarStyleFromString($inputReader->avatarStyle);
-			$this->avatarContent = $inputReader->avatarContent;
+			$this->avatarContent = $inputReader->decodeBase64($inputReader->avatarContent);
 			$this->browsingSettings = $inputReader->browsingSettings;
 		}
 	}

src/Helpers/InputReader.php

@@ -24,4 +24,12 @@ final class InputReader extends \ArrayObject
 			return null;
 		return parent::offsetGet($index);
 	}
+
+	public function decodeBase64($base64string)
+	{
+		$commaPosition = strpos($base64string, ',');
+		if ($commaPosition !== null)
+			$base64string = substr($base64string, $commaPosition + 1);
+		return base64_decode($base64string);
+	}
 }

src/Services/FileService.php

@@ -12,17 +12,17 @@ class FileService
 		$this->httpHelper = $httpHelper;
 	}
 
-	public function serve($source, $options = [])
+	public function serve($target, $options = [])
 	{
-		$finalSource = $this->getFullPath($source);
+		$fullPath = $this->getFullPath($target);
 
 		$daysToLive = isset($options->daysToLive)
 			? $options->daysToLive
 			: 7;
 
 		$secondsToLive = $daysToLive * 24 * 60 * 60;
-		$lastModified = filemtime($finalSource);
+		$lastModified = filemtime($fullPath);
-		$eTag = md5(file_get_contents($finalSource)); //todo: faster
+		$eTag = md5(file_get_contents($fullPath)); //todo: faster
 
 		$ifModifiedSince = isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])
 			? $_SERVER['HTTP_IF_MODIFIED_SINCE']
@@ -45,7 +45,7 @@ class FileService
 			'Content-Type',
 			isset($options->mimeType)
 				? $options->mimeType
-				: mime_content_type($finalSource));
+				: mime_content_type($fullPath));
 
 		if (strtotime($ifModifiedSince) === $lastModified or $eTagHeader === $eTag)
 		{
@@ -54,38 +54,34 @@ class FileService
 		else
 		{
 			$this->httpHelper->setResponseCode(200);
-			readfile($finalSource);
+			readfile($fullPath);
 		}
 		exit;
 	}
 
 	public function createFolders($target)
 	{
-		$finalTarget = $this->getFullPath($target);
+		$fullPath = $this->getFullPath($target);
-		if (!file_exists($finalTarget))
+		if (!file_exists($fullPath))
-			mkdir($finalTarget, 0777, true);
+			mkdir($fullPath, 0777, true);
 	}
 
-	public function exists($source)
+	public function exists($target)
 	{
-		$finalSource = $this->getFullPath($source);
+		$fullPath = $this->getFullPath($target);
-		return $source and file_exists($finalSource);
+		return $target and file_exists($fullPath);
 	}
 
-	public function delete($source)
+	public function delete($target)
 	{
-		$finalSource = $this->getFullPath($source);
+		$fullPath = $this->getFullPath($target);
-		if (file_exists($finalSource))
+		if (file_exists($fullPath))
-			unlink($finalSource);
+			unlink($fullPath);
 	}
 
-	public function saveFromBase64($base64string, $destination)
+	public function save($destination, $data)
 	{
 		$finalDestination = $this->getFullPath($destination);
-		$commaPosition = strpos($base64string, ',');
-		if ($commaPosition !== null)
-			$base64string = substr($base64string, $commaPosition + 1);
-		$data = base64_decode($base64string);
 		file_put_contents($finalDestination, $data);
 	}
 

src/Services/UserService.php

@@ -216,10 +216,10 @@ class UserService
 		$user->setAvatarStyle($newAvatarStyle);
 	}
 
-	private function updateUserAvatarContent(\Szurubooru\Entities\User $user, $newAvatarContentInBase64)
+	private function updateUserAvatarContent(\Szurubooru\Entities\User $user, $newAvatarContent)
 	{
 		$target = $this->getCustomAvatarSourcePath($user);
-		$this->fileService->saveFromBase64($newAvatarContentInBase64, $target);
+		$this->fileService->save($target, $newAvatarContent);
 		$this->thumbnailService->deleteUsedThumbnails($target);
 	}