diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2010-09-16 22:42:32 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2010-09-16 22:42:32 +0200 |
| commit | e35711ddde8f5e9f94d4b5145662877619ceecd4 (patch) | |
| tree | 16b5b18a4c14860bccd591d4b8a0d7a2ab833868 /phpBB/download | |
| parent | 4d5d50001d00390b8255da736e67e38d83c8bed5 (diff) | |
| parent | 46810f874758516a8b5ce0fc680f05b612f70f60 (diff) | |
| download | forums-e35711ddde8f5e9f94d4b5145662877619ceecd4.tar forums-e35711ddde8f5e9f94d4b5145662877619ceecd4.tar.gz forums-e35711ddde8f5e9f94d4b5145662877619ceecd4.tar.bz2 forums-e35711ddde8f5e9f94d4b5145662877619ceecd4.tar.xz forums-e35711ddde8f5e9f94d4b5145662877619ceecd4.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9609] Change header() calls setting HTTP status to send_status_line().
[ticket/9613] Slightly update language strings.
[ticket/9613] Fix missing database part for unread posts search load switch.
[ticket/9613] Implement a load switch for unread posts search feature.
[ticket/9785] Allow users to request new passwords when board is disabled.
[ticket/9644] Check $mode before calling user_notification() from submit_post()
Diffstat (limited to 'phpBB/download')
| -rw-r--r-- | phpBB/download/file.php | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/phpBB/download/file.php b/phpBB/download/file.php index 1f2cee4d95..5f45b88359 100644 --- a/phpBB/download/file.php +++ b/phpBB/download/file.php @@ -77,7 +77,7 @@ if (isset($_GET['avatar'])) // '==' is not a bug - . as the first char is as bad as no dot at all if (strpos($filename, '.') == false) { - header('HTTP/1.0 403 Forbidden'); + send_status_line(403, 'Forbidden'); $exit = true; } @@ -91,7 +91,7 @@ if (isset($_GET['avatar'])) if (!$exit && !in_array($ext, array('png', 'gif', 'jpg', 'jpeg'))) { // no way such an avatar could exist. They are not following the rules, stop the show. - header("HTTP/1.0 403 Forbidden"); + send_status_line(403, 'Forbidden'); $exit = true; } @@ -101,7 +101,7 @@ if (isset($_GET['avatar'])) if (!$filename) { // no way such an avatar could exist. They are not following the rules, stop the show. - header("HTTP/1.0 403 Forbidden"); + send_status_line(403, 'Forbidden'); } else { @@ -199,7 +199,7 @@ else $row['forum_id'] = false; if (!$auth->acl_get('u_pm_download')) { - header('HTTP/1.0 403 Forbidden'); + send_status_line(403, 'Forbidden'); trigger_error('SORRY_AUTH_VIEW_ATTACH'); } @@ -222,7 +222,7 @@ else if (!$allowed) { - header('HTTP/1.0 403 Forbidden'); + send_status_line(403, 'Forbidden'); trigger_error('ERROR_NO_ATTACHMENT'); } } @@ -237,7 +237,7 @@ else if (!download_allowed()) { - header('HTTP/1.0 403 Forbidden'); + send_status_line(403, 'Forbidden'); trigger_error($user->lang['LINKAGE_FORBIDDEN']); } @@ -383,7 +383,7 @@ function send_avatar_to_browser($file, $browser) } else { - header('HTTP/1.0 404 Not Found'); + send_status_line(404, 'Not Found'); } } |