X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/9a9c9a8bf83241c193c5bef6361d41893e72dfd3..b013aca5f182801fea34f3561965aa3c991aa782:/f.php?ds=sidebyside

diff --git a/f.php b/f.php
index d94b55b..9219493 100644
--- a/f.php
+++ b/f.php
@@ -24,7 +24,7 @@ require(JIRAFEAU_ROOT . 'lib/functions.php');
 require(JIRAFEAU_ROOT . 'lib/lang.php');
 
 if (!isset($_GET['h']) || empty($_GET['h'])) {
-    header('Location: ' . $cfg['web_root']);
+    header('Location: ./');
     exit;
 }
 
@@ -39,22 +39,15 @@ $link_name = $_GET['h'];
 
 if (!preg_match('/[0-9a-zA-Z_-]+$/', $link_name)) {
     require(JIRAFEAU_ROOT.'lib/template/header.php');
-    echo '<div class="error"><p>' . t('Sorry, the requested file is not found') . '</p></div>';
+    echo '<div class="error"><p>' . t('FILE_404') . '</p></div>';
     require(JIRAFEAU_ROOT.'lib/template/footer.php');
     exit;
 }
 
 $link = jirafeau_get_link($link_name);
-if (count($link) == 0) {
-    /* Try alias. */
-    $alias = jirafeau_get_alias(md5($link_name));
-    if (count($alias) > 0) {
-        $link = jirafeau_get_link($alias["destination"]);
-    }
-}
 if (count($link) == 0) {
     require(JIRAFEAU_ROOT.'lib/template/header.php');
-    echo '<div class="error"><p>' . t('Sorry, the requested file is not found') .
+    echo '<div class="error"><p>' . t('FILE_404') .
     '</p></div>';
     require(JIRAFEAU_ROOT.'lib/template/footer.php');
     exit;
@@ -80,21 +73,43 @@ if (isset($_GET['p']) && !empty($_GET['p'])) {
     $do_preview = true;
 }
 
-$p = s2p($link['md5']);
-if (!file_exists(VAR_FILES . $p . $link['md5'])) {
+$p = s2p($link['hash']);
+if (!file_exists(VAR_FILES . $p . $link['hash'])) {
     jirafeau_delete_link($link_name);
     require(JIRAFEAU_ROOT.'lib/template/header.php');
-    echo '<div class="error"><p>'.t('File not available.').
+    echo '<div class="error"><p>'.t('FILE_NOT_AVAIL').
     '</p></div>';
     require(JIRAFEAU_ROOT.'lib/template/footer.php');
     exit;
 }
 
 if (!empty($delete_code) && $delete_code == $link['link_code']) {
-    jirafeau_delete_link($link_name);
     require(JIRAFEAU_ROOT.'lib/template/header.php');
-    echo '<div class="message"><p>'.t('File has been deleted.').
-     '</p></div>';
+    if (isset($_POST['do_delete'])) {
+        jirafeau_delete_link($link_name);
+        echo '<div class="message"><p>'.t('FILE_DELETED').
+            '</p></div>';
+    } else { ?>
+        <div>
+        <form action="f.php" method="post" id="submit_delete_post" class="form login">
+        <input type="hidden" name="do_delete" value=1/>
+        <fieldset>
+             <legend> <?php echo t('CONFIRM_DEL') ?> </legend>
+             <table>
+             <tr><td>
+             <?php echo t('GONNA_DEL') . ' "' . jirafeau_escape($link['file_name']) . '" (' . jirafeau_human_size($link['file_size']) . ').' ?>
+             </td></tr>
+             <tr><td>
+                <?php echo t('USING_SERVICE'). ' <a href="tos.php" target="_blank" rel="noopener noreferrer">' . t('TOS') . '</a>.' ?>
+             </td></tr>
+             <tr><td>
+                <input type="submit" id="submit_delete"  value="<?php echo t('DELETE'); ?>"
+                onclick="document.getElementById('submit_delete_post').action='<?php echo 'f.php?h=' . $link_name . '&amp;d=' . $delete_code . "';"; ?>
+                document.getElementById('submit_delete').submit ();"/>
+             </td></tr>
+             </table>
+         </fieldset></form></div><?php
+    }
     require(JIRAFEAU_ROOT.'lib/template/footer.php');
     exit;
 }
@@ -103,8 +118,8 @@ if ($link['time'] != JIRAFEAU_INFINITY && time() > $link['time']) {
     jirafeau_delete_link($link_name);
     require(JIRAFEAU_ROOT.'lib/template/header.php');
     echo '<div class="error"><p>'.
-    t('The time limit of this file has expired.') . ' ' .
-    t('File has been deleted.') .
+    t('FILE_EXPIRED') . ' ' .
+    t('FILE_DELETED') .
     '</p></div>';
     require(JIRAFEAU_ROOT . 'lib/template/footer.php');
     exit;
@@ -112,7 +127,7 @@ if ($link['time'] != JIRAFEAU_INFINITY && time() > $link['time']) {
 
 if (empty($crypt_key) && $link['crypted']) {
     require(JIRAFEAU_ROOT.'lib/template/header.php');
-    echo '<div class="error"><p>' . t('Sorry, the requested file is not found') .
+    echo '<div class="error"><p>' . t('FILE_404') .
     '</p></div>';
     require(JIRAFEAU_ROOT.'lib/template/footer.php');
     exit;
@@ -123,36 +138,33 @@ if (!empty($link['key'])) {
     if (!isset($_POST['key'])) {
         require(JIRAFEAU_ROOT.'lib/template/header.php');
         echo '<div>' .
-             '<form action = "';
-        echo JIRAFEAU_ABSPREFIX . 'f.php';
-        echo '" ' .
-             'method = "post" id = "submit_post">'; ?>
+             '<form action="f.php" method="post" id="submit_post" class="form login">'; ?>
              <input type = "hidden" name = "jirafeau" value = "<?php echo JIRAFEAU_VERSION ?>"/><?php
         echo '<fieldset>' .
-             '<legend>' . t('Password protection') .
+             '<legend>' . t('PSW_PROTEC') .
              '</legend><table><tr><td>' .
-             t('Give the password of this file') . ' : ' .
+             t('GIMME_PSW') . ' : ' .
              '<input type = "password" name = "key" />' .
              '</td></tr>' .
              '<tr><td>' .
-             t('By using our services, you accept our'). ' <a href="' . JIRAFEAU_ABSPREFIX . 'tos.php' . '">' . t('Terms of Service') . '</a>.' .
+             t('USING_SERVICE'). ' <a href="tos.php" target="_blank" rel="noopener noreferrer">' . t('TOS') . '</a>.' .
              '</td></tr>';
 
         if ($link['onetime'] == 'O') {
             echo '<tr><td id="self_destruct">' .
-                 t('Warning, this file will self-destruct after being read') .
+                 t('AUTO_DESTRUCT') .
                  '</td></tr>';
-        } ?><tr><td><input type="submit" id = "submit_download"  value="<?php echo t('Download'); ?>"
+        } ?><tr><td><input type="submit" id = "submit_download"  value="<?php echo t('DL'); ?>"
         onclick="document.getElementById('submit_post').action='<?php
-        echo JIRAFEAU_ABSPREFIX . 'f.php?h=' . $link_name . '&amp;d=1';
+        echo 'f.php?h=' . $link_name . '&amp;d=1';
         if (!empty($crypt_key)) {
             echo '&amp;k=' . urlencode($crypt_key);
         } ?>';
         document.getElementById('submit_download').submit ();"/><?php
         if ($cfg['preview'] && jirafeau_is_viewable($link['mime_type'])) {
-            ?><input type="submit" id = "submit_preview"  value="<?php echo t('Preview'); ?>"
+            ?><input type="submit" id = "submit_preview"  value="<?php echo t('PREVIEW'); ?>"
             onclick="document.getElementById('submit_post').action='<?php
-            echo JIRAFEAU_ABSPREFIX . 'f.php?h=' . $link_name . '&amp;p=1';
+            echo 'f.php?h=' . $link_name . '&amp;p=1';
             if (!empty($crypt_key)) {
                 echo '&amp;k=' . urlencode($crypt_key);
             } ?>';
@@ -168,7 +180,7 @@ if (!empty($link['key'])) {
         } else {
             sleep(2);
             require(JIRAFEAU_ROOT.'lib/template/header.php');
-            echo '<div class="error"><p>' . t('Access denied') .
+            echo '<div class="error"><p>' . t('ACCESS_KO') .
             '</p></div>';
             require(JIRAFEAU_ROOT.'lib/template/footer.php');
             exit;
@@ -179,36 +191,33 @@ if (!empty($link['key'])) {
 if (!$password_challenged && !$do_download && !$do_preview) {
     require(JIRAFEAU_ROOT.'lib/template/header.php');
     echo '<div>' .
-             '<form action="';
-    echo JIRAFEAU_ABSPREFIX . 'f.php';
-    echo '" ' .
-             'method = "post" id = "submit_post">'; ?>
+             '<form action="f.php" method="post" id="submit_post" class="form download">'; ?>
              <input type = "hidden" name = "jirafeau" value = "<?php echo JIRAFEAU_VERSION ?>"/><?php
-        echo '<fieldset><legend>' . htmlspecialchars($link['file_name']) . '</legend><table>' .
+        echo '<fieldset><legend>' . jirafeau_escape($link['file_name']) . '</legend><table>' .
              '<tr><td>' .
-             t('You are about to download') . ' "' . htmlspecialchars($link['file_name']) . '" (' . jirafeau_human_size($link['file_size']) . ').' .
+             t('NOW_DOWNLOADING') . ' "' . jirafeau_escape($link['file_name']) . '" (' . jirafeau_human_size($link['file_size']) . ').' .
              '</td></tr>' .
              '<tr><td>' .
-             t('By using our services, you accept our'). ' <a href="' . JIRAFEAU_ABSPREFIX . 'tos.php' . '">' . t('Terms of Service') . '</a>.' .
+             t('USING_SERVICE'). ' <a href="tos.php" target="_blank" rel="noopener noreferrer">' . t('TOS') . '</a>.' .
              '</td></tr>';
 
     if ($link['onetime'] == 'O') {
         echo '<tr><td id="self_destruct">' .
-                 t('Warning, this file will self-destruct after being read') .
+                 t('AUTO_DESTRUCT') .
                  '</td></tr>';
     } ?>
-        <tr><td><input type="submit" id = "submit_download"  value="<?php echo t('Download'); ?>"
+        <tr><td><input type="submit" id = "submit_download"  value="<?php echo t('DL'); ?>"
         onclick="document.getElementById('submit_post').action='<?php
-        echo JIRAFEAU_ABSPREFIX . 'f.php?h=' . $link_name . '&amp;d=1';
+        echo 'f.php?h=' . $link_name . '&amp;d=1';
     if (!empty($crypt_key)) {
         echo '&amp;k=' . urlencode($crypt_key);
     } ?>';
         document.getElementById('submit_post').submit ();"/><?php
 
         if ($cfg['preview'] && jirafeau_is_viewable($link['mime_type'])) {
-            ?><input type="submit" id = "submit_preview"  value="<?php echo t('Preview'); ?>"
+            ?><input type="submit" id = "submit_preview"  value="<?php echo t('PREVIEW'); ?>"
             onclick="document.getElementById('submit_post').action='<?php
-        echo JIRAFEAU_ABSPREFIX . 'f.php?h=' . $link_name . '&amp;p=1';
+        echo 'f.php?h=' . $link_name . '&amp;p=1';
             if (!empty($crypt_key)) {
                 echo '&amp;k=' . urlencode($crypt_key);
             } ?>';
@@ -229,19 +238,21 @@ if (!jirafeau_is_viewable($link['mime_type']) || !$cfg['preview'] || $do_downloa
     header('Content-Disposition: filename="' . $link['file_name'] . '"');
 }
 header('Content-Type: ' . $link['mime_type']);
-header('Content-MD5: ' . hex_to_base64($link['md5']));
+if ($cfg['file_hash'] == "md5") {
+    header('Content-MD5: ' . hex_to_base64($link['hash']));
+}
 
 /* Read encrypted file. */
 if ($link['crypted']) {
     /* Init module */
     $m = mcrypt_module_open('rijndael-256', '', 'ofb', '');
     /* Extract key and iv. */
-    $md5_key = md5($crypt_key);
-    $iv = jirafeau_crypt_create_iv($md5_key, mcrypt_enc_get_iv_size($m));
+    $hash_key = md5($crypt_key);
+    $iv = jirafeau_crypt_create_iv($hash_key, mcrypt_enc_get_iv_size($m));
     /* Init module. */
-    mcrypt_generic_init($m, $md5_key, $iv);
+    mcrypt_generic_init($m, $hash_key, $iv);
     /* Decrypt file. */
-    $r = fopen(VAR_FILES . $p . $link['md5'], 'r');
+    $r = fopen(VAR_FILES . $p . $link['hash'], 'r');
     while (!feof($r)) {
         $dec = mdecrypt_generic($m, fread($r, 1024));
         print $dec;
@@ -254,7 +265,7 @@ if ($link['crypted']) {
 }
 /* Read file. */
 else {
-    $r = fopen(VAR_FILES . $p . $link['md5'], 'r');
+    $r = fopen(VAR_FILES . $p . $link['hash'], 'r');
     while (!feof($r)) {
         print fread($r, 1024);
         ob_flush();