MDL-14589 new file not found general function

agwells · Sep 3, 2008 · 2aea0c5 · 2aea0c5
1 parent ede057f
commit 2aea0c5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 16 deletions.
diff --git a/draftfile.php b/draftfile.php
@@ -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,17 +54,11 @@
     $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();
     }
 
     // ========================================
     // finally send the file
     // ========================================
     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??
-    }
diff --git a/userfile.php b/userfile.php
@@ -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,17 +55,11 @@
     $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();
     }
 
     // ========================================
     // finally send the file
     // ========================================
     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??
-    }