aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-10-04 15:09:42 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-10-04 15:09:42 +0000
commit27fc215914287ce0cb7e242b211d1857d2371d51 (patch)
tree2f76b4825b4116a6967a25e606c2d68591a1c429 /phpBB
parent7d84cac202ce0e7ea04525d428225176d518b5e5 (diff)
downloadforums-27fc215914287ce0cb7e242b211d1857d2371d51.tar
forums-27fc215914287ce0cb7e242b211d1857d2371d51.tar.gz
forums-27fc215914287ce0cb7e242b211d1857d2371d51.tar.bz2
forums-27fc215914287ce0cb7e242b211d1857d2371d51.tar.xz
forums-27fc215914287ce0cb7e242b211d1857d2371d51.zip
ups, seems i really forgot to change this. :)
git-svn-id: file:///svn/phpbb/trunk@8136 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/download/file.php22
1 files changed, 11 insertions, 11 deletions
diff --git a/phpBB/download/file.php b/phpBB/download/file.php
index f02de8055a..ad2abf880e 100644
--- a/phpBB/download/file.php
+++ b/phpBB/download/file.php
@@ -1,10 +1,10 @@
<?php
-/**
+/**
*
* @package phpBB3
* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @copyright (c) 2005 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*
*/
@@ -12,7 +12,7 @@
* @ignore
*/
define('IN_PHPBB', true);
-$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './';
+$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../';
$phpEx = substr(strrchr(__FILE__, '.'), 1);
if (isset($_GET['avatar']))
@@ -80,9 +80,9 @@ if (isset($_GET['avatar']))
$db->sql_close();
exit;
}
-
+
send_avatar_to_browser(($avatar_group ? 'g' : '') . $filename . '.' . $ext);
-
+
if (!empty($cache))
{
$cache->unload();
@@ -149,7 +149,7 @@ else
{
if (!$attachment['in_message'])
{
- //
+ //
$sql = 'SELECT p.forum_id, f.forum_password, f.parent_id
FROM ' . POSTS_TABLE . ' p, ' . FORUMS_TABLE . ' f
WHERE p.post_id = ' . $attachment['post_msg_id'] . '
@@ -231,8 +231,8 @@ if ($thumbnail)
else if (($display_cat == ATTACHMENT_CATEGORY_NONE || $display_cat == ATTACHMENT_CATEGORY_IMAGE) && !$attachment['is_orphan'])
{
// Update download count
- $sql = 'UPDATE ' . ATTACHMENTS_TABLE . '
- SET download_count = download_count + 1
+ $sql = 'UPDATE ' . ATTACHMENTS_TABLE . '
+ SET download_count = download_count + 1
WHERE attach_id = ' . $attachment['attach_id'];
$db->sql_query($sql);
}
@@ -271,7 +271,7 @@ function send_avatar_to_browser($file)
{
global $config, $phpbb_root_path;
- $prefix = $config['avatar_salt'] . '_';
+ $prefix = $config['avatar_salt'] . '_';
$image_dir = $config['avatar_path'];
// worst-case default
@@ -428,7 +428,7 @@ function send_file_to_browser($attachment, $upload_dir, $category)
// Send out the Headers. Do not set Content-Disposition to inline please, it is a security measure for users using the Internet Explorer.
header('Content-Type: ' . $attachment['mimetype']);
-
+
if (empty($user->browser) || (strpos(strtolower($user->browser), 'msie') !== false))
{
header('Content-Disposition: attachment; ' . header_filename(htmlspecialchars_decode($attachment['real_filename'])));