Small code fixes in API code

pub/api/classes/API.php

@@ -34,15 +34,6 @@ class API
     # with the name _return and value of the url to return to.
     public $return_url;
 
-    # Required fields & optional fields set by the API actions. This is an array like:
-    # Example:
-    # 'user_uuid' => ['type' => 'string', 'min' => 5, 'max' => 36],
-    # 'user_enabled' => ['type' => 'int', 'min' => 0, 'max' => 99],
-    # 'user_active' => ['type' => 'enum', 'values' => ['active', 'inactive', 'banned']],
-    # 'user_email' => ['type' => 'string', 'format' => 'email'],
-    private $requiredFields = [];
-    private $optionalFields = [];
-
     # Used for the query builder base
     public $baseQuery = false;
 
@@ -199,11 +190,9 @@ class API
     {
         $inputData = $this->postedData;
 
-        $this->requiredFields = $requiredFields;
-        $this->optionalFields = $optionalFields;
         $sanitizedData = [];
 
-        foreach ($this->requiredFields as $field => $rules) {
+        foreach ($requiredFields as $field => $rules) {
 
             if (!array_key_exists($field, $inputData)) {
                 $this->apiOutput(400, ['error' => "Missing required field: $field"]);
@@ -220,7 +209,7 @@ class API
 
 
         // Check optional fields
-        foreach ($this->optionalFields as $field => $rules) {
+        foreach ($optionalFields as $field => $rules) {
             if (isset($inputData[$field])) {
                 $value = $inputData[$field];
 
@@ -343,14 +332,9 @@ class API
                 if (!is_string($value)) return false;
                 return base64_encode(base64_decode($value, true)) === $value;
 
-            case 'uuid':
-                if (!is_string($value)) return false;
-                return preg_match('/^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i', $value);
-
             case 'json':
                 if (!is_string($value)) return false;
-                json_decode($value);
-                return json_last_error() === JSON_ERROR_NONE;
+                return json_validate($value);
 
             case 'array':
                 if (!is_array($value)) return false;
@@ -393,7 +377,7 @@ class API
             case 'boolean':
                 if (is_string($value)) {
                     $value = strtolower(trim($value));
-                    return in_array($value, ['true', '1'], true) ? true : false;
+                    return in_array($value, ['true', '1'], true);
                 }
 
                 return (bool)$value;
@@ -453,6 +437,8 @@ class API
         if ($returnBoolean) {
             return true;
         }
+
+        return false;
     }
 
     protected function setReturnUrl()
@@ -517,8 +503,7 @@ class API
             return false;
         }
 
-        json_decode($rawInput, true);
-        if (json_last_error() !== JSON_ERROR_NONE) {
+        if (!json_validate($rawInput)) {
             return false;
         }
 
@@ -590,17 +575,17 @@ class API
             return true;
         }
 
-        if (strpos($contentType, 'application/json') !== false) {
+        if (str_contains($contentType, 'application/json')) {
             $this->content_type = 'application/json';
             return true;
         }
 
-        if (strpos($contentType, 'application/x-www-form-urlencoded') !== false) {
+        if (str_contains($contentType, 'application/x-www-form-urlencoded')) {
             $this->content_type = 'application/x-www-form-urlencoded';
             return true;
         }
 
-        if (strpos($contentType, 'multipart/form-data') !== false) {
+        if (str_contains($contentType, 'multipart/form-data')) {
             $this->content_type = 'multipart/form-data';
             return true;
         }
@@ -662,10 +647,9 @@ class API
         try {
             $stmt = $this->conn->prepare($query);
 
-        } catch (mysqli_sql_exception $e) {
+        } catch (\mysqli_sql_exception $e) {
             // If an error occurs during prepare, catch it and return a proper response
             $this->apiOutput(500, ['error' => 'Database error: ' . $e->getMessage()]);
-            return null;
         }
 
         return $stmt;
@@ -679,13 +663,12 @@ class API
         try {
             $stmt->execute();
             return true;
-        } catch (mysqli_sql_exception $e) {
+        } catch (\mysqli_sql_exception $e) {
             if ($e->getCode() === 1451) {
                 $this->apiOutput(409, ['error' => 'Cannot delete record: dependent data exists.']);
             } else {
                 $this->apiOutput(500, ['error' => 'Database error: ' . $e->getMessage()]);
             }
-            return null;
         }
     }