[TASK] CGL: Remove trailing whitespaces

[jirafeau_mojo42.git] / f.php

diff --git a/f.php b/f.php
index 9bbe4d9abddf57db07a5577b92cb8ff1ba72bad8..109ac530299b0c360a2b76c8cbf6c8f4f374d047 100644 (file)
--- a/f.php
+++ b/f.php
@@ -19,10 +19,9 @@
  */
 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']))
 {
 
 if (!isset ($_GET['h']) || empty ($_GET['h']))
 {


@@ -49,6 +48,13 @@ if (!preg_match ('/[0-9a-zA-Z_-]+$/', $link_name))
 
 $link = jirafeau_get_link ($link_name);
 if (count ($link) == 0)
 
 $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') .
 {
     require (JIRAFEAU_ROOT.'lib/template/header.php');
     echo '<div class="error"><p>' . t('Sorry, the requested file is not found') .


@@ -123,7 +129,7 @@ if (!empty ($link['key']))
         require (JIRAFEAU_ROOT.'lib/template/header.php');
         echo '<div>' .
              '<form action = "';
         require (JIRAFEAU_ROOT.'lib/template/header.php');
         echo '<div>' .
              '<form action = "';

-        echo $cfg['web_root'] . '/f.php';
+        echo JIRAFEAU_ABSPREFIX . 'f.php';

         echo '" ' .
              'method = "post" id = "submit_post">'; ?>
              <input type = "hidden" name = "jirafeau" value = "<?php echo JIRAFEAU_VERSION ?>"/><?php
         echo '" ' .
              'method = "post" id = "submit_post">'; ?>
              <input type = "hidden" name = "jirafeau" value = "<?php echo JIRAFEAU_VERSION ?>"/><?php


@@ -134,23 +140,28 @@ if (!empty ($link['key']))
              '<input type = "password" name = "key" />' .
              '</td></tr>' .
              '<tr><td>' .
              '<input type = "password" name = "key" />' .
              '</td></tr>' .
              '<tr><td>' .

-             t('By using our services, you accept 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_post').action='
-<?php
-        echo $cfg['web_root'] . '/f.php?h=' . $link_name . '&amp;d=1';
+             t('By using our services, you accept our'). ' <a href="' . JIRAFEAU_ABSPREFIX . '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 JIRAFEAU_ABSPREFIX . '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 (!empty($crypt_key))
             echo '&amp;k=' . urlencode($crypt_key);
 ?>';
         document.getElementById('submit_download').submit ();"/><?php

-        if ($cfg['download_page'] && $cfg['preview'] && jirafeau_is_viewable($link['mime_type']))
+        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 $cfg['web_root'] . '/f.php?h=' . $link_name . '&amp;p=1';
+            onclick="document.getElementById('submit_post').action='<?php
+            echo JIRAFEAU_ABSPREFIX . 'f.php?h=' . $link_name . '&amp;p=1';

             if (!empty($crypt_key))
                 echo '&amp;k=' . urlencode($crypt_key);
             ?>';
             if (!empty($crypt_key))
                 echo '&amp;k=' . urlencode($crypt_key);
             ?>';


@@ -166,7 +177,7 @@ if (!empty ($link['key']))
             $password_challenged = true;
        else
         {
             $password_challenged = true;
        else
         {

-            header ("Access denied");
+            sleep (2);

             require (JIRAFEAU_ROOT.'lib/template/header.php');
             echo '<div class="error"><p>' . t('Access denied') .
             '</p></div>';
             require (JIRAFEAU_ROOT.'lib/template/header.php');
             echo '<div class="error"><p>' . t('Access denied') .
             '</p></div>';


@@ -176,40 +187,48 @@ if (!empty ($link['key']))
     }
 }
 
     }
 }
 

-if ($cfg['download_page'] && !$password_challenged && !$do_download && !$do_preview)
+if (!$password_challenged && !$do_download && !$do_preview)

 {
         require (JIRAFEAU_ROOT.'lib/template/header.php');
         echo '<div>' .
 {
         require (JIRAFEAU_ROOT.'lib/template/header.php');
         echo '<div>' .

-             '<form action = "';
-        echo $cfg['web_root'] . '/f.php';
+             '<form action="';
+        echo JIRAFEAU_ABSPREFIX . 'f.php';

         echo '" ' .
              'method = "post" id = "submit_post">'; ?>
              <input type = "hidden" name = "jirafeau" value = "<?php echo JIRAFEAU_VERSION ?>"/><?php
         echo '" ' .
              'method = "post" id = "submit_post">'; ?>
              <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>' .
              '<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>' .
              '</td></tr>' .
              '<tr><td>' .

-             t('By using our services, you accept 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_post').action='
-<?php
-        echo $cfg['web_root'] . '/f.php?h=' . $link_name . '&amp;d=1';
+             t('By using our services, you accept our'). ' <a href="' . JIRAFEAU_ABSPREFIX . '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 JIRAFEAU_ABSPREFIX . 'f.php?h=' . $link_name . '&amp;d=1';

         if (!empty($crypt_key))
             echo '&amp;k=' . urlencode($crypt_key);
 ?>';
         if (!empty($crypt_key))
             echo '&amp;k=' . urlencode($crypt_key);
 ?>';

-        document.getElementById('submit_download').submit ();"/><?php
+        document.getElementById('submit_post').submit ();"/><?php

 
 

-        if ($cfg['download_page'] && $cfg['preview'] && jirafeau_is_viewable($link['mime_type']))
+        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 $cfg['web_root'] . '/f.php?h=' . $link_name . '&amp;p=1';
+            onclick="document.getElementById('submit_post').action='<?php
+        echo JIRAFEAU_ABSPREFIX . 'f.php?h=' . $link_name . '&amp;p=1';

         if (!empty($crypt_key))
             echo '&amp;k=' . urlencode($crypt_key);
 ?>';
         if (!empty($crypt_key))
             echo '&amp;k=' . urlencode($crypt_key);
 ?>';

-        document.getElementById('submit_preview').submit ();"/><?php
+        document.getElementById('submit_post').submit ();"/><?php

         }
         echo '</td></tr>';
         echo '</table></fieldset></form></div>';
         }
         echo '</td></tr>';
         echo '</table></fieldset></form></div>';


@@ -224,6 +243,7 @@ if (!jirafeau_is_viewable ($link['mime_type']) || !$cfg['preview'] || $do_downlo
 else
     header ('Content-Disposition: filename="' . $link['file_name'] . '"');
 header ('Content-Type: ' . $link['mime_type']);
 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'])
 
 /* Read encrypted file. */
 if ($link['crypted'])