moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 17:36:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-32147 - use correct 404 for server type

Browse source
This commit is contained in:
Dan Marsden 2012-03-23 09:58:52 +13:00
parent 6ceef54c6e
commit dbdc735559
2 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/filelib.php
View file

@ -1596,9 +1596,19 @@ function get_mimetype_description($mimetype, $capitalise=false) {
*/ */
function send_file_not_found() { function send_file_not_found() {
global $CFG, $COURSE; global $CFG, $COURSE;
header('HTTP/1.0 404 not found'); send_header_404();
print_error('filenotfound', 'error', $CFG->wwwroot.'/course/view.php?id='.$COURSE->id); //this is not displayed on IIS?? print_error('filenotfound', 'error', $CFG->wwwroot.'/course/view.php?id='.$COURSE->id); //this is not displayed on IIS??
} }
/**
* Helper function to send correct 404 for server.
*/
function send_header_404() {
if (substr(php_sapi_name(), 0, 3) == 'cgi') {
header("Status: 404 Not Found");
} else {
header('HTTP/1.0 404 not found');
}
}
/** /**
* Check output buffering settings before sending file. * Check output buffering settings before sending file.
@ -1651,7 +1661,7 @@ function send_temp_file($path, $filename, $pathisstring=false) {
if (!$pathisstring) { if (!$pathisstring) {
if (!file_exists($path)) { if (!file_exists($path)) {
header('HTTP/1.0 404 not found'); send_header_404();
print_error('filenotfound', 'error', $CFG->wwwroot.'/'); print_error('filenotfound', 'error', $CFG->wwwroot.'/');
} }
// executed after normal finish or abort // executed after normal finish or abort

2
mod/scorm/lib.php
View file

@ -924,7 +924,7 @@ function scorm_pluginfile($course, $cm, $context, $filearea, $args, $forcedownlo
$fs = get_file_storage(); $fs = get_file_storage();
if (!$file = $fs->get_file_by_hash(sha1($fullpath)) or $file->is_directory()) { if (!$file = $fs->get_file_by_hash(sha1($fullpath)) or $file->is_directory()) {
if ($filearea === 'content') { //return file not found straight away to improve performance. if ($filearea === 'content') { //return file not found straight away to improve performance.
header('HTTP/1.0 404 not found'); send_header_404();
die; die;
} }
return false; return false;