X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/blobdiff_plain/625f38a7decfc1ed72e0120c6ff34fcbe2d55100..dc9f5ac6cb09145c3856f3ede501a4ae7f1c6d11:/f.php?ds=sidebyside

diff --git a/f.php b/f.php
index fd8b89f..4289eae 100644
--- a/f.php
+++ b/f.php
@@ -17,16 +17,14 @@
  *  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.original.php');
-require (JIRAFEAU_ROOT . 'lib/settings.php');
-require (JIRAFEAU_ROOT . 'lib/functions.php');
+require(JIRAFEAU_ROOT . 'lib/settings.php');
+require(JIRAFEAU_ROOT . 'lib/functions.php');
+require(JIRAFEAU_ROOT . 'lib/lang.php');
 
-if (!isset ($_GET['h']) || empty ($_GET['h']))
-{
-    header ('Location: ' . $cfg['web_root']);
+if (!isset($_GET['h']) || empty($_GET['h'])) {
+    header('Location: ./');
     exit;
 }
 
@@ -39,93 +37,108 @@ if (!isset ($_GET['h']) || empty ($_GET['h']))
 
 $link_name = $_GET['h'];
 
-if (!preg_match ('/[0-9a-zA-Z_-]+$/', $link_name))
-{
-    require (JIRAFEAU_ROOT.'lib/template/header.php');
+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>';
-    require (JIRAFEAU_ROOT.'lib/template/footer.php');
+    require(JIRAFEAU_ROOT.'lib/template/footer.php');
     exit;
 }
 
-$link = jirafeau_get_link ($link_name);
-if (count ($link) == 0)
-{
-    require (JIRAFEAU_ROOT.'lib/template/header.php');
+$link = jirafeau_get_link($link_name);
+if (count($link) == 0) {
+    require(JIRAFEAU_ROOT.'lib/template/header.php');
     echo '<div class="error"><p>' . t('Sorry, the requested file is not found') .
     '</p></div>';
-    require (JIRAFEAU_ROOT.'lib/template/footer.php');
+    require(JIRAFEAU_ROOT.'lib/template/footer.php');
     exit;
 }
 
 $delete_code = '';
-if (isset ($_GET['d']) && !empty ($_GET['d']))
+if (isset($_GET['d']) && !empty($_GET['d']) &&  $_GET['d'] != '1') {
     $delete_code = $_GET['d'];
+}
 
 $crypt_key = '';
-if (isset ($_GET['k']) && !empty ($_GET['k']))
+if (isset($_GET['k']) && !empty($_GET['k'])) {
     $crypt_key = $_GET['k'];
+}
 
-$button_download = false;
-if (isset ($_GET['bd']) && !empty ($_GET['bd']))
-    $button_download = true;
+$do_download = false;
+if (isset($_GET['d']) && $_GET['d'] == '1') {
+    $do_download = true;
+}
 
-$button_preview = false;
-if (isset ($_GET['bp']) && !empty ($_GET['bp']))
-    $button_preview = true;
+$do_preview = false;
+if (isset($_GET['p']) && !empty($_GET['p'])) {
+    $do_preview = true;
+}
 
-$p = s2p ($link['md5']);
-if (!file_exists (VAR_FILES . $p . $link['md5']))
-{
-    jirafeau_delete_link ($link_name);
-    require (JIRAFEAU_ROOT.'lib/template/header.php');
+$p = s2p($link['md5']);
+if (!file_exists(VAR_FILES . $p . $link['md5'])) {
+    jirafeau_delete_link($link_name);
+    require(JIRAFEAU_ROOT.'lib/template/header.php');
     echo '<div class="error"><p>'.t('File not available.').
     '</p></div>';
-    require (JIRAFEAU_ROOT.'lib/template/footer.php');
+    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>';
-    require (JIRAFEAU_ROOT.'lib/template/footer.php');
+if (!empty($delete_code) && $delete_code == $link['link_code']) {
+    require(JIRAFEAU_ROOT.'lib/template/header.php');
+    if (isset($_POST['do_delete'])) {
+        jirafeau_delete_link($link_name);
+        echo '<div class="message"><p>'.t('File has been 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 deletion') ?> </legend>
+             <table>
+             <tr><td>
+             <?php echo t('You are about to delete') . ' "' . htmlspecialchars($link['file_name']) . '" (' . jirafeau_human_size($link['file_size']) . ').' ?>
+             </td></tr>
+             <tr><td>
+                <?php echo t('By using our services, you accept our'). ' <a href="tos.php">' . t('Terms of Service') . '</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;
 }
 
-if ($link['time'] != JIRAFEAU_INFINITY && time () > $link['time'])
-{
-    jirafeau_delete_link ($link_name);
-    require (JIRAFEAU_ROOT.'lib/template/header.php');
+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.') .
     '</p></div>';
-    require (JIRAFEAU_ROOT . 'lib/template/footer.php');
+    require(JIRAFEAU_ROOT . 'lib/template/footer.php');
     exit;
 }
 
-if (empty ($crypt_key) && $link['crypted'])
-{
-    require (JIRAFEAU_ROOT.'lib/template/header.php');
+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') .
     '</p></div>';
-    require (JIRAFEAU_ROOT.'lib/template/footer.php');
+    require(JIRAFEAU_ROOT.'lib/template/footer.php');
     exit;
 }
 
 $password_challenged = false;
-if (!empty ($link['key']))
-{
-    if (!isset ($_POST['key']))
-    {
-        require (JIRAFEAU_ROOT.'lib/template/header.php');
+if (!empty($link['key'])) {
+    if (!isset($_POST['key'])) {
+        require(JIRAFEAU_ROOT.'lib/template/header.php');
         echo '<div>' .
-             '<form action = "';
-        echo $cfg['web_root'] . '/f.php';
-        echo '" ' .
-             'method = "post" id = "submit">'; ?>
+             '<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') .
@@ -134,133 +147,133 @@ if (!empty ($link['key']))
              '<input type = "password" name = "key" />' .
              '</td></tr>' .
              '<tr><td>' .
-             t('By using our services, you accept of our'). ' <a href="' . $cfg['web_root'] . '/tos.php' . '">' . t('Term Of Service') . '</a>' .
-             '</td></tr>' .
-             '<tr><td>';
-            ?><input type="submit" id = "submit_download"  value="<?php echo t('Download'); ?>"
-            onclick="document.getElementById('submit').action='
-<?php
-        echo $cfg['web_root'] . '/f.php?h=' . $link_name . '&amp;bd=1';
-        if (!empty($crypt_key))
+             t('By using our services, you accept our'). ' <a href="tos.php">' . t('Terms of Service') . '</a>.' .
+             '</td></tr>';
+
+        if ($link['onetime'] == 'O') {
+            echo '<tr><td id="self_destruct">' .
+                 t('Warning, this file will self-destruct after being read') .
+                 '</td></tr>';
+        } ?><tr><td><input type="submit" id = "submit_download"  value="<?php echo t('Download'); ?>"
+        onclick="document.getElementById('submit_post').action='<?php
+        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['download_page'] && $cfg['preview'])
-        {
+        if ($cfg['preview'] && jirafeau_is_viewable($link['mime_type'])) {
             ?><input type="submit" id = "submit_preview"  value="<?php echo t('Preview'); ?>"
-            onclick="document.getElementById('submit').action='
-<?php
-        echo $cfg['web_root'] . '/f.php?h=' . $link_name . '&amp;bp=1';
-        if (!empty($crypt_key))
-            echo '&amp;k=' . urlencode($crypt_key);
-?>';
-        document.getElementById('submit_preview').submit ();"/><?php
+            onclick="document.getElementById('submit_post').action='<?php
+            echo 'f.php?h=' . $link_name . '&amp;p=1';
+            if (!empty($crypt_key)) {
+                echo '&amp;k=' . urlencode($crypt_key);
+            } ?>';
+            document.getElementById('submit_preview').submit ();"/><?php
+
         }
         echo '</td></tr></table></fieldset></form></div>';
-        require (JIRAFEAU_ROOT.'lib/template/footer.php');
+        require(JIRAFEAU_ROOT.'lib/template/footer.php');
         exit;
-    }
-    else
-    {
-        if ($link['key'] == md5 ($_POST['key']))
+    } else {
+        if ($link['key'] == md5($_POST['key'])) {
             $password_challenged = true;
-	else
-        {
-            header ("Access denied");
-            require (JIRAFEAU_ROOT.'lib/template/header.php');
+        } else {
+            sleep(2);
+            require(JIRAFEAU_ROOT.'lib/template/header.php');
             echo '<div class="error"><p>' . t('Access denied') .
             '</p></div>';
-            require (JIRAFEAU_ROOT.'lib/template/footer.php');
+            require(JIRAFEAU_ROOT.'lib/template/footer.php');
             exit;
         }
     }
 }
 
-if ($cfg['download_page'] && !$password_challenged && !$button_download && !$button_preview)
-{
-        require (JIRAFEAU_ROOT.'lib/template/header.php');
-        echo '<div>' .
-             '<form action = "';
-        echo $cfg['web_root'] . '/f.php';
-        echo '" ' .
-             'method = "post" id = "submit">'; ?>
+if (!$password_challenged && !$do_download && !$do_preview) {
+    require(JIRAFEAU_ROOT.'lib/template/header.php');
+    echo '<div>' .
+             '<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>' . $link['file_name'] . '</legend><table>' .
+        echo '<fieldset><legend>' . htmlspecialchars($link['file_name']) . '</legend><table>' .
              '<tr><td>' .
-             t('You are about to download') . ' "' . $link['file_name'] . '" (' . jirafeau_human_size($link['file_size']) . ')' .
+             t('You are about to download') . ' "' . htmlspecialchars($link['file_name']) . '" (' . jirafeau_human_size($link['file_size']) . ').' .
              '</td></tr>' .
              '<tr><td>' .
-             t('By using our services, you accept of our'). ' <a href="' . $cfg['web_root'] . '/tos.php' . '">' . t('Term Of Service') . '</a>';
-            ?></td></tr><tr><td><input type="submit" id = "submit_download"  value="<?php echo t('Download'); ?>"
-            onclick="document.getElementById('submit').action='
-<?php
-        echo $cfg['web_root'] . '/f.php?h=' . $link_name . '&amp;bd=1';
-        if (!empty($crypt_key))
-            echo '&amp;k=' . urlencode($crypt_key);
-?>';
-        document.getElementById('submit_download').submit ();"/><?php
+             t('By using our services, you accept our'). ' <a href="tos.php">' . t('Terms of Service') . '</a>.' .
+             '</td></tr>';
+
+    if ($link['onetime'] == 'O') {
+        echo '<tr><td id="self_destruct">' .
+                 t('Warning, this file will self-destruct after being read') .
+                 '</td></tr>';
+    } ?>
+        <tr><td><input type="submit" id = "submit_download"  value="<?php echo t('Download'); ?>"
+        onclick="document.getElementById('submit_post').action='<?php
+        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['download_page'] && $cfg['preview'])
-        {
+        if ($cfg['preview'] && jirafeau_is_viewable($link['mime_type'])) {
             ?><input type="submit" id = "submit_preview"  value="<?php echo t('Preview'); ?>"
-            onclick="document.getElementById('submit').action='
-<?php
-        echo $cfg['web_root'] . '/f.php?h=' . $link_name . '&amp;bp=1';
-        if (!empty($crypt_key))
-            echo '&amp;k=' . urlencode($crypt_key);
-?>';
-        document.getElementById('submit_preview').submit ();"/><?php
+            onclick="document.getElementById('submit_post').action='<?php
+        echo 'f.php?h=' . $link_name . '&amp;p=1';
+            if (!empty($crypt_key)) {
+                echo '&amp;k=' . urlencode($crypt_key);
+            } ?>';
+        document.getElementById('submit_post').submit ();"/><?php
+
         }
-        echo '</td></tr>';
-        echo '</table></fieldset></form></div>';
-        require (JIRAFEAU_ROOT.'lib/template/footer.php');
-        exit;
+    echo '</td></tr>';
+    echo '</table></fieldset></form></div>';
+    require(JIRAFEAU_ROOT.'lib/template/footer.php');
+    exit;
 }
 
-header ('HTTP/1.0 200 OK');
-header ('Content-Length: ' . $link['file_size']);
-if (!jirafeau_is_viewable ($link['mime_type']) || !$cfg['preview'] || $button_download)
-    header ('Content-Disposition: attachment; filename="' .
-        $link['file_name'] . '"');
-header ('Content-Type: ' . $link['mime_type']);
+header('HTTP/1.0 200 OK');
+header('Content-Length: ' . $link['file_size']);
+if (!jirafeau_is_viewable($link['mime_type']) || !$cfg['preview'] || $do_download) {
+    header('Content-Disposition: attachment; filename="' . $link['file_name'] . '"');
+} else {
+    header('Content-Disposition: filename="' . $link['file_name'] . '"');
+}
+header('Content-Type: ' . $link['mime_type']);
+header('Content-MD5: ' . hex_to_base64($link['md5']));
 
 /* Read encrypted file. */
-if ($link['crypted'])
-{
+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));
+    $md5_key = md5($crypt_key);
+    $iv = jirafeau_crypt_create_iv($md5_key, mcrypt_enc_get_iv_size($m));
     /* Init module. */
-    mcrypt_generic_init ($m, $md5_key, $iv);
+    mcrypt_generic_init($m, $md5_key, $iv);
     /* Decrypt file. */
-    $r = fopen (VAR_FILES . $p . $link['md5'], 'r');
-    while (!feof ($r))
-    {
-        $dec = mdecrypt_generic($m, fread ($r, 1024));
+    $r = fopen(VAR_FILES . $p . $link['md5'], 'r');
+    while (!feof($r)) {
+        $dec = mdecrypt_generic($m, fread($r, 1024));
         print $dec;
         ob_flush();
     }
-    fclose ($r);
+    fclose($r);
     /* Cleanup. */
     mcrypt_generic_deinit($m);
     mcrypt_module_close($m);
 }
 /* Read file. */
-else
-{
-    $r = fopen (VAR_FILES . $p . $link['md5'], 'r');
-    while (!feof ($r))
-    {
-        print fread ($r, 1024);
+else {
+    $r = fopen(VAR_FILES . $p . $link['md5'], 'r');
+    while (!feof($r)) {
+        print fread($r, 1024);
         ob_flush();
     }
-    fclose ($r);
+    fclose($r);
 }
 
-if ($link['onetime'] == 'O')
-    jirafeau_delete_link ($link_name);
+if ($link['onetime'] == 'O') {
+    jirafeau_delete_link($link_name);
+}
 exit;
 
 ?>