Improve check for nested uploaded file fields

Author: bencroker

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release Notes for Snaptcha
 
+## 5.1.2 - 2025-07-01
+
+- Improved the check for nested uploaded file fields.
+
 ## 5.1.1 - 2025-06-23
 
 - Improved the check for uploaded files.

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "putyourlightson/craft-snaptcha",
   "description": "Automatically validates forms and prevents spam bots from submitting to your site.",
-  "version": "5.1.1",
+  "version": "5.1.2",
   "type": "craft-plugin",
   "homepage": "https://putyourlightson.com/plugins/snaptcha",
   "license": "proprietary",

src/services/SnaptchaService.php

@@ -100,10 +100,10 @@ public function hasFileUpload(): bool
         foreach ($_FILES as $file) {
             $error = $file['error'] ?? null;
             if (is_array($error)) {
-                if (in_array(UPLOAD_ERR_OK, $error, true)) {
+                if ($this->hasUploadedFileRecursive($error)) {
                     return true;
                 }
-            } elseif ($error === UPLOAD_ERR_OK) {
+            } elseif ($error !== UPLOAD_ERR_NO_FILE) {
                 return true;
             }
         }
@@ -366,6 +366,24 @@ private function getNormalizedArray(array|string $values): array
         return $values;
     }
 
+    /**
+     *  Returns whether the request has a file upload by recursively checking.
+     */
+    private function hasUploadedFileRecursive(array $errors): bool
+    {
+        foreach ($errors as $error) {
+            if (is_array($error)) {
+                if ($this->hasUploadedFileRecursive($error)) {
+                    return true;
+                }
+            } elseif ($error !== UPLOAD_ERR_NO_FILE) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     /**
      * Flattens a multi-dimensional array of values to a flat array that can
      * be used to output hidden fields, preserving the keys.