+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
*/
- public function __construct(string $response_type = "json")
+
+ namespace Uguu\Classes;
+
+ class Response
{
- switch ($response_type) {
- case 'csv':
- header('Content-Type: text/csv; charset=UTF-8');
- $this->type = $response_type;
- break;
- case 'html':
- header('Content-Type: text/html; charset=UTF-8');
- $this->type = $response_type;
- break;
- case 'json':
- header('Content-Type: application/json; charset=UTF-8');
- $this->type = $response_type;
- break;
- case 'gyazo':
- header('Content-Type: text/plain; charset=UTF-8');
- $this->type = 'text';
- break;
- case 'text':
- header('Content-Type: text/plain; charset=UTF-8');
- $this->type = $response_type;
- break;
- default:
- header('Content-Type: application/json; charset=UTF-8');
- $this->type = 'json';
- $this->error(400, 'Invalid response type. Valid options are: csv, html, json, text.');
- break;
+ public mixed $type;
+
+ /**
+ * Takes a string as an argument and sets the header to the appropriate content type
+ *
+ * @param $response_type string The type of response you want to return. Valid options are: csv, html, json, text.
+ */
+ public function __construct(string $response_type = "json")
+ {
+ switch ($response_type) {
+ case 'csv':
+ header('Content-Type: text/csv; charset=UTF-8');
+ $this->type = $response_type;
+ break;
+ case 'html':
+ header('Content-Type: text/html; charset=UTF-8');
+ $this->type = $response_type;
+ break;
+ case 'json':
+ header('Content-Type: application/json; charset=UTF-8');
+ $this->type = $response_type;
+ break;
+ case 'gyazo':
+ header('Content-Type: text/plain; charset=UTF-8');
+ $this->type = 'text';
+ break;
+ case 'text':
+ header('Content-Type: text/plain; charset=UTF-8');
+ $this->type = $response_type;
+ break;
+ default:
+ header('Content-Type: application/json; charset=UTF-8');
+ $this->type = 'json';
+ $this->error(400, 'Invalid response type. Valid options are: csv, html, json, text.');
+ break;
+ }
+ }
+
+ /**
+ * Returns a string based on the type of response requested
+ *
+ * @param $code mixed The HTTP status code to return.
+ * @param $desc string The description of the error.
+ */
+ public function error(mixed $code, string $desc):void
+ {
+ $response = match ($this->type) {
+ 'csv' => $this->csvError($desc),
+ 'html' => $this->htmlError($code, $desc),
+ 'json' => $this->jsonError($code, $desc),
+ 'text' => $this->textError($code, $desc),
+ };
+ http_response_code($code);
+ echo $response;
+ }
+
+ /* Returning a string that contains the error message. */
+ private static function csvError(string $description):string
+ {
+ return '"error"' . "\r\n" . "\"$description\"" . "\r\n";
+ }
+
+ /**
+ * Returns a string containing an HTML paragraph element with the error code and description
+ *
+ * @param $code int|string The error code.
+ * @param $description string The description of the error.
+ *
+ * @return string A string.
+ */
+ private static function htmlError(int|string $code, string $description):string
+ {
+ return 'ERROR: (' . $code . ') ' . $description . '
';
+ }
+
+ /**
+ * Returns a JSON string with the error code and description
+ *
+ * @param $code int|string The error code.
+ * @param $description string The description of the error.
+ *
+ * @return bool|string A JSON string
+ */
+ private static function jsonError(int|string $code, string $description):bool|string
+ {
+ return json_encode([
+ 'success' => false,
+ 'errorcode' => $code,
+ 'description' => $description,
+ ], JSON_PRETTY_PRINT);
+ }
+
+ /**
+ * Returns a string that contains the error code and description
+ *
+ * @param $code int|string The error code.
+ * @param $description string The description of the error.
+ *
+ * @return string A string with the error code and description.
+ */
+ private static function textError(int|string $code, string $description):string
+ {
+ return 'ERROR: (' . $code . ') ' . $description;
+ }
+
+ /**
+ * "If the type is csv, then call the csvSuccess function, if the type is html, then call the htmlSuccess function, etc."
+ *
+ * The `match` keyword is a new feature in PHP 8. It's a lot like a switch statement, but it's more powerful
+ *
+ * @param $files array An array of file objects.
+ */
+ public function send(array $files):void
+ {
+ $response = match ($this->type) {
+ 'csv' => $this->csvSuccess($files),
+ 'html' => $this->htmlSuccess($files),
+ 'json' => $this->jsonSuccess($files),
+ 'text' => $this->textSuccess($files),
+ };
+ http_response_code(200); // "200 OK". Success.
+ echo $response;
+ }
+
+ /**
+ * Takes an array of files and returns a CSV string
+ *
+ * @param $files array An array of files that have been uploaded.
+ *
+ * @return string A string of the files in the array.
+ */
+ private static function csvSuccess(array $files):string
+ {
+ $result = '"name","url","hash","size"' . "\r\n";
+ foreach ($files as $file) {
+ $result .= '"' . $file['name'] . '"' . ',' .
+ '"' . $file['url'] . '"' . ',' .
+ '"' . $file['hash'] . '"' . ',' .
+ '"' . $file['size'] . '"' . "\r\n";
+ }
+ return $result;
+ }
+
+ /**
+ * Takes an array of files and returns a string of HTML links
+ *
+ * @param $files array An array of files to be uploaded.
+ *
+ * @return string the result of the foreach loop.
+ */
+ private static function htmlSuccess(array $files):string
+ {
+ $result = '';
+ foreach ($files as $file) {
+ $result .= '' . $file['url'] . '
';
+ }
+ return $result;
+ }
+
+ /**
+ * Returns a JSON string that contains a success message and the files that were uploaded
+ *
+ * @param $files array The files to be uploaded.
+ *
+ * @return bool|string A JSON string
+ */
+ private static function jsonSuccess(array $files):bool|string
+ {
+ return json_encode([
+ 'success' => true,
+ 'files' => $files,
+ ], JSON_PRETTY_PRINT);
+ }
+
+ /**
+ * Takes an array of files and returns a string of URLs
+ *
+ * @param $files array The files to be uploaded.
+ *
+ * @return string the url of the file.
+ */
+ private static function textSuccess(array $files):string
+ {
+ $result = '';
+ foreach ($files as $file) {
+ $result .= $file['url'] . "\n";
+ }
+ return $result;
}
}
-
- /**
- * Returns a string based on the type of response requested
- *
- * @param $code mixed The HTTP status code to return.
- * @param $desc string The description of the error.
- */
- public function error(mixed $code, string $desc): void
- {
- $response = match ($this->type) {
- 'csv' => $this->csvError($desc),
- 'html' => $this->htmlError($code, $desc),
- 'json' => $this->jsonError($code, $desc),
- 'text' => $this->textError($code, $desc),
- };
- http_response_code($code);
- echo $response;
- }
-
- /* Returning a string that contains the error message. */
- private static function csvError(string $description): string
- {
- return '"error"' . "\r\n" . "\"$description\"" . "\r\n";
- }
-
- /**
- * Returns a string containing an HTML paragraph element with the error code and description
- *
- * @param $code int|string The error code.
- * @param $description string The description of the error.
- *
- * @return string A string.
- */
- private static function htmlError(int|string $code, string $description): string
- {
- return 'ERROR: (' . $code . ') ' . $description . '
';
- }
-
- /**
- * Returns a JSON string with the error code and description
- *
- * @param $code int|string The error code.
- * @param $description string The description of the error.
- *
- * @return bool|string A JSON string
- */
- private static function jsonError(int|string $code, string $description): bool|string
- {
- return json_encode([
- 'success' => false,
- 'errorcode' => $code,
- 'description' => $description,
- ], JSON_PRETTY_PRINT);
- }
-
-
- /**
- * Returns a string that contains the error code and description
- *
- * @param $code int|string The error code.
- * @param $description string The description of the error.
- *
- * @return string A string with the error code and description.
- */
- private static function textError(int|string $code, string $description): string
- {
- return 'ERROR: (' . $code . ') ' . $description;
- }
-
- /**
- * "If the type is csv, then call the csvSuccess function, if the type is html, then call the htmlSuccess function, etc."
- *
- * The `match` keyword is a new feature in PHP 8. It's a lot like a switch statement, but it's more powerful
- *
- * @param $files array An array of file objects.
- */
- public function send(array $files): void
- {
- $response = match ($this->type) {
- 'csv' => $this->csvSuccess($files),
- 'html' => $this->htmlSuccess($files),
- 'json' => $this->jsonSuccess($files),
- 'text' => $this->textSuccess($files),
- };
-
- http_response_code(200); // "200 OK". Success.
- echo $response;
- }
-
- /**
- * Takes an array of files and returns a CSV string
- *
- * @param $files array An array of files that have been uploaded.
- *
- * @return string A string of the files in the array.
- */
- private static function csvSuccess(array $files): string
- {
- $result = '"name","url","hash","size"' . "\r\n";
- foreach ($files as $file) {
- $result .= '"' . $file['name'] . '"' . ',' .
- '"' . $file['url'] . '"' . ',' .
- '"' . $file['hash'] . '"' . ',' .
- '"' . $file['size'] . '"' . "\r\n";
- }
-
- return $result;
- }
-
- /**
- * Takes an array of files and returns a string of HTML links
- *
- * @param $files array An array of files to be uploaded.
- *
- * @return string the result of the foreach loop.
- */
- private static function htmlSuccess(array $files): string
- {
- $result = '';
-
- foreach ($files as $file) {
- $result .= '' . $file['url'] . '
';
- }
-
- return $result;
- }
-
- /**
- * Returns a JSON string that contains a success message and the files that were uploaded
- *
- * @param $files array The files to be uploaded.
- *
- * @return bool|string A JSON string
- */
- private static function jsonSuccess(array $files): bool|string
- {
- return json_encode([
- 'success' => true,
- 'files' => $files,
- ], JSON_PRETTY_PRINT);
- }
-
- /**
- * Takes an array of files and returns a string of URLs
- *
- * @param $files array The files to be uploaded.
- *
- * @return string the url of the file.
- */
- private static function textSuccess(array $files): string
- {
- $result = '';
-
- foreach ($files as $file) {
- $result .= $file['url'] . "\n";
- }
-
- return $result;
- }
-}
diff --git a/src/Classes/Upload.php b/src/Classes/Upload.php
index c050aea..580a171 100644
--- a/src/Classes/Upload.php
+++ b/src/Classes/Upload.php
@@ -1,271 +1,262 @@
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-namespace Pomf\Uguu\Classes;
-
-use Exception;
-
-class Upload extends Response
-{
- public array $FILE_INFO;
- public array $fingerPrintInfo;
- private mixed $Connector;
-
/**
- * Takes an array of files, and returns an array of arrays containing the file's temporary name, name, size, SHA1 hash, extension, and MIME type
+ * Uguu
*
- * @param $files array The files array from the $_FILES superglobal.
+ * @copyright Copyright (c) 2022 Go Johansson (nokonoko)
*
- * @return array An array of arrays.
- * @throws \Exception
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
*/
- public function reFiles(array $files): array
+
+ namespace Uguu\Classes;
+
+ use Exception;
+
+ class Upload extends Response
{
- $this->Connector = new Connector();
- $this->Connector->setDB($this->Connector->DB);
- $result = [];
- $files = $this->diverseArray($files);
- foreach ($files as $file) {
- $hash = sha1_file($file['tmp_name']);
- $this->FILE_INFO = [
- 'TEMP_NAME' => $file['tmp_name'],
- 'NAME' => strip_tags($file['name']),
- 'SIZE' => $file['size'],
- 'SHA1' => $hash,
- 'EXTENSION' => $this->fileExtension($file),
- 'MIME' => $this->fileMIME($file),
- 'NEW_NAME' => $this->generateName($this->fileExtension($file), $hash)
- ];
- $result[] = [
- $this->FILE_INFO['TEMP_NAME'],
- $this->FILE_INFO['NAME'],
- $this->FILE_INFO['SIZE'],
- $this->FILE_INFO['SHA1'],
- $this->FILE_INFO['EXTENSION'],
- $this->FILE_INFO['MIME']
+ public array $FILE_INFO;
+ public array $fingerPrintInfo;
+ private mixed $Connector;
+
+ /**
+ * Takes an array of files, and returns an array of arrays containing the file's temporary name, name, size, SHA1 hash, extension, and MIME type
+ *
+ * @param $files array The files array from the $_FILES superglobal.
+ *
+ * @return array An array of arrays.
+ * @throws \Exception
+ */
+ public function reFiles(array $files):array
+ {
+ $this->Connector = new Connector();
+ $this->Connector->setDB($this->Connector->DB);
+ $result = [];
+ $files = $this->diverseArray($files);
+ foreach ($files as $file) {
+ $hash = sha1_file($file['tmp_name']);
+ $this->FILE_INFO = [
+ 'TEMP_NAME' => $file['tmp_name'],
+ 'NAME' => strip_tags($file['name']),
+ 'SIZE' => $file['size'],
+ 'SHA1' => $hash,
+ 'EXTENSION' => $this->fileExtension($file),
+ 'MIME' => $this->fileMIME($file),
+ 'NEW_NAME' => $this->generateName($this->fileExtension($file), $hash),
+ ];
+ $result[] = [
+ $this->FILE_INFO['TEMP_NAME'],
+ $this->FILE_INFO['NAME'],
+ $this->FILE_INFO['SIZE'],
+ $this->FILE_INFO['SHA1'],
+ $this->FILE_INFO['EXTENSION'],
+ $this->FILE_INFO['MIME'],
+ ];
+ }
+ return $result;
+ }
+
+ /**
+ * Takes an array of arrays and returns an array of arrays with the keys and values swapped
+ *
+ * @param $files array an array of arrays
+ *
+ * @return array ```
+ * array:2 [▼
+ * 0 => array:2 [▼
+ * 'TEMP_NAME' => 'example'
+ * 'NAME' => 'example'
+ * 'SIZE' => 'example'
+ * 'SHA1' => 'example'
+ * 'EXTENSION' => 'example'
+ * 'MIME' => 'example'
+ *
+ * ]
+ * 1 => array:2 [▼
+ * 'TEMP_NAME' => 'example'
+ * 'NAME' => 'example'
+ * 'SIZE' => 'example'
+ * 'SHA1' => 'example'
+ * 'EXTENSION' => 'example'
+ * 'MIME' => 'example'
+ * ]
+ * ]
+ * ```
+ */
+ public function diverseArray(array $files):array
+ {
+ $result = [];
+ foreach ($files as $key1 => $value1) {
+ foreach ($value1 as $key2 => $value2) {
+ $result[$key2][$key1] = $value2;
+ }
+ }
+ return $result;
+ }
+
+ /**
+ * Takes a file, checks if it's blacklisted, moves it to the file storage, and then logs it to the database
+ *
+ * @return array An array containing the hash, name, url, and size of the file.
+ * @throws \Exception
+ */
+ public function uploadFile():array
+ {
+ if ($this->Connector->CONFIG['RATE_LIMIT']) {
+ $this->Connector->checkRateLimit($this->fingerPrintInfo);
+ }
+ if ($this->Connector->CONFIG['BLACKLIST_DB']) {
+ $this->Connector->checkFileBlacklist($this->FILE_INFO);
+ }
+ if ($this->Connector->CONFIG['FILTER_MODE'] && empty($this->FILE_INFO['EXTENSION'])) {
+ $this->checkMimeBlacklist();
+ }
+ if ($this->Connector->CONFIG['FILTER_MODE'] && !empty($this->FILE_INFO['EXTENSION'])) {
+ $this->checkMimeBlacklist();
+ $this->checkExtensionBlacklist();
+ }
+ if (!is_dir($this->Connector->CONFIG['FILES_ROOT'])) {
+ throw new Exception('File storage path not accessible.', 500);
+ }
+ if (
+ !move_uploaded_file(
+ $this->FILE_INFO['TEMP_NAME'],
+ $this->Connector->CONFIG['FILES_ROOT'] .
+ $this->FILE_INFO['NEW_NAME'],
+ )
+ ) {
+ throw new Exception('Failed to move file to destination', 500);
+ }
+ if (!chmod($this->Connector->CONFIG['FILES_ROOT'] . $this->FILE_INFO['NEW_NAME'], 0644)) {
+ throw new Exception('Failed to change file permissions', 500);
+ }
+ if (!$this->Connector->CONFIG['LOG_IP']) {
+ $this->fingerPrintInfo['ip'] = null;
+ }
+ $this->Connector->newIntoDB($this->FILE_INFO, $this->fingerPrintInfo);
+ return [
+ 'hash' => $this->FILE_INFO['SHA1'],
+ 'name' => $this->FILE_INFO['NAME'],
+ 'url' => $this->Connector->CONFIG['FILES_URL'] . '/' . $this->FILE_INFO['NEW_NAME'],
+ 'size' => $this->FILE_INFO['SIZE'],
];
}
- return $result;
- }
- /**
- * Takes an array of arrays and returns an array of arrays with the keys and values swapped
- *
- * @param $files array an array of arrays
- *
- * @return array ```
- * array:2 [▼
- * 0 => array:2 [▼
- * 'TEMP_NAME' => 'example'
- * 'NAME' => 'example'
- * 'SIZE' => 'example'
- * 'SHA1' => 'example'
- * 'EXTENSION' => 'example'
- * 'MIME' => 'example'
- *
- * ]
- * 1 => array:2 [▼
- * 'TEMP_NAME' => 'example'
- * 'NAME' => 'example'
- * 'SIZE' => 'example'
- * 'SHA1' => 'example'
- * 'EXTENSION' => 'example'
- * 'MIME' => 'example'
- * ]
- * ]
- * ```
- */
- public function diverseArray(array $files): array
- {
- $result = [];
- foreach ($files as $key1 => $value1) {
- foreach ($value1 as $key2 => $value2) {
- $result[$key2][$key1] = $value2;
+
+ /**
+ * Takes the amount of files that are being uploaded, and creates a fingerprint of the user's IP address, user agent, and the amount of files being
+ * uploaded
+ *
+ * @param $files_amount int The amount of files that are being uploaded.
+ *
+ * @throws \Exception
+ */
+ public function fingerPrint(int $files_amount):void
+ {
+ if (!empty($_SERVER['HTTP_USER_AGENT'])) {
+ $USER_AGENT = filter_var($_SERVER['HTTP_USER_AGENT'], FILTER_SANITIZE_ENCODED);
+ $this->fingerPrintInfo = [
+ 'timestamp' => time(),
+ 'useragent' => $USER_AGENT,
+ 'ip' => $_SERVER['REMOTE_ADDR'],
+ 'ip_hash' => hash('sha1', $_SERVER['REMOTE_ADDR'] . $USER_AGENT),
+ 'files_amount' => $files_amount,
+ ];
+ } else {
+ throw new Exception('Invalid user agent.', 500);
}
}
- return $result;
- }
-
- /**
- * Takes a file, checks if it's blacklisted, moves it to the file storage, and then logs it to the database
- *
- * @return array An array containing the hash, name, url, and size of the file.
- * @throws \Exception
- */
- public function uploadFile(): array
- {
-
- if ($this->Connector->CONFIG['RATE_LIMIT']) {
- $this->Connector->checkRateLimit($this->fingerPrintInfo);
+
+ /**
+ * Returns the MIME type of a file
+ *
+ * @param $file array The file to be checked.
+ *
+ * @return string The MIME type of the file.
+ */
+ public function fileMIME(array $file):string
+ {
+ $FILE_INFO = finfo_open(FILEINFO_MIME_TYPE);
+ return finfo_file($FILE_INFO, $file['tmp_name']);
}
-
- if ($this->Connector->CONFIG['BLACKLIST_DB']) {
- $this->Connector->checkFileBlacklist($this->FILE_INFO);
+
+ /**
+ * Takes a file and returns the file extension
+ *
+ * @param $file array The file you want to get the extension from.
+ *
+ * @return ?string The file extension of the file.
+ */
+ public function fileExtension(array $file):?string
+ {
+ $extension = explode('.', $file['name']);
+ if (substr_count($file['name'], '.') > 0) {
+ return end($extension);
+ } else {
+ return null;
+ }
}
-
- if ($this->Connector->CONFIG['FILTER_MODE'] && empty($this->FILE_INFO['EXTENSION'])) {
- $this->checkMimeBlacklist();
+
+ /**
+ * > Check if the file's MIME type is in the blacklist
+ *
+ * @throws \Exception
+ */
+ public function checkMimeBlacklist():void
+ {
+ if (in_array($this->FILE_INFO['MIME'], $this->Connector->CONFIG['BLOCKED_MIME'])) {
+ throw new Exception('Filetype not allowed.', 415);
+ }
}
-
- if ($this->Connector->CONFIG['FILTER_MODE'] && !empty($this->FILE_INFO['EXTENSION'])) {
- $this->checkMimeBlacklist();
- $this->checkExtensionBlacklist();
+
+ /**
+ * > Check if the file extension is in the blacklist
+ *
+ * @throws \Exception
+ */
+ public function checkExtensionBlacklist():void
+ {
+ if (in_array($this->FILE_INFO['EXTENSION'], $this->Connector->CONFIG['BLOCKED_EXTENSIONS'])) {
+ throw new Exception('Filetype not allowed.', 415);
+ }
}
-
- if (!is_dir($this->Connector->CONFIG['FILES_ROOT'])) {
- throw new Exception('File storage path not accessible.', 500);
- }
-
- if (
- !move_uploaded_file($this->FILE_INFO['TEMP_NAME'], $this->Connector->CONFIG['FILES_ROOT'] .
- $this->FILE_INFO['NEW_NAME'])
- ) {
- throw new Exception('Failed to move file to destination', 500);
- }
-
- if (!chmod($this->Connector->CONFIG['FILES_ROOT'] . $this->FILE_INFO['NEW_NAME'], 0644)) {
- throw new Exception('Failed to change file permissions', 500);
- }
-
- if (!$this->Connector->CONFIG['LOG_IP']) {
- $this->fingerPrintInfo['ip'] = null;
- }
-
- $this->Connector->newIntoDB($this->FILE_INFO, $this->fingerPrintInfo);
-
- return [
- 'hash' => $this->FILE_INFO['SHA1'],
- 'name' => $this->FILE_INFO['NAME'],
- 'url' => $this->Connector->CONFIG['FILES_URL'] . '/' . $this->FILE_INFO['NEW_NAME'],
- 'size' => $this->FILE_INFO['SIZE']
- ];
- }
-
- /**
- * Takes the amount of files that are being uploaded, and creates a fingerprint of the user's IP address, user agent, and the amount of files being uploaded
- *
- * @param $files_amount int The amount of files that are being uploaded.
- *
- * @throws \Exception
- */
- public function fingerPrint(int $files_amount): void
- {
- if (!empty($_SERVER['HTTP_USER_AGENT'])) {
- $USER_AGENT = filter_var($_SERVER['HTTP_USER_AGENT'], FILTER_SANITIZE_ENCODED);
- $this->fingerPrintInfo = [
- 'timestamp' => time(),
- 'useragent' => $USER_AGENT,
- 'ip' => $_SERVER['REMOTE_ADDR'],
- 'ip_hash' => hash('sha1', $_SERVER['REMOTE_ADDR'] . $USER_AGENT),
- 'files_amount' => $files_amount
- ];
- } else {
- throw new Exception('Invalid user agent.', 500);
+
+ /**
+ * Generates a random string of characters, checks if it exists in the database, and if it does, it generates another one
+ *
+ * @param $extension string The file extension.
+ * @param $hash string The hash of the file.
+ *
+ * @return string A string
+ * @throws \Exception
+ */
+ public function generateName(string $extension, string $hash):string
+ {
+ if ($this->Connector->antiDupe($hash)) {
+ do {
+ if ($this->Connector->CONFIG['FILES_RETRIES'] === 0) {
+ throw new Exception('Gave up trying to find an unused name!', 500);
+ }
+ $NEW_NAME = '';
+ for ($i = 0; $i < $this->Connector->CONFIG['NAME_LENGTH']; ++$i) {
+ $NEW_NAME .= $this->Connector->CONFIG['ID_CHARSET']
+ [mt_rand(0, strlen($this->Connector->CONFIG['ID_CHARSET']))];
+ }
+ if (!empty($extension)) {
+ $NEW_NAME .= '.' . $extension;
+ }
+ } while ($this->Connector->dbCheckNameExists($NEW_NAME) > 0);
+ return $NEW_NAME;
+ } else {
+ return $this->Connector->antiDupe($hash);
+ }
}
}
-
-
- /**
- * Returns the MIME type of a file
- *
- * @param $file array The file to be checked.
- *
- * @return string The MIME type of the file.
- */
- public function fileMIME(array $file): string
- {
- $FILE_INFO = finfo_open(FILEINFO_MIME_TYPE);
- return finfo_file($FILE_INFO, $file['tmp_name']);
- }
-
- /**
- * Takes a file and returns the file extension
- *
- * @param $file array The file you want to get the extension from.
- *
- * @return ?string The file extension of the file.
- */
- public function fileExtension(array $file): ?string
- {
- $extension = explode('.', $file['name']);
- if (substr_count($file['name'], '.') > 0) {
- return end($extension);
- } else {
- return null;
- }
- }
-
- /**
- * > Check if the file's MIME type is in the blacklist
- *
- * @throws \Exception
- */
- public function checkMimeBlacklist(): void
- {
- if (in_array($this->FILE_INFO['MIME'], $this->Connector->CONFIG['BLOCKED_MIME'])) {
- throw new Exception('Filetype not allowed.', 415);
- }
- }
-
- /**
- * > Check if the file extension is in the blacklist
- *
- * @throws \Exception
- */
- public function checkExtensionBlacklist(): void
- {
- if (in_array($this->FILE_INFO['EXTENSION'], $this->Connector->CONFIG['BLOCKED_EXTENSIONS'])) {
- throw new Exception('Filetype not allowed.', 415);
- }
- }
-
- /**
- * Generates a random string of characters, checks if it exists in the database, and if it does, it generates another one
- *
- * @param $extension string The file extension.
- * @param $hash string The hash of the file.
- *
- * @return string A string
- * @throws \Exception
- */
- public function generateName(string $extension, string $hash): string
- {
- if ($this->Connector->antiDupe($hash)) {
- do {
- if ($this->Connector->CONFIG['FILES_RETRIES'] === 0) {
- throw new Exception('Gave up trying to find an unused name!', 500);
- }
-
- $NEW_NAME = '';
- for ($i = 0; $i < $this->Connector->CONFIG['NAME_LENGTH']; ++$i) {
- $NEW_NAME .= $this->Connector->CONFIG['ID_CHARSET']
- [mt_rand(0, strlen($this->Connector->CONFIG['ID_CHARSET']))];
- }
-
- if (!empty($extension)) {
- $NEW_NAME .= '.' . $extension;
- }
- } while ($this->Connector->dbCheckNameExists($NEW_NAME) > 0);
- return $NEW_NAME;
- } else {
- return $this->Connector->antiDupe($hash);
- }
- }
-}
diff --git a/src/GrillLoader.php b/src/GrillLoader.php
index 4cf153a..186fbed 100644
--- a/src/GrillLoader.php
+++ b/src/GrillLoader.php
@@ -1,30 +1,29 @@
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-namespace Pomf\Uguu;
-
-class GrillLoader extends Classes\CuteGrills
-{
- public function __construct()
+ /**
+ * Uguu
+ *
+ * @copyright Copyright (c) 2022 Go Johansson (nokonoko)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+ namespace Uguu;
+
+ class GrillLoader extends Classes\CuteGrills
{
- $this->showGrills();
+ public function __construct()
+ {
+ $this->showGrills();
+ }
}
-}
diff --git a/src/UploadGateway.php b/src/UploadGateway.php
index eb67550..3689f75 100644
--- a/src/UploadGateway.php
+++ b/src/UploadGateway.php
@@ -18,10 +18,10 @@
* along with this program. If not, see .
*/
- namespace Pomf\Uguu;
+ namespace Uguu;
use Exception;
- use Pomf\Uguu\Classes\Response;
+ use Uguu\Classes\Response;
class UploadGateway extends Classes\Upload
{
@@ -38,7 +38,6 @@
$type = 'json' ?? $output;
$response = (new Response($type));
if (!empty($_FILES['files'])) {
-
$files = $this->reFiles($files);
try {
$this->fingerPrint(count($files));
@@ -53,7 +52,6 @@
catch (Exception $e) {
$response->error($e->getCode(), $e->getMessage());
}
-
} else {
$response->error(400, 'No input file(s)');
}
diff --git a/src/static/php/grill.php b/src/static/php/grill.php
index d193949..d41172a 100644
--- a/src/static/php/grill.php
+++ b/src/static/php/grill.php
@@ -41,6 +41,6 @@
*/
require_once __DIR__ . '/../vendor/autoload.php';
- use Pomf\Uguu\GrillLoader;
+ use Pomf\GrillLoader;
new GrillLoader();
diff --git a/src/static/php/upload.php b/src/static/php/upload.php
index 9fbe3ff..3e4fb3d 100644
--- a/src/static/php/upload.php
+++ b/src/static/php/upload.php
@@ -41,7 +41,7 @@
checkConfig();
require_once __DIR__ . '/../vendor/autoload.php';
- use Pomf\Uguu\UploadGateway;
+ use Uguu\UploadGateway;
try {
(new UploadGateway())->handleFile($_GET['output'], $_FILES['files']);