MDL-14589 new file not found general function

diff --git a/draftfile.php b/draftfile.php
index 1c4210bf16f0e140df433924fe0afc4fafa71038..bc1e7e50763dc13f16f5042ea274ef1cd03c1a83 100644 (file)
--- 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,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??
-    }

diff --git a/userfile.php b/userfile.php
index 368dcdcd5d1d7e44e0fbbaa8c521eae95b99fe18..4b220dfc3350b41cbd7bb3a81902aad416638a81 100644 (file)
--- 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,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??
-    }