X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/blobdiff_plain/4013663192eb94fd4519e22d0e6dc1fb61b15957..51ce6fcdb734893e1b50ded472e311e77deb16ae:/f.php?ds=inline diff --git a/f.php b/f.php index 7faf028..a5c6228 100644 --- a/f.php +++ b/f.php @@ -2,7 +2,7 @@ /* * Jirafeau, your web file repository * Copyright (C) 2008 Julien "axolotl" BERNARD <axolotl@magieeternelle.org> - * Copyright (C) 2012 Jerome Jutteau <j.jutteau@gmail.com> + * Copyright (C) 2015 Jerome Jutteau <j.jutteau@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -65,13 +65,13 @@ $crypt_key = ''; 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']) && !empty ($_GET['d'])) + $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'])) @@ -140,21 +140,21 @@ if (!empty ($link['key'])) ?><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 . '&bd=1'; + 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 - if ($cfg['download_page'] && $cfg['preview']) + 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=' -<?php - echo $cfg['web_root'] . '/f.php?h=' . $link_name . '&bp=1'; - if (!empty($crypt_key)) - echo '&k=' . urlencode($crypt_key); -?>'; - document.getElementById('submit_preview').submit ();"/><?php + <?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 } echo '</td></tr></table></fieldset></form></div>'; require (JIRAFEAU_ROOT.'lib/template/footer.php'); @@ -176,7 +176,7 @@ if (!empty ($link['key'])) } } -if ($cfg['download_page'] && !$password_challenged && !$button_download && !$button_preview) +if ($cfg['download_page'] && !$password_challenged && !$do_download && !$do_preview) { require (JIRAFEAU_ROOT.'lib/template/header.php'); echo '<div>' . @@ -194,18 +194,18 @@ if ($cfg['download_page'] && !$password_challenged && !$button_download && !$but ?></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 . '&bd=1'; + 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 - if ($cfg['download_page'] && $cfg['preview']) + 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=' <?php - echo $cfg['web_root'] . '/f.php?h=' . $link_name . '&bp=1'; + echo $cfg['web_root'] . '/f.php?h=' . $link_name . '&p=1'; if (!empty($crypt_key)) echo '&k=' . urlencode($crypt_key); ?>'; @@ -219,7 +219,7 @@ if ($cfg['download_page'] && !$password_challenged && !$button_download && !$but header ('HTTP/1.0 200 OK'); header ('Content-Length: ' . $link['file_size']); -if (!jirafeau_is_viewable ($link['mime_type']) || !$cfg['preview'] || $button_download) +if (!jirafeau_is_viewable ($link['mime_type']) || !$cfg['preview'] || $do_download) header ('Content-Disposition: attachment; filename="' . $link['file_name'] . '"'); header ('Content-Type: ' . $link['mime_type']);