major code cleanup and more error checking added.

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

diff --git a/static/php/upload.php b/static/php/upload.php
index f4abf7fa9d8da1fbd43e049edd69ebd67aad647d..3a9b0f9af0984cdf00e4b485d1c0d9958e905300 100644 (file)
--- a/static/php/upload.php
+++ b/static/php/upload.php
@@ -20,18 +20,20 @@
 
 require_once 'includes/Upload.class.php';
 
-use Core\Response as Response;
+$type = $_GET['output'] ?? 'json';
+$response = (new Core\Response($type));
 
 if (isset($_FILES['files'])) {
     $uploads = (new Upload())->reFiles($_FILES['files']);
 
-    foreach ($uploads as $upload) {
-        $res[] = (new Upload())->uploadFile($upload);
-    }
-
-    if (isset($res)) {
-        (new Response())->returnSuccess($res);
-    } else {
-        (new Response())->returnError(400, 'No input file(s)', 'N/A');
+    try {
+        foreach ($uploads as $upload) {
+            $res[] = (new Upload())->uploadFile($upload);
+        }
+        $response->send($res);
+    } catch (Exception $e) {
+        $response->error($e->getCode(), $e->getMessage());
     }
+} else {
+    $response->error(400, 'No input file(s)');
 }
\ No newline at end of file