Add the test of HTTP_X_FORWARDED_PROTO in the is_ssl function to test the case where...

[jirafeau_mojo42.git] / f.php

diff --git a/f.php b/f.php
index e1c858e379a01e9886f0609841c58b0b99ac7671..fbf466aea5934dfd7975feb1d4d7e969eb9bf847 100644 (file)
--- a/f.php
+++ b/f.php
@@ -166,7 +166,6 @@ if (!empty ($link['key']))
             $password_challenged = true;
        else
         {
             $password_challenged = true;
        else
         {

-            header ("Access denied");

             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>';


@@ -198,7 +197,7 @@ if ($cfg['download_page'] && !$password_challenged && !$do_download && !$do_prev
         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['download_page'] && $cfg['preview'] && jirafeau_is_viewable($link['mime_type']))
         {


@@ -209,7 +208,7 @@ if ($cfg['download_page'] && !$password_challenged && !$do_download && !$do_prev
         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>';


@@ -220,8 +219,9 @@ if ($cfg['download_page'] && !$password_challenged && !$do_download && !$do_prev
 header ('HTTP/1.0 200 OK');
 header ('Content-Length: ' . $link['file_size']);
 if (!jirafeau_is_viewable ($link['mime_type']) || !$cfg['preview'] || $do_download)
 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'] . '"');
+    header ('Content-Disposition: attachment; filename="' . $link['file_name'] . '"');
+else
+    header ('Content-Disposition: filename="' . $link['file_name'] . '"');

 header ('Content-Type: ' . $link['mime_type']);
 
 /* Read encrypted file. */
 header ('Content-Type: ' . $link['mime_type']);
 
 /* Read encrypted file. */