Cleanup code

Author: Carlgo11

.gitignore

@@ -1,84 +1,17 @@
-
-# Created by https://www.gitignore.io/api/linux,macos,windows,phpstorm,composer,intellij
-# Edit at https://www.gitignore.io/?templates=linux,macos,windows,phpstorm,composer,intellij
-
 ### Composer ###
-composer.phar
-composer.lock
 /vendor/
 
 ### Jetbrains ###
 .idea/**
 
-### Linux ###
-*~
-
-# temporary files which can be created if a process still has a handle open of a deleted file
-.fuse_hidden*
-
-# KDE directory preferences
-.directory
-
-# Linux trash folder which might appear on any partition or disk
-.Trash-*
-
-# .nfs files are created when an open file is removed but is still being accessed
-.nfs*
-
-### macOS ###
-# General
-.DS_Store
-.AppleDouble
-.LSOverride
-
-# Icon must end with two \r
-Icon
-
 # Thumbnails
 ._*
 
-# Files that might appear in the root of a volume
-.DocumentRevisions-V100
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
-.com.apple.timemachine.donotpresent
-
-# Directories potentially created on remote AFP share
-.AppleDB
-.AppleDesktop
-Network Trash Folder
-Temporary Items
-.apdisk
-
-### Windows ###
-# Windows thumbnail cache files
-Thumbs.db
-ehthumbs.db
-ehthumbs_vista.db
-
-# Dump file
-*.stackdump
-
-# Folder config file
-[Dd]esktop.ini
-
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
-
-# Windows Installer files
-*.cab
-*.msi
-*.msix
-*.msm
-*.msp
-
 # Windows shortcuts
 *.lnk
 
 # phpunit
 .phpunit.result.cache
 
-# End of https://www.gitignore.io/api/linux,macos,windows,phpstorm,composer,intellij
+*.phar
+*.lock

download.php

@@ -1,9 +1,12 @@
 <?php
 
 function getCURL(string $id, string $password) {
+	require_once __DIR__ . '/src/com/carlgo11/tempfiles/Autoload.php';
+	global $conf;
+
 	$curl = curl_init();
 	curl_setopt_array($curl, [
-		CURLOPT_URL => "https://api.tempfiles.carlgo11.com/download/?id={$id}&p={$password}",
+		CURLOPT_URL => $conf['api-download-url'],
 		CURLOPT_RETURNTRANSFER => TRUE,
 		CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_2,
 		CURLOPT_CUSTOMREQUEST => 'GET',

src/com/carlgo11/tempfiles/API.php

@@ -27,7 +27,8 @@ public function outputJSON(int $HTTPCode = 200) {
 		header('Access-Control-Allow-Origin: *'); // Allows other domains to send data to the API.
 		header('Content-Type: application/json; charset=utf-8');
 		http_response_code($HTTPCode);
-		return print(json_encode($this->getMessages(), JSON_PRETTY_PRINT));
+		$json = json_encode($this->getMessages(), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
+		return print($json);
 	}
 
 	public function getMessages() {

src/com/carlgo11/tempfiles/Autoload.php

@@ -15,6 +15,7 @@
 	or mySQLError($mysql_connection);
 
 
+
 /**
  * Outputs MySQL error.
  *

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

@@ -9,7 +9,6 @@
 class Delete extends API
 {
 	public function __construct(string $method) {
-		if ($method !== 'DELETE') throw new Exception("Bad method. Use DELETE.");
 
 		$id = Misc::getVar('id');
 		$password = Misc::getVar('p');

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

@@ -51,7 +51,7 @@ function __construct(string $method) {
 				if ($password !== NULL) {
 					if ($fileContent['error'] === 0) {
 						$file->setContent(file_get_contents($fileContent['tmp_name']));
-						if (!($upload = DataStorage::uploadFile($file, $password)))
+						if (!$upload = DataStorage::uploadFile($file, $password))
 							throw new Exception("Connection to our database failed.");
 						if (!DataStorage::getFile($file->getID(), $password) instanceof File)
 							throw new Exception("Unable to verify file integrity.");
@@ -66,14 +66,10 @@ function __construct(string $method) {
 			}
 
 			if (is_bool($upload) && $upload) {
-				$protocol = "http";
-				$https = filter_input(INPUT_SERVER, 'HTTPS');
-				if (isset($https) && $https !== 'off') {
-					$protocol = "https";
-				}
+				global $conf;
 
 				// Full URI to download the file
-				$completeURL = $protocol . "://d.carlgo11.com/" . $file->getID() . "/?p=" . urlencode($password);
+				$completeURL = sprintf($conf['download-url'], $file->getID(), $password);
 
 				$output['success'] = TRUE;
 				$output['url'] = $completeURL;

src/com/carlgo11/tempfiles/config.php

@@ -8,7 +8,7 @@
 
 return [
 	# Allowed formats <n>MB, <n>GB, <n>TB, <n>PB.
-	'max-file-size' => '12MB',
+	'max-file-size' => '100MB',
 	#'mysql-url' => 'localhost',
 	'mysql-url' => getenv('ag44jc7aqs2rsup2bb6cx7utc'),
 	#'mysql-user => 'tempfiles',
@@ -20,5 +20,9 @@
 	#'mysql-table' => 'files',
 	'mysql-table' => getenv('rb421p9wniz81ttj7bdgrg0ub'),
 	# Encryption algorithm to use for encrypting uploads.
-	'Encryption-Method' => 'aes-256-gcm'
+	'Encryption-Method' => 'aes-256-gcm',
+	# Download URL
+	'download-url' => 'https://d.carlgo11.com/%1$s/?p=%2$s',
+	# API Download URL
+	'api-download-url' => 'https://api.tempfiles.carlgo11.com/download/?id=%1$s&p=%1$s'
 ];