git.p6c8.net
/
jirafeau_project.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[BUGFIX] Remove redundant header variable
[jirafeau_project.git]
/
f.php
diff --git
a/f.php
b/f.php
index 31b5d06acdac103132eaedcfdc5558b1e7997ab3..67590ebbc89e9b450247b843e2e1697c6c7f7547 100644
(file)
--- a/
f.php
+++ b/
f.php
@@
-19,10
+19,9
@@
*/
define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');
*/
define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');
-require (JIRAFEAU_ROOT . 'lib/lang.php');
-require (JIRAFEAU_ROOT . 'lib/config.original.php');
require (JIRAFEAU_ROOT . 'lib/settings.php');
require (JIRAFEAU_ROOT . 'lib/functions.php');
require (JIRAFEAU_ROOT . 'lib/settings.php');
require (JIRAFEAU_ROOT . 'lib/functions.php');
+require (JIRAFEAU_ROOT . 'lib/lang.php');
if (!isset ($_GET['h']) || empty ($_GET['h']))
{
if (!isset ($_GET['h']) || empty ($_GET['h']))
{
@@
-49,6
+48,13
@@
if (!preg_match ('/[0-9a-zA-Z_-]+$/', $link_name))
$link = jirafeau_get_link ($link_name);
if (count ($link) == 0)
$link = jirafeau_get_link ($link_name);
if (count ($link) == 0)
+{
+ /* Try alias. */
+ $alias = jirafeau_get_alias (md5 ($link_name));
+ if (count ($alias) > 0)
+ $link = jirafeau_get_link ($alias["destination"]);
+}
+if (count ($link) == 0)
{
require (JIRAFEAU_ROOT.'lib/template/header.php');
echo '<div class="error"><p>' . t('Sorry, the requested file is not found') .
{
require (JIRAFEAU_ROOT.'lib/template/header.php');
echo '<div class="error"><p>' . t('Sorry, the requested file is not found') .
@@
-134,7
+140,7
@@
if (!empty ($link['key']))
'<input type = "password" name = "key" />' .
'</td></tr>' .
'<tr><td>' .
'<input type = "password" name = "key" />' .
'</td></tr>' .
'<tr><td>' .
- t('By using our services, you accept 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('Terms of Service') . '</a>.
' .
'</td></tr>';
if ($link['onetime'] == 'O')
'</td></tr>';
if ($link['onetime'] == 'O')
@@
-152,7
+158,7
@@
if (!empty ($link['key']))
echo '&k=' . urlencode($crypt_key);
?>';
document.getElementById('submit_download').submit ();"/><?php
echo '&k=' . urlencode($crypt_key);
?>';
document.getElementById('submit_download').submit ();"/><?php
- if ($cfg['
download_page'] && $cfg['
preview'] && jirafeau_is_viewable($link['mime_type']))
+ if ($cfg['preview'] && jirafeau_is_viewable($link['mime_type']))
{
?><input type="submit" id = "submit_preview" value="<?php echo t('Preview'); ?>"
onclick="document.getElementById('submit_post').action='
{
?><input type="submit" id = "submit_preview" value="<?php echo t('Preview'); ?>"
onclick="document.getElementById('submit_post').action='
@@
-173,6
+179,7
@@
if (!empty ($link['key']))
$password_challenged = true;
else
{
$password_challenged = true;
else
{
+ sleep (2);
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>';
@@
-182,7
+189,7
@@
if (!empty ($link['key']))
}
}
}
}
-if (
$cfg['download_page'] &&
!$password_challenged && !$do_download && !$do_preview)
+if (!$password_challenged && !$do_download && !$do_preview)
{
require (JIRAFEAU_ROOT.'lib/template/header.php');
echo '<div>' .
{
require (JIRAFEAU_ROOT.'lib/template/header.php');
echo '<div>' .
@@
-191,12
+198,12
@@
if ($cfg['download_page'] && !$password_challenged && !$do_download && !$do_prev
echo '" ' .
'method = "post" id = "submit_post">'; ?>
<input type = "hidden" name = "jirafeau" value = "<?php echo JIRAFEAU_VERSION ?>"/><?php
echo '" ' .
'method = "post" id = "submit_post">'; ?>
<input type = "hidden" name = "jirafeau" value = "<?php echo JIRAFEAU_VERSION ?>"/><?php
- echo '<fieldset><legend>' .
$link['file_name']
. '</legend><table>' .
+ echo '<fieldset><legend>' .
htmlspecialchars($link['file_name'])
. '</legend><table>' .
'<tr><td>' .
'<tr><td>' .
- t('You are about to download') . ' "' .
$link['file_name'] . '" (' . jirafeau_human_size($link['file_size']) . ')
' .
+ t('You are about to download') . ' "' .
htmlspecialchars($link['file_name']) . '" (' . jirafeau_human_size($link['file_size']) . ').
' .
'</td></tr>' .
'<tr><td>' .
'</td></tr>' .
'<tr><td>' .
- t('By using our services, you accept 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('Terms of Service') . '</a>.
' .
'</td></tr>';
if ($link['onetime'] == 'O')
'</td></tr>';
if ($link['onetime'] == 'O')
@@
-216,7
+223,7
@@
if ($cfg['download_page'] && !$password_challenged && !$do_download && !$do_prev
?>';
document.getElementById('submit_post').submit ();"/><?php
?>';
document.getElementById('submit_post').submit ();"/><?php
- if ($cfg['
download_page'] && $cfg['
preview'] && jirafeau_is_viewable($link['mime_type']))
+ if ($cfg['preview'] && jirafeau_is_viewable($link['mime_type']))
{
?><input type="submit" id = "submit_preview" value="<?php echo t('Preview'); ?>"
onclick="document.getElementById('submit_post').action='
{
?><input type="submit" id = "submit_preview" value="<?php echo t('Preview'); ?>"
onclick="document.getElementById('submit_post').action='
@@
-240,6
+247,7
@@
if (!jirafeau_is_viewable ($link['mime_type']) || !$cfg['preview'] || $do_downlo
else
header ('Content-Disposition: filename="' . $link['file_name'] . '"');
header ('Content-Type: ' . $link['mime_type']);
else
header ('Content-Disposition: filename="' . $link['file_name'] . '"');
header ('Content-Type: ' . $link['mime_type']);
+header ('Content-MD5: ' . hex_to_base64($link['md5']));
/* Read encrypted file. */
if ($link['crypted'])
/* Read encrypted file. */
if ($link['crypted'])
patrick-canterino.de