X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/53819d60b11d4393b0871c93c4b4cdaa027346e4..63719dc2b2578d17ac7d6d2f2c0b570c63f99ba9:/f.php?ds=sidebyside diff --git a/f.php b/f.php index e57c18f..953d20e 100644 --- a/f.php +++ b/f.php @@ -58,7 +58,7 @@ if (count ($link) == 0) } $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 = ''; @@ -66,7 +66,7 @@ if (isset ($_GET['k']) && !empty ($_GET['k'])) $crypt_key = $_GET['k']; $do_download = false; -if (isset ($_GET['d']) && !empty ($_GET['d'])) +if (isset ($_GET['d']) && $_GET['d'] == '1') $do_download = true; $do_preview = false; @@ -134,7 +134,7 @@ 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>' . + 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'); ?>" @@ -145,16 +145,16 @@ if (!empty ($link['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 . '&p=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'); @@ -190,7 +190,7 @@ if ($cfg['download_page'] && !$password_challenged && !$do_download && !$do_prev t('You are about to download') . ' "' . $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>'; + 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=' <?php @@ -200,7 +200,7 @@ if ($cfg['download_page'] && !$password_challenged && !$do_download && !$do_prev ?>'; 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='