X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/blobdiff_plain/ba6f06965a4d9846e23d99a0e9f74b1361c18c40..ef06cd797d4f91e83b1e3e69d815ff3e6c773ace:/file.php?ds=sidebyside

diff --git a/file.php b/file.php
index 31c16da..0a6e32c 100644
--- a/file.php
+++ b/file.php
@@ -17,149 +17,137 @@
  *  You should have received a copy of the GNU Affero General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');
 
-define('JIRAFEAU_ROOT', dirname(__FILE__) . '/');
+require (JIRAFEAU_ROOT . 'lib/lang.php');
+require (JIRAFEAU_ROOT . 'lib/config.php');
+require (JIRAFEAU_ROOT . 'lib/settings.php');
+require (JIRAFEAU_ROOT . 'lib/functions.php');
 
-require(JIRAFEAU_ROOT . 'lib/config.php');
-require(JIRAFEAU_ROOT . 'lib/settings.php');
-require(JIRAFEAU_ROOT . 'lib/functions.php');
+if (isset ($_GET['h']) && !empty ($_GET['h']))
+{
+    $link_name = $_GET['h'];
 
-if(isset($_GET['h']) && !empty($_GET['h'])) {
-  $link_name = $_GET['h'];
+    $delete_code = '';
+    if (isset ($_GET['d']) && !empty ($_GET['d']))
+        $delete_code = $_GET['d'];
 
-  if(!ereg('[0-9a-f]{32}$', $link_name)) {
-    header("HTTP/1.0 404 Not Found");
+    if (!preg_match ('/[0-9a-f]{32}$/', $link_name))
+    {
+        header ("HTTP/1.0 404 Not Found");
 
-    require(JIRAFEAU_ROOT . 'lib/template/header.php');
-    echo '<div class="error"><p>Error 404: Not Found</p></div>';
-    require(JIRAFEAU_ROOT . 'lib/template/footer.php');
-    exit;
-  }
-
-  $link_file = VAR_LINKS . $link_name;
-  if(file_exists($link_file)) {
-    $content = file($link_file);
-    $file_name = trim($content[0]);
-    $mime_type = trim($content[1]);
-    $file_size = trim($content[2]);
-    $key = trim($content[3], NL);
-    $time = trim($content[4]);
-    $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');
+        require (JIRAFEAU_ROOT.'lib/template/header.php');
+        echo '<div class="error"><p>Error 404: Not Found</p></div>';
+        require (JIRAFEAU_ROOT.'lib/template/footer.php');
+        exit;
     }
-    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;
-  }
-
-  $counter = 1;
-  if (file_exists(VAR_FILES . $md5 . '_count')) {
-    $content = file(VAR_FILES . $md5 . '_count');
-    $counter = trim($content[0], NL);
-  }
 
-  if($time != JIRAFEAU_INFINITY) {
-    if(time() > $time) {
-      unlink($link_file);
+    $link_file = VAR_LINKS.$link_name;
+    if (file_exists ($link_file))
+    {
+        $content = file ($link_file);
+        $file_name = trim ($content[0]);
+        $mime_type = trim ($content[1]);
+        $file_size = trim ($content[2]);
+        $key = trim ($content[3], NL);
+        $time = trim ($content[4]);
+        $md5 = trim ($content[5]);
+        $onetime = trim ($content[6]);
+        $link_code = trim ($content[9]);
+
+        if (!file_exists (VAR_FILES.$md5))
+        {
+            jirafeau_delete ($link_name);
+            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;
+        }
 
-      $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');
+        if (!empty ($delete_code) && $delete_code == $link_code)
+        {
+            jirafeau_delete ($link_name);
+            require (JIRAFEAU_ROOT.'lib/template/header.php');
+            echo '<div class="message"><p>'._('File has been deleted.').
+                 '</p></div>';
+            require (JIRAFEAU_ROOT.'lib/template/footer.php');
+            exit;
         }
-        $new_name = jirafeau_detect_collision($md5 . '_' . $file_name, VAR_TRASH);
-        rename(VAR_FILES . $md5, VAR_TRASH . $new_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>';
-      require(JIRAFEAU_ROOT . 'lib/template/footer.php');
-      exit;
-    }
-  }
+        if ($time != JIRAFEAU_INFINITY && time ()> $time)
+        {
+            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>';
+            require (JIRAFEAU_ROOT.'lib/template/footer.php');
+            exit;
+        }
 
-  if(!empty($key)) {
-    if(!isset($_POST['key'])) {
-      require(JIRAFEAU_ROOT . 'lib/template/header.php');
-?>
-<div id="upload">
-<form action="<?php echo $_SERVER['REQUEST_URI']; ?>" method="post">
-<input type="hidden" name="jirafeau" value="<?php echo JIRAFEAU_VERSION; ?>" />
-<fieldset>
-  <legend><?php echo _('Key protection'); ?></legend>
-  <table>
-  <tr>
-    <td><?php echo _('Give the key of this file:'); ?> <input type="password" name="key" /></td>
-  </tr>
-  <tr>
-    <td><input type="submit" value="<?php echo _('I have the right to download this file'); ?>" /></td>
-  </tr>
-  </table>
-</fieldset>
-</form>
-</div>
-<?php
-        require(JIRAFEAU_ROOT . 'lib/template/footer.php');
-        exit;
-      } else {
-        if($key != $_POST['key']) {
-          header("HTTP/1.0 403 Forbidden");
+        if (!empty ($key))
+        {
+            if (!isset ($_POST['key']))
+            {
+                require (JIRAFEAU_ROOT.'lib/template/header.php');
+                ?><div id = "upload">
+                    <form action =
+                    "<?php echo $_SERVER['REQUEST_URI']; ?>" method =
+                    "post"> <input type = "hidden" name = "jirafeau" value =
+                    "<?php echo JIRAFEAU_VERSION; ?>" /><fieldset>
+                    <legend><?php echo _('Key protection');
+                ?></legend> <table> <tr>
+                    <td><?php echo _('Give the key of this file:');
+                ?><input type = "password" name =
+                    "key" /></td> </tr> <tr> <td><input type =
+                    "submit" value =
+                    "<?php echo _('I have the right to download this file'); ?>"
+                    /></td> </tr> </table> </fieldset> </form> </div>
+                    <?php require (JIRAFEAU_ROOT.'lib/template/footer.php');
+                exit;
+            }
+            else
+            {
+                if ($key != md5 ($_POST['key']))
+                {
+                    header ("HTTP/1.0 403 Forbidden");
+
+                    require (JIRAFEAU_ROOT.'lib/template/header.php');
+                    echo '<div class="error"><p>Error 403: Forbidden</p></div>';
+                    require (JIRAFEAU_ROOT.'lib/template/footer.php');
+                    exit;
+                }
+            }
+        }
 
-          require(JIRAFEAU_ROOT . 'lib/template/header.php');
-          echo '<div class="error"><p>Error 403: Forbidden</p></div>';
-          require(JIRAFEAU_ROOT . 'lib/template/footer.php');
-          exit;
+        header ('Content-Length: ' . $file_size);
+        header ('Content-Type: ' . $mime_type);
+        if (!jirafeau_is_viewable ($mime_type))
+        {
+            header ('Content-Disposition: attachment; filename="' .
+                    $file_name . '"');
         }
-      }
-    }
+        readfile (VAR_FILES.$md5);
 
-    header('Content-Length: ' . $file_size);
-    header('Content-Type: ' . $mime_type);
-    if(!jirafeau_is_viewable($mime_type)) {
-      header('Content-Disposition: attachment; filename="' . $file_name . '"');
+        if ($onetime == 'O')
+            jirafeau_delete ($link_name);
+        exit;
     }
-    readfile(VAR_FILES . $md5);
-
-    if($onetime == 'O') {
-      unlink($link_file);
+    else
+    {
+        header ("HTTP/1.0 404 Not Found");
 
-      $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);
-      }
+        require (JIRAFEAU_ROOT.'lib/template/header.php');
+        echo '<div class="error"><p>Error 404: Not Found</p></div>';
+        require (JIRAFEAU_ROOT.'lib/template/footer.php');
+        exit;
     }
+}
+else
+{
+    header ('Location: '.$cfg['web_root']);
     exit;
-  } else {
-    header("HTTP/1.0 404 Not Found");
-
-    require(JIRAFEAU_ROOT . 'lib/template/header.php');
-    echo '<div class="error"><p>Error 404: Not Found</p></div>';
-    require(JIRAFEAU_ROOT . 'lib/template/footer.php');
-    exit;
-  }
-} else {
-  header('Location: ' . $cfg['web_root']);
-  exit;
 }
 
 ?>