X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=WEB-INF%2Flib%2FttFileHelper.class.php;h=80f07166aed00c1458bf1a8596ea51617661a2bc;hb=c5461f26c2b9b04044747c9f78fd710627067c83;hp=f41fa8463c8ed8883c453a57a71ddafb2b1526ef;hpb=632603b4ab876cc0fa641402a16c824888deae7a;p=timetracker.git

diff --git a/WEB-INF/lib/ttFileHelper.class.php b/WEB-INF/lib/ttFileHelper.class.php
index f41fa846..80f07166 100644
--- a/WEB-INF/lib/ttFileHelper.class.php
+++ b/WEB-INF/lib/ttFileHelper.class.php
@@ -50,7 +50,7 @@ class ttFileHelper {
   }
 
   // checkSiteRegistration - obtains site id and key from local database.
-  // If not found, it tries to register with file stroage facility.
+  // If not found, it tries to register with file storage facility.
   function checkSiteRegistration() {
 
     global $i18n;
@@ -84,22 +84,22 @@ class ttFileHelper {
       // Close connection.
       curl_close($ch);
 
-      if ($result) {
-        $result_array = json_decode($result, true);
-        if ($result_array && $result_array['id'] && $result_array['key']) {
+      $result_array = json_decode($result, true);
+      if ($result_array && $result_array['id'] && $result_array['key']) {
 
-          $this->site_id = $mdb2->quote($result_array['id']);
-          $this->site_key = $mdb2->quote($result_array['key']);
+        $this->site_id = $result_array['id'];
+        $this->site_key = $result_array['key'];
 
-          // Registration successful. Store id and key locally for future use.
-          $sql = "insert into tt_site_config values('locker_id', $site_id, now(), null)";
-          $mdb2->exec($sql);
-          $sql = "insert into tt_site_config values('locker_key', $key, now(), null)";
-          $mdb2->exec($sql);
-        }
+        // Registration successful. Store id and key locally for future use.
+        $sql = "insert into tt_site_config values('locker_id', $this->site_id, now(), null)";
+        $mdb2->exec($sql);
+        $sql = "insert into tt_site_config values('locker_key', ".$mdb2->quote($this->site_key).", now(), null)";
+        $mdb2->exec($sql);
+      } else {
+        $this->errors->add($i18n->get('error.file_storage'));
       }
     } else {
-      // Site id found, need to update site attributes.
+      // Site id found.
       $this->site_id = $val['id'];
 
       // Obtain site key.
@@ -112,8 +112,6 @@ class ttFileHelper {
 
   // putFile - puts uploaded file in remote storage.
   function putFile($fields) {
-    // if (!$this->site_id || !$this->site_key) return false;
-
     global $i18n;
     global $user;
     $mdb2 = getConnection();
@@ -166,7 +164,7 @@ class ttFileHelper {
 
     if (!$file_id || !$file_key) {
       if ($file_error) {
-        // Add an error message from file storage facility if we have it.
+        // Add an error from file storage facility if we have it.
         $this->errors->add($file_error);
       }
       return false;