Fascinated/sharex-php-uploader
2
2
Fork 0
Code Issues 1 Pull Requests 1 Actions Activity

change how json returns are handled and added a support url

Browse Source
This commit is contained in:
Lee 2023-04-09 17:30:23 +01:00
parent 45d10dabf9
commit c0150ea85a
1 changed files with 43 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
upload.php
View File

@ -17,7 +17,8 @@ $webpThreadhold = 1048576; // 1MB - The minimum file size for converting to webp
/** /**
* Check if the token is valid * Check if the token is valid
*/ */
function checkToken($token): bool { function checkToken($token): bool
{
global $tokens; global $tokens;
return isset($token) && in_array($token, $tokens); return isset($token) && in_array($token, $tokens);
} }
@ -25,7 +26,8 @@ function checkToken($token): bool {
/** /**
* Generate a random string * Generate a random string
*/ */
function generateRandomString($length = 10): string { function generateRandomString($length = 10): string
{
$characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'; $characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
$charactersLength = strlen($characters); $charactersLength = strlen($characters);
$randomString = ''; $randomString = '';
@ -38,9 +40,9 @@ function generateRandomString($length = 10): string {
/** /**
* Return a JSON response * Return a JSON response
*/ */
function returnJson($status, $message, $timeTaken = null): void { function returnJson($data): void
$json = array('status' => $status, 'url' => $message, 'processingTime' => round($timeTaken ?? 0, 2) . "ms"); {
echo(json_encode($json)); echo (json_encode($data));
die(); die();
} }
@ -51,14 +53,23 @@ try {
// Check if the token is valid // Check if the token is valid
if (!checkToken($token)) { if (!checkToken($token)) {
$timeTaken = microtime(true) - $before; $timeTaken = microtime(true) - $before;
returnJson('ERROR', 'Invalid or missing secret key', $timeTaken); returnJson(array(
'status' => 'ERROR',
'message' => 'Invalid token',
'timeTaken' => $timeTaken,
'support' => "For support, visit - https://git.fascinated.cc/Fascinated/sharex-php-uploader"
));
die(); die();
} }
// Check if the file was uploaded // Check if the file was uploaded
if (!isset($file)) { if (!isset($file)) {
$timeTaken = microtime(true) - $before; $timeTaken = microtime(true) - $before;
returnJson('ERROR', 'No file was uploaded', $timeTaken); returnJson(array(
'status' => 'ERROR',
'message' => 'No file was uploaded',
'timeTaken' => $timeTaken
));
die(); die();
} }
@ -68,7 +79,11 @@ try {
// Check if the file already exists // Check if the file already exists
if (file_exists($uploadDir . $target_file)) { if (file_exists($uploadDir . $target_file)) {
$timeTaken = microtime(true) - $before; $timeTaken = microtime(true) - $before;
returnJson('ERROR', 'File already exists', $timeTaken); returnJson(array(
'status' => 'ERROR',
'message' => 'File already exists',
'timeTaken' => $timeTaken
));
die(); die();
} }
@ -92,18 +107,33 @@ try {
// Move the file to the uploads folder // Move the file to the uploads folder
if (move_uploaded_file($_FILES["sharex"]["tmp_name"], $uploadDir . $finalName)) { if (move_uploaded_file($_FILES["sharex"]["tmp_name"], $uploadDir . $finalName)) {
$timeTaken = microtime(true) - $before; $timeTaken = microtime(true) - $before;
returnJson('OK', $finalName, $timeTaken); returnJson(array(
'status' => 'OK',
'message' => 'File uploaded successfully',
'timeTaken' => $timeTaken
));
} else { } else {
$timeTaken = microtime(true) - $before; $timeTaken = microtime(true) - $before;
returnJson('ERROR', 'File upload failed. Does the upload folder exist and did you CHMOD the folder?', $timeTaken); returnJson(array(
'status' => 'ERROR',
'message' => 'Failed to save file. Check the permissions of the upload directory.',
'timeTaken' => $timeTaken
));
} }
die(); die();
} }
returnJson('OK', $finalName, $timeTaken); returnJson(array(
'status' => 'OK',
'message' => 'File uploaded successfully',
'timeTaken' => $timeTaken
));
die(); die();
} catch (Exception $e) { // Handle any errors } catch (Exception $e) { // Handle any errors
$timeTaken = microtime(true) - $before; $timeTaken = microtime(true) - $before;
returnJson('ERROR', $e->getMessage(), $timeTaken); returnJson(array(
'status' => 'ERROR',
'message' => $e->getMessage(),
'timeTaken' => $timeTaken
));
die(); die();
} }
?>