Christopher 6 vuotta sitten
vanhempi
commit
b3673ac534
4 muutettua tiedostoa jossa 81 lisäystä ja 6 poistoa
  1. 49 1
      html/core.php
  2. 5 0
      html/lang_strings.json
  3. 6 3
      html/test.php
  4. 21 2
      html/upload.php

+ 49 - 1
html/core.php

@@ -92,7 +92,7 @@ function DIE_ERR($str){
 	}
 }
 
-
+//	Check user authorization.
 function CHECK_USER(&$err){
 	
 	//	Is a valid user provided?
@@ -156,5 +156,53 @@ function CHECK_USER(&$err){
 }
 
 
+//	Check image prelim data.
+function CHECK_IMAGE_PRELIM_DATA(&$err){
+	
+	if (empty($_FILES)){
+		
+		$err = "error_415_1";
+		return false;
+	}
+	
+	if (filesize($_FILES['image']['tmp_name']) > 0){
+		
+		if (isset($allowed_mime_types[$_FILES['image']['type']])){
+			
+			$err = null;
+			return true;
+		}
+		else{
+			
+			$err = "error_415_3";
+			return false;
+		}
+	}
+	else{
+		
+		$err = "error_400_2";
+		return false;
+	}
+}
+
+//	Check if any errors on file upload.
+function CHECK_IMAGE_ERRORS(&$err){
+	
+	if ($_FILES['image']['error'] > 0){
+		$err = "error_500_0_";
+		return false;
+	}
+	$err = null;
+	return true;
+}
+
+
+
+
+
+
+
+
+
 
 

+ 5 - 0
html/lang_strings.json

@@ -8,6 +8,11 @@
 		"error_403_2": "Error 403: Forbidden. User account data corrupted.",
 		"error_403_3": "Error 403: Forbidden. User account is disabled.",
 		"error_403_4": "Error 403: Forbidden. Invalid API key.",
+		"error_400": "Error 400: Bad Request.",
+		"error_400_1": "Error 400: Bad Request. No file provided.",
+		"error_400_2": "Error 400: Bad Request. File is empty.",
+		"error_415": "Error 415: Unsupported Media Type.",
+		"error_415_1": "Error 415: Unsupported Media Type. Supported media types are PNG, JPEG, GIF, and webm.",
 		"error_500": "Error 500: Internal Server Error.",
 		"e": "e"
 	}

+ 6 - 3
html/test.php

@@ -16,11 +16,14 @@ require_once($_SERVER['DOCUMENT_ROOT'] . "/core.php");
 //	Get user information from user-db.
 $users = GET_JSON_DATA_FROM_FILE(USERS_JSON);
 
-echo "Key: " . $users["john_smith"]["key"];
+echo "Key: " . $users["example"]["api_key"];
 echo "<br>";
-echo "Enabled: " . $users["john_smith"]["enabled"];
+echo "Enabled: " . $users["example"]["enabled"];
+echo "<br>";
+
 
-//print_r($users);
+print_r($_FILES);
+echo empty($_FILES);
 
 
 

+ 21 - 2
html/upload.php

@@ -23,11 +23,30 @@ require_once($_SERVER['DOCUMENT_ROOT'] . "/core.php");
  *
  */
 
+//	Check user authorization.
 $err = null;
-
 if (CHECK_USER($err)){
 	
-	echo "ok";
+	//	Check image prelim data.
+	$err = null;
+	if (CHECK_IMAGE_PRELIM_DATA($err)){
+		
+		if (CHECK_IMAGE_ERRORS($err)){
+			
+			echo "ok";
+			
+			
+			
+		}
+		else{
+			
+			DIE_ERR($err);
+		}
+	}
+	else{
+		
+		DIE_ERR($err);
+	}
 }
 
 else{