Resuming work on attachments.

[timetracker.git] / WEB-INF / lib / ttFileHelper.class.php

diff --git a/WEB-INF/lib/ttFileHelper.class.php b/WEB-INF/lib/ttFileHelper.class.php
index a45326cbc46279e55ccd62d4d47695ef97555029..5c9b385b7f540398a3ff550839adec90041dfaaf 100644 (file)
--- a/WEB-INF/lib/ttFileHelper.class.php
+++ b/WEB-INF/lib/ttFileHelper.class.php
@@ -85,8 +85,14 @@ class ttFileHelper {
       curl_close($ch);
 
       $result_array = json_decode($result, true);
       curl_close($ch);
 
       $result_array = json_decode($result, true);

-      if ($result_array && $result_array['id'] && $result_array['key']) {
-
+      if (!$result_array) {
+        $this->errors->add($i18n->get('error.file_storage'));
+      }
+      else if ($result_array['error']) {
+        // Add an error from file storage facility if we have it.
+        $this->errors->add($result_array['error']);
+      }
+      else if ($result_array['id'] && $result_array['key']) {

         $this->site_id = $result_array['id'];
         $this->site_key = $result_array['key'];
 
         $this->site_id = $result_array['id'];
         $this->site_key = $result_array['key'];
 


@@ -159,12 +165,12 @@ class ttFileHelper {
     $result_array = json_decode($result, true);
     $file_id = (int) $result_array['file_id'];
     $file_key = $result_array['file_key'];
     $result_array = json_decode($result, true);
     $file_id = (int) $result_array['file_id'];
     $file_key = $result_array['file_key'];

-    $file_error = $result_array['file_error'];
+    $error = $result_array['error'];

 
     if (!$file_id || !$file_key) {
 
     if (!$file_id || !$file_key) {

-      if ($file_error) {
+      if ($error) {

         // Add an error from file storage facility if we have it.
         // Add an error from file storage facility if we have it.

-        $this->errors->add($file_error);
+        $this->errors->add($error);

       }
       return false;
     }
       }
       return false;
     }