Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

MDL-27896 context - Fixed editor context to observe filter status

  • Loading branch information...
commit b51aac313f82e0e9caaa0c5b9f97ad32444b1885 1 parent 3a5778e
Rajesh Taneja authored
View
4 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');
}
View
2  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 {
View
7 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'));
View
8 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);
View
8 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);
View
1  mod/assignment/lib.php
@@ -2372,6 +2372,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;
}
View
7 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;
View
4 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,
View
1  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)));
View
2  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:
View
9 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);
View
3  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
View
3  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
View
3  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
View
3  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
View
9 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);
View
7 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'));
View
9 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)) {
View
9 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;
Please sign in to comment.
Something went wrong with that request. Please try again.