L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-14589 new file not found general function

Browse Source
This commit is contained in:
skodak
2008-09-03 08:47:36 +00:00
parent ede057f3fb
commit 2aea0c5e85
2 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
draftfile.php
+2 -8
View File
@@ -43,7 +43,7 @@
switch ($filearea) {
case 'user_draft' : $itemid = (int)array_shift($args); break;
default: not_found();
default: send_file_not_found();
}
$relativepath = '/'.implode('/', $args);
@@ -54,7 +54,7 @@
$fullpath = $context->id.$filearea.$itemid.$relativepath;
if (!$file = $fs->get_file_by_hash(sha1($fullpath)) or $file->get_filename() == '.') {
not_found();
send_file_not_found();
}
// ========================================
@@ -62,9 +62,3 @@
// ========================================
session_write_close(); // unlock session during fileserving
send_stored_file($file, 0, false, $forcedownload);
function not_found() {
global $CFG;
header('HTTP/1.0 404 not found');
print_error('filenotfound', 'error', $CFG->wwwroot.'/'); //this is not displayed on IIS??
}
userfile.php
+2 -8
View File
@@ -44,7 +44,7 @@
switch ($filearea) {
case 'private': $itemid = 0; $forcedownload = true; break;
case 'draft' : $itemid = (int)array_shift($args); break;
default: not_found();
default: send_file_not_found();
}
$relativepath = '/'.implode('/', $args);
@@ -55,7 +55,7 @@
$fullpath = $context->id.$filearea.$itemid.$relativepath;
if (!$file = $fs->get_file_by_hash(sha1($fullpath)) or $file->get_filename() == '.') {
not_found();
send_file_not_found();
}
// ========================================
@@ -63,9 +63,3 @@
// ========================================
session_write_close(); // unlock session during fileserving
send_stored_file($file, 0, false, $forcedownload);
function not_found() {
global $CFG;
header('HTTP/1.0 404 not found');
print_error('filenotfound', 'error', $CFG->wwwroot.'/'); //this is not displayed on IIS??
}