1.7.0

[uguu.git] / src / static / php / upload.php

diff --git a/src/static/php/upload.php b/src/static/php/upload.php
index ee6048ec6429a9627a25304aef290870fc0838be..7d73373b05899d1bdb96f964b337d5da63f6f7b1 100644 (file)
--- a/src/static/php/upload.php
+++ b/src/static/php/upload.php
@@ -1,8 +1,9 @@
 <?php
+    
     /**
      * Uguu
      *
-     * @copyright Copyright (c) 2022 Go Johansson (nokonoko) <neku@pomf.se>
+     * @copyright Copyright (c) 2022-2023 Go Johansson (nokonoko) <neku@pomf.se>
      *
      * 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
@@ -17,37 +18,31 @@
      * You should have received a copy of the GNU General Public License
      * along with this program.  If not, see <https://www.gnu.org/licenses/>.
      */
-    
     require_once __DIR__ . '/../vendor/autoload.php';
     
     use Pomf\Uguu\Classes\Upload;
     use Pomf\Uguu\Classes\Response;
     
-    function handleFile(string $outputFormat, array $files)
+    function handleFiles(string $outputFormat, array $files):void
     {
         $upload = new Upload($outputFormat);
         $files = $upload->reFiles($files);
-        try {
-            $upload->fingerPrint(count($files));
-            $res = [];
-            foreach ($files as $ignored) {
-                $res[] = $upload->uploadFile();
-            }
-            if (!empty($res)) {
-                $upload->send($res);
-            }
-        } catch (Exception $e) {
-            $upload->error($e->getCode(), $e->getMessage());
+        $fCount = count($files);
+        $upload->fingerPrint($fCount);
+        $res = [];
+        $i = 0;
+        while ($i < $fCount) {
+            $res[] = $upload->uploadFile();
+            $i++;
+        }
+        if (!empty($res)) {
+            $upload->send($res);
         }
     }
     
+    $response = new Response('json');
+    $resType = (isset($_GET['output']) and !empty($_GET['output'])) ? strtolower(preg_replace('/[^a-zA-Z]/', '', $_GET['output'])) : 'json';
     if (!isset($_FILES['files']) or empty($_FILES['files'])) {
-        $response = new Response('json');
         $response->error(400, 'No input file(s)');
     }
-    if (isset($_GET['output']) and !empty($_GET['output'])) {
-        $resType = strtolower(preg_replace('/[^a-zA-Z]/', '', $_GET['output']));
-    } else {
-        $resType = 'json';
-    }
-    handleFile($resType, $_FILES['files']);
\ No newline at end of file
+    handleFiles($resType, $_FILES['files']);
\ No newline at end of file