add function to generate file paths

Signed-off-by: Florian Pritz <bluewind@xssn.at>

1 files changed, 5 insertions, 1 deletions

diff --git a/system/application/models/file_mod.php b/system/application/models/file_mod.php
index 96415bc2f..445ccdce4 100644
--- a/system/application/models/file_mod.php
+++ b/system/application/models/file_mod.php
@@ -60,6 +60,10 @@ class File_mod extends Model {
         return $this->config->item('upload_path').'/'.substr($hash, 0, 3);
     }
 
+    function file($hash) {
+      return $this->folder($hash).'/'.$hash;
+    }
+
     function hash_password($password)
     {
     // TODO: move salt to config
@@ -95,7 +99,7 @@ class File_mod extends Model {
       $query = $this->db->query($sql, array($id, $password));
 
       if($this->unused_file($filedata['hash'])) {
-        unlink($this->config->item('upload_path').'/'.substr($filedata['hash'], 0, 3).'/'.$filedata['hash']);
+        unlink($this->file(substr($filedata['hash'])));
         // TODO: remove empty folders
       }
     }