diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2003-11-04 22:05:38 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2003-11-04 22:05:38 +0000 |
| commit | cd70db7976f43d01cd3cd41467c09f85298d447b (patch) | |
| tree | 6f583aba6f9176a1e732652f10a928f0ae004c6c /phpBB/download.php | |
| parent | 88f814a5c57246250a82ad53d43f8f90da5afb60 (diff) | |
| download | forums-cd70db7976f43d01cd3cd41467c09f85298d447b.tar forums-cd70db7976f43d01cd3cd41467c09f85298d447b.tar.gz forums-cd70db7976f43d01cd3cd41467c09f85298d447b.tar.bz2 forums-cd70db7976f43d01cd3cd41467c09f85298d447b.tar.xz forums-cd70db7976f43d01cd3cd41467c09f85298d447b.zip | |
new permissions, merged attachment tables (the intended purpose of two tables is no longer valid), attachment updates along the merging...
Note: please merge your attachment tables (develop dir).
git-svn-id: file:///svn/phpbb/trunk@4637 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/download.php')
| -rw-r--r-- | phpBB/download.php | 48 |
1 files changed, 15 insertions, 33 deletions
diff --git a/phpBB/download.php b/phpBB/download.php index 209a969caf..c728777d02 100644 --- a/phpBB/download.php +++ b/phpBB/download.php @@ -36,7 +36,7 @@ if (!$config['allow_attachments']) } $sql = 'SELECT * - FROM ' . ATTACHMENTS_DESC_TABLE . " + FROM ' . ATTACHMENTS_TABLE . " WHERE attach_id = $download_id"; $result = $db->sql_query_limit($sql, 1); @@ -46,42 +46,24 @@ if (!($attachment = $db->sql_fetchrow($result))) } $db->sql_freeresult($result); -// get forum_id for attachment authorization or private message authorization -$authorised = false; - // Additional query, because of more than one attachment assigned to posts and private messages -$sql = 'SELECT a.*, p.forum_id, f.forum_password, f.parent_id - FROM ' . ATTACHMENTS_TABLE . ' a, ' . POSTS_TABLE . ' p, ' . FORUMS_TABLE . ' f - WHERE a.attach_id = ' . $attachment['attach_id'] . ' - AND ((a.post_id = p.post_id AND p.forum_id = f.forum_id) - OR a.post_id = 0)'; -$result = $db->sql_query($sql); - -while ($row = $db->sql_fetchrow($result)) +$sql = 'SELECT p.forum_id, f.forum_password, f.parent_id + FROM ' . POSTS_TABLE . ' p, ' . FORUMS_TABLE . ' f + WHERE p.post_id = ' . $attachment['post_id'] . ' + AND p.forum_id = f.forum_id'; +$result = $db->sql_query_limit($sql, 1); +$row = $db->sql_fetchrow($result); +$db->sql_freeresult($result); + +if ($auth->acl_gets('f_download', 'u_download', $row['forum_id'])) { - if ($row['post_id'] && $auth->acl_get('f_download', $row['forum_id'])) - { - if ($row['forum_password']) - { - // Do something else ... ? - login_forum_box($row); - } - - $authorised = TRUE; - break; - } - else + if ($row['forum_password']) { - if ($config['allow_pm_attach'] && ($user->data['user_id'] == $row['user_id_2'] || $user->data['user_id'] == $row['user_id_1'])) - { - $authorised = TRUE; - break; - } + // Do something else ... ? + login_forum_box($row); } } -$db->sql_freeresult($result); - -if (!$authorised) +else { trigger_error('SORRY_AUTH_VIEW_ATTACH'); } @@ -105,7 +87,7 @@ if ($thumbnail) else { // Update download count - $sql = 'UPDATE ' . ATTACHMENTS_DESC_TABLE . ' + $sql = 'UPDATE ' . ATTACHMENTS_TABLE . ' SET download_count = download_count + 1 WHERE attach_id = ' . $attachment['attach_id']; $db->sql_query($sql); |