MDL-24441, enforce course max file size

Duck-ComEn · Sep 29, 2010 · b8a6131 · b8a6131
1 parent b7b88c0
commit b8a6131
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/mod/forum/post_form.php b/mod/forum/post_form.php
@@ -40,6 +40,10 @@ function definition() {
         $modcontext    = $this->_customdata['modcontext'];
         $forum         = $this->_customdata['forum'];
         $post          = $this->_customdata['post'];
+        // if $forum->maxbytes == '0' means we should use $course->maxbytes
+        if ($forum->maxbytes == '0') {
+            $forum->maxbytes = $course->maxbytes;
+        }
         // TODO: add max files and max size support
         $editoroptions = array('maxfiles' => EDITOR_UNLIMITED_FILES, 'trusttext'=>true, 'context'=>$modcontext);
 

diff --git a/repository/repository_ajax.php b/repository/repository_ajax.php
@@ -251,7 +251,7 @@
         // see MDL-23407
         try {
             // TODO: add file scanning MDL-19380 into each plugin
-            $result = $repo->upload($saveas_filename);
+            $result = $repo->upload($saveas_filename, $maxbytes);
             echo json_encode($result);
         } catch (Exception $e) {
             $err->error = $e->getMessage();

diff --git a/repository/upload/lib.php b/repository/upload/lib.php
@@ -41,7 +41,7 @@ public function print_login() {
      * Process uploaded file
      * @return array|bool
      */
-    public function upload($saveas_filename) {
+    public function upload($saveas_filename, $maxbytes) {
         global $USER, $CFG;
 
         $types = optional_param('accepted_types', '*', PARAM_RAW);
@@ -100,14 +100,12 @@ public function upload($saveas_filename) {
             $record->itemid = 0;
         }
 
+        if (($maxbytes!==-1) && (filesize($_FILES[$elname]['tmp_name']) > $maxbytes)) {
+            throw new file_exception('maxbytes');
+        }
+
         if ($file = $fs->get_file($context->id, $record->component, $record->filearea, $record->itemid, $record->filepath, $record->filename)) {
             throw new moodle_exception('fileexists', 'repository');
-            //$record->filename = ;
-            //return array(
-                //'url'=>moodle_url::make_draftfile_url($file->get_itemid(), $file->get_filepath(), $file->get_filename())->out(),
-                //'id'=>$file->get_itemid(),
-                //'file'=>$file->get_filename()
-            //);
         }
 
         $record->contextid = $context->id;