mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

a few updates, added #539865 and #694413.

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@4005 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2003-05-11 16:21:35 +00:00
parent 30fd2486d8
commit 4d1def879a
12 changed files with 510 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
phpBB/download.php
View File

@@ -115,7 +115,7 @@ function send_file_to_browser($real_filename, $mimetype, $physical_filename, $up
$gotit = FALSE;
if (!intval($config['allow_ftp_upload']))
if (!intval($config['use_ftp_upload']))
{
if (@!file_exists($filename))
{
@@ -215,7 +215,7 @@ function send_file_to_browser($real_filename, $mimetype, $physical_filename, $up
}
readfile($filename);
}
/* else if ((!$gotit) && (intval($config['allow_ftp_upload'])))
/* else if ((!$gotit) && (intval($config['use_ftp_upload'])))
{
$conn_id = attach_init_ftp();
@@ -353,7 +353,7 @@ if (!$thumbnail)
// Determine the 'presenting'-method
if ($download_mode == PHYSICAL_LINK)
{
if (intval($config['allow_ftp_upload']) && $config['upload_dir'] == '')
if (intval($config['use_ftp_upload']) && $config['upload_dir'] == '')
{
trigger_error('Physical Download not possible with the current Attachment Setting');
}
@@ -362,7 +362,7 @@ if ($download_mode == PHYSICAL_LINK)
}
else
{
if (intval($config['allow_ftp_upload']))
if (intval($config['use_ftp_upload']))
{
// We do not need a download path, we are not downloading physically
send_file_to_browser($attachment['real_filename'], $attachment['mimetype'], $attachment['physical_filename'] , '', $attachment['attach_id']);