X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/e32a48c6f4c05505465ed7fe3ca70cb703868d42..7061fbc7ccad9696d97f59ef34830f42bfd35b77:/f.php?ds=sidebyside diff --git a/f.php b/f.php index 953d20e..0797c40 100644 --- a/f.php +++ b/f.php @@ -125,7 +125,7 @@ if (!empty ($link['key'])) '<form action = "'; echo $cfg['web_root'] . '/f.php'; echo '" ' . - 'method = "post" id = "submit">'; ?> + 'method = "post" id = "submit_post">'; ?> <input type = "hidden" name = "jirafeau" value = "<?php echo JIRAFEAU_VERSION ?>"/><?php echo '<fieldset>' . '<legend>' . t('Password protection') . @@ -138,7 +138,7 @@ if (!empty ($link['key'])) '</td></tr>' . '<tr><td>'; ?><input type="submit" id = "submit_download" value="<?php echo t('Download'); ?>" - onclick="document.getElementById('submit').action=' + onclick="document.getElementById('submit_post').action=' <?php echo $cfg['web_root'] . '/f.php?h=' . $link_name . '&d=1'; if (!empty($crypt_key)) @@ -148,7 +148,7 @@ if (!empty ($link['key'])) if ($cfg['download_page'] && $cfg['preview'] && jirafeau_is_viewable($link['mime_type'])) { ?><input type="submit" id = "submit_preview" value="<?php echo t('Preview'); ?>" - onclick="document.getElementById('submit').action=' + onclick="document.getElementById('submit_post').action=' <?php echo $cfg['web_root'] . '/f.php?h=' . $link_name . '&p=1'; if (!empty($crypt_key)) @@ -183,7 +183,7 @@ if ($cfg['download_page'] && !$password_challenged && !$do_download && !$do_prev '<form action = "'; echo $cfg['web_root'] . '/f.php'; echo '" ' . - 'method = "post" id = "submit">'; ?> + 'method = "post" id = "submit_post">'; ?> <input type = "hidden" name = "jirafeau" value = "<?php echo JIRAFEAU_VERSION ?>"/><?php echo '<fieldset><legend>' . $link['file_name'] . '</legend><table>' . '<tr><td>' . @@ -192,24 +192,24 @@ if ($cfg['download_page'] && !$password_challenged && !$do_download && !$do_prev '<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').action=' + onclick="document.getElementById('submit_post').action=' <?php echo $cfg['web_root'] . '/f.php?h=' . $link_name . '&d=1'; if (!empty($crypt_key)) echo '&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'])) { ?><input type="submit" id = "submit_preview" value="<?php echo t('Preview'); ?>" - onclick="document.getElementById('submit').action=' + onclick="document.getElementById('submit_post').action=' <?php echo $cfg['web_root'] . '/f.php?h=' . $link_name . '&p=1'; if (!empty($crypt_key)) echo '&k=' . urlencode($crypt_key); ?>'; - document.getElementById('submit_preview').submit ();"/><?php + document.getElementById('submit_post').submit ();"/><?php } echo '</td></tr>'; echo '</table></fieldset></form></div>'; @@ -220,8 +220,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 ('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. */