From 529377b572d6697017bdce64ec24ef73704a71f3 Mon Sep 17 00:00:00 2001 From: Dongsheng Cai Date: Tue, 24 Aug 2010 07:52:12 +0000 Subject: [PATCH] "MDL-23894, added user quota limit to filesedit form" --- lib/filelib.php | 4 ++++ user/filesedit_form.php | 12 ++++++++++++ 2 files changed, 16 insertions(+) diff --git a/lib/filelib.php b/lib/filelib.php index 6d48fba275c..9b97e8c807e 100644 --- a/lib/filelib.php +++ b/lib/filelib.php @@ -422,6 +422,10 @@ function file_get_draft_area_info($draftitemid) { // The number of files $draftfiles = $fs->get_area_files($usercontext->id, 'user', 'draft', $draftitemid, 'id', false); $results['filecount'] = count($draftfiles); + $results['filesize'] = 0; + foreach ($draftfiles as $file) { + $results['filesize'] += $file->get_filesize(); + } return $results; } diff --git a/user/filesedit_form.php b/user/filesedit_form.php index 4c5314bb173..4fd1e6f1b5e 100644 --- a/user/filesedit_form.php +++ b/user/filesedit_form.php @@ -41,4 +41,16 @@ class user_filesedit_form extends moodleform { $this->set_data($data); } + function validation($data, $files) { + global $CFG; + + $errors = array(); + $draftitemid = $data['files_filemanager']; + $fileinfo = file_get_draft_area_info($draftitemid); + if ($fileinfo['filesize'] > $CFG->userquota) { + $errors['files_filemanager'] = get_string('userquotalimit', 'error'); + } + + return $errors; + } }