diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2004-05-02 13:06:57 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2004-05-02 13:06:57 +0000 |
| commit | 729c3abd02fc564fb99be53ba5fba450a073197f (patch) | |
| tree | 625496783aefb4310826381bcb69aec6558858ad /phpBB/download.php | |
| parent | 67d2ac36679f6c38fecaf157d2bc837daa237c41 (diff) | |
| download | forums-729c3abd02fc564fb99be53ba5fba450a073197f.tar forums-729c3abd02fc564fb99be53ba5fba450a073197f.tar.gz forums-729c3abd02fc564fb99be53ba5fba450a073197f.tar.bz2 forums-729c3abd02fc564fb99be53ba5fba450a073197f.tar.xz forums-729c3abd02fc564fb99be53ba5fba450a073197f.zip | |
fix some issues with oop, fixing small bugs and prepare the next steps...
NOTE TO DEVS: have a look at adm/admin_board.php (new config layout)
git-svn-id: file:///svn/phpbb/trunk@4883 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/download.php')
| -rw-r--r-- | phpBB/download.php | 47 |
1 files changed, 32 insertions, 15 deletions
diff --git a/phpBB/download.php b/phpBB/download.php index 19b0b1c5b8..c6a91e09f1 100644 --- a/phpBB/download.php +++ b/phpBB/download.php @@ -31,7 +31,7 @@ if (!$download_id) trigger_error('NO_ATTACHMENT_SELECTED'); } -if (!$config['allow_attachments']) +if (!$config['allow_attachments'] && !$config['allow_pm_attach']) { trigger_error('ATTACHMENT_FUNCTIONALITY_DISABLED'); } @@ -47,30 +47,47 @@ if (!($attachment = $db->sql_fetchrow($result))) } $db->sql_freeresult($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 ((!$attachment['in_message'] && !$config['allow_attachments']) || ($attachment['in_message'] && !$config['allow_pm_attach'])) +{ + trigger_error('ATTACHMENT_FUNCTIONALITY_DISABLED'); +} -if ($auth->acl_gets('f_download', 'u_download', $row['forum_id'])) +$row = array(); +if (!$attachment['in_message']) { - if ($row['forum_password']) + // + $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'] . ' + 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'])) { - // Do something else ... ? - login_forum_box($row); + if ($row['forum_password']) + { + // Do something else ... ? + login_forum_box($row); + } + } + else + { + trigger_error('SORRY_AUTH_VIEW_ATTACH'); } } else { - trigger_error('SORRY_AUTH_VIEW_ATTACH'); + $row['forum_id'] = 0; + if (!$auth->acl_get('u_pm_download') || !$config['auth_download_pm']) + { + trigger_error('SORRY_AUTH_VIEW_ATTACH'); + } } // disallowed ? -if (extension_allowed($row['forum_id'], $attachment['extension'])) +if (!extension_allowed($row['forum_id'], $attachment['extension'])) { trigger_error(sprintf($user->lang['EXTENSION_DISABLED_AFTER_POSTING'], $attachment['extension'])); } |