diff --git a/cohort/edit.php b/cohort/edit.php index 250fd164e3e0a..f092247f0b701 100644 --- a/cohort/edit.php +++ b/cohort/edit.php @@ -94,12 +94,12 @@ $editoroptions = array('maxfiles'=>0, 'context'=>$context); if ($cohort->id) { // edit existing - $cohort = file_prepare_standard_editor($cohort, 'description', $editoroptions); + $cohort = file_prepare_standard_editor($cohort, 'description', $editoroptions, $context); $strheading = get_string('editcohort', 'cohort'); } else { // add new - $cohort = file_prepare_standard_editor($cohort, 'description', $editoroptions); + $cohort = file_prepare_standard_editor($cohort, 'description', $editoroptions, $context); $strheading = get_string('addcohort', 'cohort'); } diff --git a/course/edit.php b/course/edit.php index b4871329613e9..d184328dff534 100644 --- a/course/edit.php +++ b/course/edit.php @@ -77,6 +77,8 @@ } } $course->allowedmods = $allowedmods; + //add context for editor + $editoroptions['context'] = $coursecontext; $course = file_prepare_standard_editor($course, 'summary', $editoroptions, $coursecontext, 'course', 'summary', 0); } else { diff --git a/course/editcategory.php b/course/editcategory.php index 3cff561935cb4..f033b8d810231 100644 --- a/course/editcategory.php +++ b/course/editcategory.php @@ -49,7 +49,12 @@ $PAGE->set_pagelayout('admin'); -$editoroptions = array('maxfiles' => EDITOR_UNLIMITED_FILES, 'maxbytes'=>$CFG->maxbytes, 'trusttext'=>true); +$editoroptions = array( + 'maxfiles' => EDITOR_UNLIMITED_FILES, + 'maxbytes' => $CFG->maxbytes, + 'trusttext' => true, + 'context' => $editorcontext +); $category = file_prepare_standard_editor($category, 'description', $editoroptions, $editorcontext, 'coursecat', 'description', 0); $mform = new editcategory_form('editcategory.php', compact('category', 'editoroptions')); diff --git a/grade/edit/outcome/edit.php b/grade/edit/outcome/edit.php index d301cfe6c8c06..1f4d9b7f7c622 100644 --- a/grade/edit/outcome/edit.php +++ b/grade/edit/outcome/edit.php @@ -103,7 +103,13 @@ // default return url $gpr = new grade_plugin_return(); $returnurl = $gpr->get_return_url('index.php?id='.$courseid); -$editoroptions = array('maxfiles'=>EDITOR_UNLIMITED_FILES, 'maxbytes'=>$CFG->maxbytes, 'trusttext'=>false, 'noclean'=>true); +$editoroptions = array( + 'maxfiles' => EDITOR_UNLIMITED_FILES, + 'maxbytes' => $CFG->maxbytes, + 'trusttext' => false, + 'noclean' => true, + 'context' => $systemcontext +); if (!empty($outcome_rec->id)) { $outcome_rec = file_prepare_standard_editor($outcome_rec, 'description', $editoroptions, $systemcontext, 'grade', 'outcome', $outcome_rec->id); diff --git a/grade/edit/scale/edit.php b/grade/edit/scale/edit.php index 5787ed108853d..f2261396a3114 100644 --- a/grade/edit/scale/edit.php +++ b/grade/edit/scale/edit.php @@ -88,7 +88,13 @@ // default return url $gpr = new grade_plugin_return(); $returnurl = $gpr->get_return_url('index.php?id='.$courseid); -$editoroptions = array('maxfiles'=>EDITOR_UNLIMITED_FILES, 'maxbytes'=>$CFG->maxbytes, 'trusttext'=>false, 'noclean'=>true); +$editoroptions = array( + 'maxfiles' => EDITOR_UNLIMITED_FILES, + 'maxbytes' => $CFG->maxbytes, + 'trusttext' => false, + 'noclean' => true, + 'context' => $systemcontext +); if (!empty($scale_rec->id)) { $scale_rec = file_prepare_standard_editor($scale_rec, 'description', $editoroptions, $systemcontext, 'grade', 'scale', $scale_rec->id); diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php index 76096d8f4bee1..69cc6a9d67f7d 100644 --- a/mod/assignment/lib.php +++ b/mod/assignment/lib.php @@ -2371,6 +2371,7 @@ protected function get_editor_options() { $editoroptions['noclean'] = false; $editoroptions['maxfiles'] = 0; //TODO: no files for now, we need to first implement assignment_feedback area, integration with gradebook, files support in quickgrading, etc. (skodak) $editoroptions['maxbytes'] = $this->_customdata->maxbytes; + $editoroptions['context'] = $this->_customdata->context; return $editoroptions; } diff --git a/mod/assignment/type/online/assignment.class.php b/mod/assignment/type/online/assignment.class.php index 54532f71ca513..b705528be3c0b 100644 --- a/mod/assignment/type/online/assignment.class.php +++ b/mod/assignment/type/online/assignment.class.php @@ -38,7 +38,12 @@ function view() { if ($editmode) { // prepare form and process submitted data - $editoroptions = array('noclean'=>false, 'maxfiles'=>EDITOR_UNLIMITED_FILES, 'maxbytes'=>$this->course->maxbytes); + $editoroptions = array( + 'noclean' => false, + 'maxfiles' => EDITOR_UNLIMITED_FILES, + 'maxbytes' => $this->course->maxbytes, + 'context' => $this->context + ); $data = new stdClass(); $data->id = $this->cm->id; diff --git a/mod/feedback/item/label/lib.php b/mod/feedback/item/label/lib.php index ce9b3999e1fd5..5e5df4c6478e3 100644 --- a/mod/feedback/item/label/lib.php +++ b/mod/feedback/item/label/lib.php @@ -49,6 +49,10 @@ function build_editform($item, $feedback, $cm) { //preparing the editor for new file-api $item->presentationformat = FORMAT_HTML; $item->presentationtrust = 1; + + // Append editor context to presentation options, giving preference to existing context. + $this->presentationoptions = array_merge(array('context' => $this->context), $this->presentationoptions); + $item = file_prepare_standard_editor($item, 'presentation', //name of the form element $this->presentationoptions, diff --git a/mod/lesson/editpage.php b/mod/lesson/editpage.php index e9bffb8a2cc6f..f725cae7ee288 100644 --- a/mod/lesson/editpage.php +++ b/mod/lesson/editpage.php @@ -84,6 +84,7 @@ $data = $editpage->properties(); $data->pageid = $editpage->id; $data->id = $cm->id; + $editoroptions['context'] = $context; $data = file_prepare_standard_editor($data, 'contents', $editoroptions, $context, 'mod_lesson', 'page_contents', $editpage->id); $mform->set_data($data); $PAGE->navbar->add(get_string('edit'), new moodle_url('/mod/lesson/edit.php', array('id'=>$id))); diff --git a/mod/wiki/pagelib.php b/mod/wiki/pagelib.php index 6266308480aac..a81f6854e53c4 100644 --- a/mod/wiki/pagelib.php +++ b/mod/wiki/pagelib.php @@ -535,6 +535,8 @@ protected function print_edit($content = null) { switch ($format) { case 'html': $data->newcontentformat = FORMAT_HTML; + // Append editor context to editor options, giving preference to existing context. + page_wiki_edit::$attachmentoptions = array_merge(array('context' => $this->modcontext), page_wiki_edit::$attachmentoptions); $data = file_prepare_standard_editor($data, 'newcontent', page_wiki_edit::$attachmentoptions, $this->modcontext, 'mod_wiki', 'attachments', $this->subwiki->id); break; default: diff --git a/mod/workshop/exsubmission.php b/mod/workshop/exsubmission.php index 70870e8df5d7d..486c27814eef4 100644 --- a/mod/workshop/exsubmission.php +++ b/mod/workshop/exsubmission.php @@ -103,7 +103,14 @@ $maxfiles = $workshop->nattachments; $maxbytes = $workshop->maxbytes; - $contentopts = array('trusttext' => true, 'subdirs' => false, 'maxfiles' => $maxfiles, 'maxbytes' => $maxbytes); + $contentopts = array( + 'trusttext' => true, + 'subdirs' => false, + 'maxfiles' => $maxfiles, + 'maxbytes' => $maxbytes, + 'context' => $workshop->context + ); + $attachmentopts = array('subdirs' => true, 'maxfiles' => $maxfiles, 'maxbytes' => $maxbytes); $example = file_prepare_standard_editor($example, 'content', $contentopts, $workshop->context, 'mod_workshop', 'submission_content', $example->id); diff --git a/mod/workshop/form/accumulative/lib.php b/mod/workshop/form/accumulative/lib.php index ec04384e2d578..1c960e20f3c77 100644 --- a/mod/workshop/form/accumulative/lib.php +++ b/mod/workshop/form/accumulative/lib.php @@ -116,6 +116,9 @@ public function get_edit_strategy_form($actionurl=null) { $norepeats += self::ADDDIMS; } + // Append editor context to editor options, giving preference to existing context. + $this->descriptionopts = array_merge(array('context' => $PAGE->context), $this->descriptionopts); + // prepare the embeded files for ($i = 0; $i < $nodimensions; $i++) { // prepare all editor elements diff --git a/mod/workshop/form/comments/lib.php b/mod/workshop/form/comments/lib.php index 8fa77351d09c1..156eef8555a4a 100644 --- a/mod/workshop/form/comments/lib.php +++ b/mod/workshop/form/comments/lib.php @@ -116,6 +116,9 @@ public function get_edit_strategy_form($actionurl=null) { $norepeats += self::ADDDIMS; } + // Append editor context to editor options, giving preference to existing context. + $this->descriptionopts = array_merge(array('context' => $PAGE->context), $this->descriptionopts); + // prepare the embedded files for ($i = 0; $i < $nodimensions; $i++) { // prepare all editor elements diff --git a/mod/workshop/form/numerrors/lib.php b/mod/workshop/form/numerrors/lib.php index 123160b3bf249..9fae313a55b33 100644 --- a/mod/workshop/form/numerrors/lib.php +++ b/mod/workshop/form/numerrors/lib.php @@ -120,6 +120,9 @@ public function get_edit_strategy_form($actionurl=null) { $norepeats += self::ADDDIMS; } + // Append editor context to editor options, giving preference to existing context. + $this->descriptionopts = array_merge(array('context' => $PAGE->context), $this->descriptionopts); + // prepare the embeded files for ($i = 0; $i < $nodimensions; $i++) { // prepare all editor elements diff --git a/mod/workshop/form/rubric/lib.php b/mod/workshop/form/rubric/lib.php index 995a797132f1c..17b54c27d0f6f 100644 --- a/mod/workshop/form/rubric/lib.php +++ b/mod/workshop/form/rubric/lib.php @@ -126,6 +126,9 @@ public function get_edit_strategy_form($actionurl=null) { $norepeats += self::ADDDIMS; } + // Append editor context to editor options, giving preference to existing context. + $this->descriptionopts = array_merge(array('context' => $this->workshop->context), $this->descriptionopts); + // prepare the embeded files for ($i = 0; $i < $nodimensions; $i++) { // prepare all editor elements diff --git a/mod/workshop/submission.php b/mod/workshop/submission.php index f2c8a1b92af8d..30e6bc4737144 100644 --- a/mod/workshop/submission.php +++ b/mod/workshop/submission.php @@ -124,7 +124,14 @@ $maxfiles = $workshop->nattachments; $maxbytes = $workshop->maxbytes; - $contentopts = array('trusttext' => true, 'subdirs' => false, 'maxfiles' => $maxfiles, 'maxbytes' => $maxbytes); + $contentopts = array( + 'trusttext' => true, + 'subdirs' => false, + 'maxfiles' => $maxfiles, + 'maxbytes' => $maxbytes, + 'context' => $workshop->context + ); + $attachmentopts = array('subdirs' => true, 'maxfiles' => $maxfiles, 'maxbytes' => $maxbytes); $submission = file_prepare_standard_editor($submission, 'content', $contentopts, $workshop->context, 'mod_workshop', 'submission_content', $submission->id); diff --git a/tag/edit.php b/tag/edit.php index 306d5576a59f5..66fd0fbc3660a 100644 --- a/tag/edit.php +++ b/tag/edit.php @@ -77,7 +77,12 @@ $errorstring = ''; -$editoroptions = array('maxfiles'=>EDITOR_UNLIMITED_FILES, 'maxbytes'=>$CFG->maxbytes, 'trusttext'=>false); +$editoroptions = array( + 'maxfiles' => EDITOR_UNLIMITED_FILES, + 'maxbytes' => $CFG->maxbytes, + 'trusttext' => false, + 'context' => $systemcontext +); $tag = file_prepare_standard_editor($tag, 'description', $editoroptions, $systemcontext, 'tag', 'description', $tag->id); $tagform = new tag_edit_form(null, compact('editoroptions')); diff --git a/user/edit.php b/user/edit.php index 379fa4214b6dc..c7d429eff64c0 100644 --- a/user/edit.php +++ b/user/edit.php @@ -143,7 +143,14 @@ // Prepare the editor and create form -$editoroptions = array('maxfiles'=>EDITOR_UNLIMITED_FILES, 'maxbytes'=>$CFG->maxbytes, 'trusttext'=>false, 'forcehttps'=>false); +$editoroptions = array( + 'maxfiles' => EDITOR_UNLIMITED_FILES, + 'maxbytes' => $CFG->maxbytes, + 'trusttext' => false, + 'forcehttps' => false, + 'context' => $personalcontext +); + $user = file_prepare_standard_editor($user, 'description', $editoroptions, $personalcontext, 'user', 'profile', 0); $userform = new user_edit_form(null, array('editoroptions'=>$editoroptions)); if (empty($user->country)) { diff --git a/user/editadvanced.php b/user/editadvanced.php index 4a1f4ecd8d56b..e85c97201c333 100644 --- a/user/editadvanced.php +++ b/user/editadvanced.php @@ -113,7 +113,14 @@ if ($user->id !== -1) { $usercontext = get_context_instance(CONTEXT_USER, $user->id); - $editoroptions = array('maxfiles'=>EDITOR_UNLIMITED_FILES, 'maxbytes'=>$CFG->maxbytes, 'trusttext'=>false, 'forcehttps'=>false); + $editoroptions = array( + 'maxfiles' => EDITOR_UNLIMITED_FILES, + 'maxbytes' => $CFG->maxbytes, + 'trusttext' => false, + 'forcehttps' => false, + 'context' => $usercontext + ); + $user = file_prepare_standard_editor($user, 'description', $editoroptions, $usercontext, 'user', 'profile', 0); } else { $usercontext = null;