';
-
- print_heading_with_help($pageheading, "mods", $module->name, $icon);
- $mform->display();
- print_footer($course);
- }
-?>
+libdir.'/gradelib.php');
+
+ require_login();
+
+ $add = optional_param('add', 0, PARAM_ALPHA);
+ $update = optional_param('update', 0, PARAM_INT);
+ $return = optional_param('return', 0, PARAM_BOOL); //return to course/view.php if false or mod/modname/view.php if true
+ $type = optional_param('type', '', PARAM_ALPHANUM);
+
+ if (!empty($add)) {
+ $section = required_param('section', PARAM_INT);
+ $course = required_param('course', PARAM_INT);
+
+ if (! $course = get_record("course", "id", $course)) {
+ error("This course doesn't exist");
+ }
+
+ require_login($course);
+ $context = get_context_instance(CONTEXT_COURSE, $course->id);
+ require_capability('moodle/course:manageactivities', $context);
+
+ if (! $module = get_record("modules", "name", $add)) {
+ error("This module type doesn't exist");
+ }
+
+ $cw = get_course_section($section, $course->id);
+
+ if (!course_allowed_module($course, $module->id)) {
+ error("This module has been disabled for this particular course");
+ }
+
+ $cm = null;
+
+ $form->section = $section; // The section number itself - relative!!! (section column in course_sections)
+ $form->visible = $cw->visible;
+ $form->course = $course->id;
+ $form->module = $module->id;
+ $form->modulename = $module->name;
+ $form->groupmode = $course->groupmode;
+ $form->groupingid = $course->defaultgroupingid;
+ $form->groupmembersonly = 0;
+ $form->instance = '';
+ $form->coursemodule = '';
+ $form->add = $add;
+ $form->return = 0; //must be false if this is an add, go back to course view on cancel
+
+ if($course->grouppublicprivate == 1){
+
+ $form->groupingid = groups_get_grouping_publicprivate($course->id);
+ $form->groupmembersonly = 1;
+
+ }
+ // Turn off default grouping for modules that don't provide group mode but only if public/private is off
+ elseif($add=='resource' || $add=='glossary' || $add=='label') {
+ $form->groupingid=0;
+ }
+
+ if (!empty($type)) {
+ $form->type = $type;
+ }
+
+ $sectionname = get_section_name($course->format);
+ $fullmodulename = get_string("modulename", $module->name);
+
+ if ($form->section && $course->format != 'site') {
+ $heading->what = $fullmodulename;
+ $heading->to = "$sectionname $form->section";
+ $pageheading = get_string("addinganewto", "moodle", $heading);
+ } else {
+ $pageheading = get_string("addinganew", "moodle", $fullmodulename);
+ }
+
+ $CFG->pagepath = 'mod/'.$module->name;
+ if (!empty($type)) {
+ $CFG->pagepath .= '/'.$type;
+ } else {
+ $CFG->pagepath .= '/mod';
+ }
+
+ $navlinksinstancename = '';
+ } else if (!empty($update)) {
+ if (! $cm = get_record("course_modules", "id", $update)) {
+ error("This course module doesn't exist");
+ }
+
+ if (! $course = get_record("course", "id", $cm->course)) {
+ error("This course doesn't exist");
+ }
+
+ require_login($course); // needed to setup proper $COURSE
+ $context = get_context_instance(CONTEXT_MODULE, $cm->id);
+ require_capability('moodle/course:manageactivities', $context);
+
+ if (! $module = get_record("modules", "id", $cm->module)) {
+ error("This module doesn't exist");
+ }
+
+ if (! $form = get_record($module->name, "id", $cm->instance)) {
+ error("The required instance of this module doesn't exist");
+ }
+
+ if (! $cw = get_record("course_sections", "id", $cm->section)) {
+ error("This course section doesn't exist");
+ }
+
+ $form->coursemodule = $cm->id;
+ $form->section = $cw->section; // The section number itself - relative!!! (section column in course_sections)
+ $form->visible = $cm->visible; //?? $cw->visible ? $cm->visible : 0; // section hiding overrides
+ $form->cmidnumber = $cm->idnumber; // The cm IDnumber
+ $form->groupmode = groups_get_activity_groupmode($cm); // locked later if forced
+ $form->groupingid = $cm->groupingid;
+ $form->groupmembersonly = $cm->groupmembersonly;
+ $form->course = $course->id;
+ $form->module = $module->id;
+ $form->modulename = $module->name;
+ $form->instance = $cm->instance;
+ $form->return = $return;
+ $form->update = $update;
+
+ if ($items = grade_item::fetch_all(array('itemtype'=>'mod', 'itemmodule'=>$form->modulename,
+ 'iteminstance'=>$form->instance, 'courseid'=>$COURSE->id))) {
+ // add existing outcomes
+ foreach ($items as $item) {
+ if (!empty($item->outcomeid)) {
+ $form->{'outcome_'.$item->outcomeid} = 1;
+ }
+ }
+
+ // set category if present
+ $gradecat = false;
+ foreach ($items as $item) {
+ if ($gradecat === false) {
+ $gradecat = $item->categoryid;
+ continue;
+ }
+ if ($gradecat != $item->categoryid) {
+ //mixed categories
+ $gradecat = false;
+ break;
+ }
+ }
+ if ($gradecat !== false) {
+ // do not set if mixed categories present
+ $form->gradecat = $gradecat;
+ }
+ }
+
+ $sectionname = get_section_name($course->format);
+ $fullmodulename = get_string("modulename", $module->name);
+
+ if ($form->section && $course->format != 'site') {
+ $heading->what = $fullmodulename;
+ $heading->in = "$sectionname $cw->section";
+ $pageheading = get_string("updatingain", "moodle", $heading);
+ } else {
+ $pageheading = get_string("updatinga", "moodle", $fullmodulename);
+ }
+
+ $navlinksinstancename = array('name' => format_string($form->name,true), 'link' => "$CFG->wwwroot/mod/$module->name/view.php?id=$cm->id", 'type' => 'activityinstance');
+
+ $CFG->pagepath = 'mod/'.$module->name;
+ if (!empty($type)) {
+ $CFG->pagepath .= '/'.$type;
+ } else {
+ $CFG->pagepath .= '/mod';
+ }
+ } else {
+ error('Invalid operation.');
+ }
+
+ $modmoodleform = "$CFG->dirroot/mod/$module->name/mod_form.php";
+ if (file_exists($modmoodleform)) {
+ require_once($modmoodleform);
+
+ } else {
+ error('No formslib form description file found for this activity.');
+ }
+
+ $modlib = "$CFG->dirroot/mod/$module->name/lib.php";
+ if (file_exists($modlib)) {
+ include_once($modlib);
+ } else {
+ error("This module is missing important code! ($modlib)");
+ }
+
+ $mformclassname = 'mod_'.$module->name.'_mod_form';
+ $mform =& new $mformclassname($form->instance, $cw->section, $cm);
+ $mform->set_data($form);
+
+ if ($mform->is_cancelled()) {
+ if ($return && !empty($cm->id)){
+ redirect("$CFG->wwwroot/mod/$module->name/view.php?id=$cm->id");
+ } else {
+ redirect("view.php?id=$course->id#section-".$cw->section);
+ }
+ } else if ($fromform = $mform->get_data()) {
+ if (empty($fromform->coursemodule)) { //add
+ $cm = null;
+ if (! $course = get_record("course", "id", $fromform->course)) {
+ error("This course doesn't exist");
+ }
+ $fromform->instance = '';
+ $fromform->coursemodule = '';
+ } else { //update
+ if (! $cm = get_record("course_modules", "id", $fromform->coursemodule)) {
+ error("This course module doesn't exist");
+ }
+
+ if (! $course = get_record("course", "id", $cm->course)) {
+ error("This course doesn't exist");
+ }
+ $fromform->instance = $cm->instance;
+ $fromform->coursemodule = $cm->id;
+ }
+
+ require_login($course->id); // needed to setup proper $COURSE
+
+ if (!empty($fromform->coursemodule)) {
+ $context = get_context_instance(CONTEXT_MODULE, $fromform->coursemodule);
+ } else {
+ $context = get_context_instance(CONTEXT_COURSE, $course->id);
+ }
+ require_capability('moodle/course:manageactivities', $context);
+
+ $fromform->course = $course->id;
+ $fromform->modulename = clean_param($fromform->modulename, PARAM_SAFEDIR); // For safety
+
+ $addinstancefunction = $fromform->modulename."_add_instance";
+ $updateinstancefunction = $fromform->modulename."_update_instance";
+
+ if (!isset($fromform->groupingid)) {
+ $fromform->groupingid = 0;
+ }
+
+ if (!isset($fromform->groupmembersonly)) {
+ $fromform->groupmembersonly = 0;
+ }
+
+ if (!isset($fromform->name)) { //label
+ $fromform->name = $fromform->modulename;
+ }
+
+ if (!empty($fromform->update)) {
+
+ if (!empty($course->groupmodeforce) or !isset($fromform->groupmode)) {
+ $fromform->groupmode = $cm->groupmode; // keep original
+ }
+
+ $returnfromfunc = $updateinstancefunction($fromform);
+ if (!$returnfromfunc) {
+ error("Could not update the $fromform->modulename", "view.php?id=$course->id");
+ }
+ if (is_string($returnfromfunc)) {
+ error($returnfromfunc, "view.php?id=$course->id");
+ }
+
+ set_coursemodule_visible($fromform->coursemodule, $fromform->visible);
+ set_coursemodule_groupmode($fromform->coursemodule, $fromform->groupmode);
+ set_coursemodule_groupingid($fromform->coursemodule, $fromform->groupingid);
+ set_coursemodule_groupmembersonly($fromform->coursemodule, $fromform->groupmembersonly);
+
+ if (isset($fromform->cmidnumber)) { //label
+ // set cm idnumber
+ set_coursemodule_idnumber($fromform->coursemodule, $fromform->cmidnumber);
+ }
+
+ add_to_log($course->id, "course", "update mod",
+ "../mod/$fromform->modulename/view.php?id=$fromform->coursemodule",
+ "$fromform->modulename $fromform->instance");
+ add_to_log($course->id, $fromform->modulename, "update",
+ "view.php?id=$fromform->coursemodule",
+ "$fromform->instance", $fromform->coursemodule);
+
+ } else if (!empty($fromform->add)){
+
+ if (!empty($course->groupmodeforce) or !isset($fromform->groupmode)) {
+ $fromform->groupmode = 0; // do not set groupmode
+ }
+
+ if (!course_allowed_module($course,$fromform->modulename)) {
+ error("This module ($fromform->modulename) has been disabled for this particular course");
+ }
+
+ $returnfromfunc = $addinstancefunction($fromform);
+ if (!$returnfromfunc) {
+ error("Could not add a new instance of $fromform->modulename", "view.php?id=$course->id");
+ }
+ if (is_string($returnfromfunc)) {
+ error($returnfromfunc, "view.php?id=$course->id");
+ }
+
+ $fromform->instance = $returnfromfunc;
+
+ // course_modules and course_sections each contain a reference
+ // to each other, so we have to update one of them twice.
+
+ if (! $fromform->coursemodule = add_course_module($fromform) ) {
+ error("Could not add a new course module");
+ }
+ if (! $sectionid = add_mod_to_section($fromform) ) {
+ error("Could not add the new course module to that section");
+ }
+
+ if (! set_field("course_modules", "section", $sectionid, "id", $fromform->coursemodule)) {
+ error("Could not update the course module with the correct section");
+ }
+
+ // make sure visibility is set correctly (in particular in calendar)
+ set_coursemodule_visible($fromform->coursemodule, $fromform->visible);
+
+ if (isset($fromform->cmidnumber)) { //label
+ // set cm idnumber
+ set_coursemodule_idnumber($fromform->coursemodule, $fromform->cmidnumber);
+ }
+
+ add_to_log($course->id, "course", "add mod",
+ "../mod/$fromform->modulename/view.php?id=$fromform->coursemodule",
+ "$fromform->modulename $fromform->instance");
+ add_to_log($course->id, $fromform->modulename, "add",
+ "view.php?id=$fromform->coursemodule",
+ "$fromform->instance", $fromform->coursemodule);
+ } else {
+ error("Data submitted is invalid.");
+ }
+
+ // sync idnumber with grade_item
+ if ($grade_item = grade_item::fetch(array('itemtype'=>'mod', 'itemmodule'=>$fromform->modulename,
+ 'iteminstance'=>$fromform->instance, 'itemnumber'=>0, 'courseid'=>$COURSE->id))) {
+ if ($grade_item->idnumber != $fromform->cmidnumber) {
+ $grade_item->idnumber = $fromform->cmidnumber;
+ $grade_item->update();
+ }
+ }
+
+ $items = grade_item::fetch_all(array('itemtype'=>'mod', 'itemmodule'=>$fromform->modulename,
+ 'iteminstance'=>$fromform->instance, 'courseid'=>$COURSE->id));
+
+ // create parent category if requested and move to correct parent category
+ if ($items and isset($fromform->gradecat)) {
+ if ($fromform->gradecat == -1) {
+ $grade_category = new grade_category();
+ $grade_category->courseid = $COURSE->id;
+ $grade_category->fullname = stripslashes($fromform->name);
+ $grade_category->insert();
+ if ($grade_item) {
+ $parent = $grade_item->get_parent_category();
+ $grade_category->set_parent($parent->id);
+ }
+ $fromform->gradecat = $grade_category->id;
+ }
+ foreach ($items as $itemid=>$unused) {
+ $items[$itemid]->set_parent($fromform->gradecat);
+ if ($itemid == $grade_item->id) {
+ // use updated grade_item
+ $grade_item = $items[$itemid];
+ }
+ }
+ }
+
+ // add outcomes if requested
+ if ($outcomes = grade_outcome::fetch_all_available($COURSE->id)) {
+ $grade_items = array();
+
+ // Outcome grade_item.itemnumber start at 1000, there is nothing above outcomes
+ $max_itemnumber = 999;
+ if ($items) {
+ foreach($items as $item) {
+ if ($item->itemnumber > $max_itemnumber) {
+ $max_itemnumber = $item->itemnumber;
+ }
+ }
+ }
+
+ foreach($outcomes as $outcome) {
+ $elname = 'outcome_'.$outcome->id;
+
+ if (array_key_exists($elname, $fromform) and $fromform->$elname) {
+ // so we have a request for new outcome grade item?
+ if ($items) {
+ foreach($items as $item) {
+ if ($item->outcomeid == $outcome->id) {
+ //outcome aready exists
+ continue 2;
+ }
+ }
+ }
+
+ $max_itemnumber++;
+
+ $outcome_item = new grade_item();
+ $outcome_item->courseid = $COURSE->id;
+ $outcome_item->itemtype = 'mod';
+ $outcome_item->itemmodule = $fromform->modulename;
+ $outcome_item->iteminstance = $fromform->instance;
+ $outcome_item->itemnumber = $max_itemnumber;
+ $outcome_item->itemname = $outcome->fullname;
+ $outcome_item->outcomeid = $outcome->id;
+ $outcome_item->gradetype = GRADE_TYPE_SCALE;
+ $outcome_item->scaleid = $outcome->scaleid;
+ $outcome_item->insert();
+
+ // move the new outcome into correct category and fix sortorder if needed
+ if ($grade_item) {
+ $outcome_item->set_parent($grade_item->categoryid);
+ $outcome_item->move_after_sortorder($grade_item->sortorder);
+
+ } else if (isset($fromform->gradecat)) {
+ $outcome_item->set_parent($fromform->gradecat);
+ }
+ }
+ }
+ }
+
+ rebuild_course_cache($course->id);
+ grade_regrade_final_grades($course->id);
+
+ if (isset($fromform->submitbutton)) {
+ redirect("$CFG->wwwroot/mod/$module->name/view.php?id=$fromform->coursemodule");
+ } else {
+ redirect("$CFG->wwwroot/course/view.php?id=$course->id");
+ }
+ exit;
+
+ } else {
+ if (!empty($cm->id)) {
+ $context = get_context_instance(CONTEXT_MODULE, $cm->id);
+ } else {
+ $context = get_context_instance(CONTEXT_COURSE, $course->id);
+ }
+ require_capability('moodle/course:manageactivities', $context);
+
+ $streditinga = get_string("editinga", "moodle", $fullmodulename);
+ $strmodulenameplural = get_string("modulenameplural", $module->name);
+
+ $navlinks = array();
+ $navlinks[] = array('name' => $strmodulenameplural, 'link' => "$CFG->wwwroot/mod/$module->name/index.php?id=$course->id", 'type' => 'activity');
+ if ($navlinksinstancename) {
+ $navlinks[] = $navlinksinstancename;
+ }
+ $navlinks[] = array('name' => $streditinga, 'link' => '', 'type' => 'title');
+
+ $navigation = build_navigation($navlinks);
+
+ print_header_simple($streditinga, '', $navigation, $mform->focus(), "", false);
+
+ if (!empty($cm->id)) {
+ $context = get_context_instance(CONTEXT_MODULE, $cm->id);
+ $overridableroles = get_overridable_roles($context);
+ $assignableroles = get_assignable_roles($context);
+ $currenttab = 'update';
+ include_once($CFG->dirroot.'/'.$CFG->admin.'/roles/tabs.php');
+ }
+ $icon = '';
+
+ print_heading_with_help($pageheading, "mods", $module->name, $icon);
+ $mform->display();
+ print_footer($course);
+ }
+?>
Index: moodle/course/rest.php
===================================================================
--- moodle/course/rest.php (revision 1768)
+++ moodle/course/rest.php (working copy)
@@ -95,6 +95,19 @@
case 'visible':
set_coursemodule_visible($mod->id, $value);
break;
+
+ case 'private':
+ $groupingid = groups_get_grouping_publicprivate($mod->course);
+ if($groupingid != 0){
+ set_coursemodule_groupingid($mod->id, $groupingid);
+ set_coursemodule_groupmembersonly($mod->id, 1);
+ }
+ break;
+
+ case 'public':
+ set_coursemodule_groupingid($mod->id, 0);
+ set_coursemodule_groupmembersonly($mod->id, 0);
+ break;
case 'groupmode':
set_coursemodule_groupmode($mod->id, $value);
Index: moodle/course/view.php
===================================================================
--- moodle/course/view.php (revision 1768)
+++ moodle/course/view.php (working copy)
@@ -198,6 +198,10 @@
$PAGE->print_header(get_string('course').': %fullname%', NULL, '', $bodytags);
// Course wrapper start.
echo '
This is the public display of the course site. If you are enrolled, please log in to view private course materials.WARNING: You may not add or remove the Course Members group, for it is a component of public/private functionality.
+