X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttFileHelper.class.php;h=61dd6028591a8c2edeabdb364f95667b26b6cd1e;hb=cdd27c2b163122cb6e2169851019721b3382abd7;hp=c69439d608d00cbc0bebb223f1746eb5f44560f9;hpb=37da1bee2ce91703f964ae58c580240bd3798011;p=timetracker.git

diff --git a/WEB-INF/lib/ttFileHelper.class.php b/WEB-INF/lib/ttFileHelper.class.php
index c69439d6..61dd6028 100644
--- a/WEB-INF/lib/ttFileHelper.class.php
+++ b/WEB-INF/lib/ttFileHelper.class.php
@@ -275,10 +275,11 @@ class ttFileHelper {
   }
 
   // deleteEntityFiles - deletes all files associated with an entity.
-  // TODO: decide whether deleteGroupFiles and deleteOrgFiles should be
-  // separate functions.
   function deleteEntityFiles($entity_id, $entity_type) {
 
+    if (!$this->entityHasFiles($entity_id, $entity_type))
+      return true; // No files to delete.
+    
     global $i18n;
     global $user;
     $mdb2 = getConnection();
@@ -351,6 +352,21 @@ class ttFileHelper {
     return true;
   }
 
+  // entityHasFiles determines if an entity has any files referenced in database.
+  private function entityHasFiles($entity_id, $entity_type) {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $sql = "select id from tt_files where org_id = $org_id and group_id = $group_id".
+      " and entity_type = ".$mdb2->quote($entity_type)." and entity_id = $entity_id limit 1";
+    $res = $mdb2->query($sql);
+    $val = $res->fetchRow();
+    return $val['id'] > 0;
+  }
+
   // getOrgKey obtains organization key from the database.
   private function getOrgKey() {
     global $user;