Small improvements in error handling

Author: josvandervelde

openml_OS/helpers/file_upload_helper.php

@@ -1,18 +1,19 @@
 <?php
 
 function check_uploaded_file($file, $image_restriction = false, &$message = NULL) {
+
   if($file == false) {
     $message = 'File meta-info is missing. ';
     return false;
   } else if(is_array($file) == false) {
     $message = 'File meta-info is no array. ';
     return false;
-  } else if($file['size'] == 0) {
-    $message = 'Filesize is 0 bytes, which is not allowed. ';
-    return false;
   } else if($file['error'] > 0) { // php error generated
     $message = 'Upload Error ' . $file['error'] . ': ' . upload_error_message($file['error']);
     return false;
+  } else if($file['size'] == 0) {
+    $message = 'Filesize is 0 bytes, which is not allowed. ';
+    return false;
   } else if(!file_exists($file['tmp_name'])) { // file doesn't exist
     $message = 'File not present at expected location. ';
     return false;

openml_OS/models/api/v1/Api_data.php

@@ -1616,8 +1616,9 @@ private function data_features_upload() {
     }
 
     // get correct description
-    if (isset($_FILES['description']) == false || check_uploaded_file($_FILES['description']) == false) {
-      $this->returnError(442, $this->version);
+    $message = '';
+    if (isset($_FILES['description']) == false || check_uploaded_file($_FILES['description'], false, $message) == false) {
+      $this->returnError(442, $this->version, $this->openmlGeneralErrorCode, 'Error: ' . $message);
       return;
     }