delete files instead of moving them to trash

[jirafeau_mojo42.git] / file.php

diff --git a/file.php b/file.php
index 31c16da33b85d7d8a1c3c8381612e84cc3df1d1a..a8d42e488a12df690baaeaca4967ece19ebc9b13 100644 (file)
--- a/file.php
+++ b/file.php
@@ -47,40 +47,18 @@ if(isset($_GET['h']) && !empty($_GET['h'])) {
     $md5 = trim($content[5]);
     $onetime = trim($content[6]);
   
-  if(!file_exists(VAR_FILES . $md5)) {
-    if (file_exists(VAR_FILES . $md5 . '_count')) {
-      unlink(VAR_FILES . $md5 . '_count');
-    }
-    unlink($link_file);
-    require(JIRAFEAU_ROOT . 'lib/template/header.php');
-    echo '<div class="error"><p>' . _('File not available.') . '</p></div>';
-    require(JIRAFEAU_ROOT . 'lib/template/footer.php');
-    exit;
-  }
+    if(!file_exists(VAR_FILES . $md5)) {
+      jirafeau_delete($link_name);
 
-  $counter = 1;
-  if (file_exists(VAR_FILES . $md5 . '_count')) {
-    $content = file(VAR_FILES . $md5 . '_count');
-    $counter = trim($content[0], NL);
-  }
+      require(JIRAFEAU_ROOT . 'lib/template/header.php');
+      echo '<div class="error"><p>' . _('File not available.') . '</p></div>';
+      require(JIRAFEAU_ROOT . 'lib/template/footer.php');
+      exit;
+    }
 
   if($time != JIRAFEAU_INFINITY) {
     if(time() > $time) {
-      unlink($link_file);
-
-      $counter--;
-      if ($counter >= 1) {
-        $handle = fopen(VAR_FILES . $md5 . '_count', 'w');
-        fwrite($handle, $counter);
-        fclose($handle);
-      }
-      elseif ($counter == 0) {
-        if (file_exists(VAR_FILES . $md5 . '_count')) {
-          unlink(VAR_FILES . $md5 . '_count');
-        }
-        $new_name = jirafeau_detect_collision($md5 . '_' . $file_name, VAR_TRASH);
-        rename(VAR_FILES . $md5, VAR_TRASH . $new_name);
-      }
+      jirafeau_delete($link_name);
 
       require(JIRAFEAU_ROOT . 'lib/template/header.php');
       echo '<div class="error"><p>' . _('The time limit of this file has expired. It has been deleted.') . '</p></div>';
@@ -132,21 +110,7 @@ if(isset($_GET['h']) && !empty($_GET['h'])) {
     readfile(VAR_FILES . $md5);
 
     if($onetime == 'O') {
-      unlink($link_file);
-
-      $counter--;
-      if ($counter >= 1) {
-        $handle = fopen(VAR_FILES . $md5 . '_count', 'w');
-        fwrite($handle, $counter);
-        fclose($handle);
-      }
-      elseif ($counter == 0) {
-        if (file_exists(VAR_FILES . $md5 . '_count')) {
-          unlink(VAR_FILES . $md5 . '_count');
-        }
-        $new_name = jirafeau_detect_collision($md5 . '_' . $file_name, VAR_TRASH);
-        rename(VAR_FILES . $md5, VAR_TRASH . $new_name);
-      }
+      jirafeau_delete($link_name);
     }
     exit;
   } else {