Clean up some code

Author: Carlgo11

src/com/carlgo11/tempfiles/File.php

@@ -7,6 +7,8 @@
 
 /**
  * File class
+ * Stores all file-related data during a file-upload/-download operation.
+ * This data is NOT encrypted. See {@see EncryptedFile} for the encrypted equivalent.
  *
  * @package com\carlgo11\tempfiles
  * @since 2.2
@@ -165,7 +167,7 @@ public function setDeletionPassword(string $deletionPassword) {
 	/**
 	 * Gets the metadata of the file if supplied.
 	 *
-	 * @param string $type Array key of the desired value.
+	 * @param string|null $type Array key of the desired value.
 	 * @return string|array Returns data of the desired array key if a $type is supplied, otherwise the entire array.
 	 * @since 2.2
 	 */

src/com/carlgo11/tempfiles/api/Upload.php

@@ -18,41 +18,39 @@ function __construct(string $method) {
 		global $conf;
 		try {
 			if ($method !== 'POST') throw new Exception("Bad method. Use POST.");
+			if (!isset($_FILES['file']) || $_FILES['file'] === NULL) throw new Exception("No file uploaded.");
 
-			if (isset($_FILES['file']) && $_FILES['file'] !== NULL) {
-				$fileArray = $_FILES['file'];
-				$file = new File($fileArray);
+			$fileArray = $_FILES['file'];
+			$file = new File($fileArray);
 
-				if (Misc::getVar('maxviews') !== NULL) $file->setMaxViews(Misc::getVar('maxviews'));
-				if (Misc::getVar('password') !== NULL) $password = Misc::getVar('password');
-				else $password = Misc::generatePassword(6, 20);
-
-				$file->setDeletionPassword(Misc::generatePassword(12, 32));
-
-				$file->setMetaData([
-					'size' => $fileArray['size'],
-					'name' => rawurlencode($fileArray['name']),
-					'type' => $fileArray['type']
-				]);
-
-				$file->setContent(file_get_contents($fileArray['tmp_name']));
+			if (Misc::getVar('maxviews') !== NULL) {
+				$file->setMaxViews(Misc::getVar('maxviews'));
+				$output['maxviews'] = (int)$file->getMaxViews();
+			}
 
-				DataStorage::saveFile($file, $password);
+			if (Misc::getVar('password') !== NULL) $password = Misc::getVar('password');
+			else {
+				$password = Misc::generatePassword(6, 20);
+				$output['password'] = $password;
+			}
 
-				// Full URI to download the file
-				$completeURL = sprintf($conf['download-url'], $file->getID(), $password);
+			$file->setDeletionPassword(Misc::generatePassword(12, 32));
+			$file->setContent(file_get_contents($fileArray['tmp_name']));
+			$file->setMetaData([
+				'size' => $fileArray['size'],
+				'name' => rawurlencode($fileArray['name']),
+				'type' => $fileArray['type']
+			]);
 
-				$output = [
-					'url' => $completeURL,
-					'id' => $file->getID(),
-					'deletepassword' => $file->getDeletionPassword()];
+			if (!DataStorage::saveFile($file, $password)) throw new Exception("File-storing failed.");
 
-				if (Misc::getVar('password') === NULL) $output['password'] = $password;
-				if ($file->getMaxViews() !== NULL) $output['maxviews'] = (int)$file->getMaxViews();
+			$output = [
+				'url' => sprintf($conf['download-url'], $file->getID(), $password),
+				'id' => $file->getID(),
+				'deletepassword' => $file->getDeletionPassword()];
 
-				syslog(LOG_INFO, $output['id'] . " created.");
-				return parent::outputJSON($output, 201);
-			}
+			syslog(LOG_INFO, $output['id'] . " created.");
+			return parent::outputJSON($output, 201);
 		} catch (Exception $e) {
 			parent::outputJSON(['error' => $e->getMessage()], 500);
 		}