X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/f9f84c1e4389dc23e77b51dadd53410377128cfc..d84c94d93c6b5b446c7bc6e359bb8fc276107dff:/file.php?ds=sidebyside
diff --git a/file.php b/file.php
index d01bee6..0a1554c 100644
--- a/file.php
+++ b/file.php
@@ -24,87 +24,113 @@ require (JIRAFEAU_ROOT . 'lib/config.php');
require (JIRAFEAU_ROOT . 'lib/settings.php');
require (JIRAFEAU_ROOT . 'lib/functions.php');
-if (isset ($_GET['h']) && !empty ($_GET['h']))
+if (!isset ($_GET['h']) || empty ($_GET['h']))
{
- $link_name = $_GET['h'];
+ header ('Location: ' . $cfg['web_root']);
+ exit;
+}
- $delete_code = '';
- if (isset ($_GET['d']) && !empty ($_GET['d']))
- $delete_code = $_GET['d'];
+$link_name = $_GET['h'];
- if (!preg_match ('/[0-9a-f]{32}$/', $link_name))
- {
- require (JIRAFEAU_ROOT.'lib/template/header.php');
- echo '
' . t('Sorry, the requested file is not found') . '
';
- require (JIRAFEAU_ROOT.'lib/template/footer.php');
- exit;
- }
+if (!preg_match ('/[0-9a-zA-Z_-]{22}$/', $link_name))
+{
+ require (JIRAFEAU_ROOT.'lib/template/header.php');
+ echo '' . t('Sorry, the requested file is not found') . '
';
+ require (JIRAFEAU_ROOT.'lib/template/footer.php');
+ exit;
+}
- $link = jirafeau_get_link ($link_name);
- if (count ($link) == 0)
- {
- require (JIRAFEAU_ROOT.'lib/template/header.php');
- echo '' . t('Sorry, the requested file is not found') .
- '
';
- require (JIRAFEAU_ROOT.'lib/template/footer.php');
- exit;
- }
- $p = s2p ($link['md5']);
- if (!file_exists (VAR_FILES . $p . $link['md5']))
- {
- jirafeau_delete_link ($link_name);
- require (JIRAFEAU_ROOT.'lib/template/header.php');
- echo ''.t('File not available.').
- '
';
- require (JIRAFEAU_ROOT.'lib/template/footer.php');
- exit;
- }
+$link = jirafeau_get_link ($link_name);
+if (count ($link) == 0)
+{
+ require (JIRAFEAU_ROOT.'lib/template/header.php');
+ echo '' . t('Sorry, the requested file is not found') .
+ '
';
+ require (JIRAFEAU_ROOT.'lib/template/footer.php');
+ exit;
+}
- if (!empty ($delete_code) && $delete_code == $link['link_code'])
- {
- jirafeau_delete_link ($link_name);
- require (JIRAFEAU_ROOT.'lib/template/header.php');
- echo ''.t('File has been deleted.').
- '
';
- require (JIRAFEAU_ROOT.'lib/template/footer.php');
- exit;
- }
+$delete_code = '';
+if (isset ($_GET['d']) && !empty ($_GET['d']))
+ $delete_code = $_GET['d'];
+
+$button_download = false;
+if (isset ($_GET['bd']) && !empty ($_GET['bd']))
+ $button_download = true;
+
+$button_preview = false;
+if (isset ($_GET['bp']) && !empty ($_GET['bp']))
+ $button_preview = true;
+
+$p = s2p ($link['md5']);
+if (!file_exists (VAR_FILES . $p . $link['md5']))
+{
+ jirafeau_delete_link ($link_name);
+ require (JIRAFEAU_ROOT.'lib/template/header.php');
+ echo ''.t('File not available.').
+ '
';
+ require (JIRAFEAU_ROOT.'lib/template/footer.php');
+ exit;
+}
- if ($link['time'] != JIRAFEAU_INFINITY && time () > $link['time'])
+if (!empty ($delete_code) && $delete_code == $link['link_code'])
+{
+ jirafeau_delete_link ($link_name);
+ require (JIRAFEAU_ROOT.'lib/template/header.php');
+ echo ''.t('File has been deleted.').
+ '
';
+ require (JIRAFEAU_ROOT.'lib/template/footer.php');
+ exit;
+}
+
+if ($link['time'] != JIRAFEAU_INFINITY && time () > $link['time'])
+{
+ jirafeau_delete_link ($link_name);
+ require (JIRAFEAU_ROOT.'lib/template/header.php');
+ echo ''.
+ t('The time limit of this file has expired.') . ' ' .
+ t('File has been deleted.') .
+ '
';
+ require (JIRAFEAU_ROOT . 'lib/template/footer.php');
+ exit;
+}
+
+$password_challenged = false;
+if (!empty ($link['key']))
+{
+ if (!isset ($_POST['key']))
{
- jirafeau_delete_link ($link_name);
require (JIRAFEAU_ROOT.'lib/template/header.php');
- echo ''.
- t('The time limit of this file has expired.') . ' ' .
- t('File has been deleted.') .
- '
';
- require (JIRAFEAU_ROOT . 'lib/template/footer.php');
- exit;
- }
+ echo '';
+ require (JIRAFEAU_ROOT.'lib/template/footer.php');
+ exit;
+ }
+ else
+ {
if ($link['key'] != md5 ($_POST['key']))
{
header ("Access denied");
@@ -114,26 +140,51 @@ if (isset ($_GET['h']) && !empty ($_GET['h']))
require (JIRAFEAU_ROOT.'lib/template/footer.php');
exit;
}
- }
+ else
+ $password_challenged = true;
}
+}
- header ('Content-Length: ' . $link['file_size']);
- header ('Content-Type: ' . $link['mime_type']);
- if (!jirafeau_is_viewable ($link['mime_type']))
- {
- header ('Content-Disposition: attachment; filename="' .
- $link['file_name'] . '"');
- }
- readfile (VAR_FILES . $p . $link['md5']);
+if ($cfg['download_page'] && !$password_challenged && !$button_download && !$button_preview)
+{
+ require (JIRAFEAU_ROOT.'lib/template/header.php');
+ echo '' .
+ '
';
+ require (JIRAFEAU_ROOT.'lib/template/footer.php');
+ exit;
}
-else
+
+header ('Content-Length: ' . $link['file_size']);
+header ('Content-Type: ' . $link['mime_type']);
+if (!jirafeau_is_viewable ($link['mime_type']) || !$cfg['preview'] || $button_download)
{
- header ('Location: '.$cfg['web_root']);
- exit;
+ header ('Content-Disposition: attachment; filename="' .
+ $link['file_name'] . '"');
}
+readfile (VAR_FILES . $p . $link['md5']);
+
+if ($link['onetime'] == 'O')
+ jirafeau_delete_link ($link_name);
+exit;
?>