Merge branch 'wip-MDL-34463-master' of git://github.com/abgreeve/moodle

moodle · Jul 24, 2012 · 4ea5885 · 4ea5885
2 parents 0cbeea2 + d406047
commit 4ea5885
Show file tree

Hide file tree

Showing 61 changed files with 95 additions and 100 deletions.
diff --git a/grade/edit/outcome/course.php b/grade/edit/outcome/course.php
@@ -34,7 +34,7 @@
 
 /// Make sure they can even access this course
 require_login($course);
-$context = get_context_instance(CONTEXT_COURSE, $course->id);
+$context = context_course::instance($course->id);
 require_capability('moodle/course:update', $context);
 
 /// return tracking object

diff --git a/grade/edit/outcome/edit.php b/grade/edit/outcome/edit.php
@@ -40,7 +40,7 @@
 $PAGE->set_url($url);
 $PAGE->set_pagelayout('admin');
 
-$systemcontext = get_context_instance(CONTEXT_SYSTEM);
+$systemcontext = context_system::instance();
 $heading = null;
 
 // a bit complex access control :-O
@@ -57,7 +57,7 @@
             print_error('invalidcourseid');
         }
         require_login($course);
-        $context = get_context_instance(CONTEXT_COURSE, $course->id);
+        $context = context_course::instance($course->id);
         require_capability('moodle/grade:manage', $context);
         $courseid = $course->id;
     } else {
@@ -77,7 +77,7 @@
     /// adding new outcome from course
     $course = $DB->get_record('course', array('id' => $courseid), '*', MUST_EXIST);
     require_login($course);
-    $context = get_context_instance(CONTEXT_COURSE, $course->id);
+    $context = context_course::instance($course->id);
     require_capability('moodle/grade:manage', $context);
     navigation_node::override_active_url(new moodle_url('/grade/edit/outcome/course.php', array('id'=>$courseid)));
 

diff --git a/grade/edit/outcome/edit_form.php b/grade/edit/outcome/edit_form.php
@@ -121,7 +121,7 @@ function definition_after_data() {
             if (empty($courseid)) {
                 $mform->hardFreeze('standard');
 
-            } else if (empty($outcome->courseid) and !has_capability('moodle/grade:manage', get_context_instance(CONTEXT_SYSTEM))) {
+            } else if (empty($outcome->courseid) and !has_capability('moodle/grade:manage', context_system::instance())) {
                 $mform->hardFreeze('standard');
 
             } else if ($coursecount and empty($outcome->courseid)) {
@@ -130,7 +130,7 @@ function definition_after_data() {
 
 
         } else {
-            if (empty($courseid) or !has_capability('moodle/grade:manage', get_context_instance(CONTEXT_SYSTEM))) {
+            if (empty($courseid) or !has_capability('moodle/grade:manage', context_system::instance())) {
                 $mform->hardFreeze('standard');
             }
         }

diff --git a/grade/edit/outcome/export.php b/grade/edit/outcome/export.php
@@ -35,7 +35,7 @@
         print_error('nocourseid');
     }
     require_login($course);
-    $context = get_context_instance(CONTEXT_COURSE, $course->id);
+    $context = context_course::instance($course->id);
     require_capability('moodle/grade:manage', $context);
 
     if (empty($CFG->enableoutcomes)) {
@@ -49,10 +49,6 @@
 
 require_sesskey();
 
-// $outcome = grade_outcome::fetch(array('id'=>$outcomeid));
-
-$systemcontext = get_context_instance(CONTEXT_SYSTEM);
-
 header("Content-Type: text/csv; charset=utf-8");
 // TODO: make the filename more useful, include a date, a specific name, something...
 header('Content-Disposition: attachment; filename=outcomes.csv');

diff --git a/grade/edit/outcome/import.php b/grade/edit/outcome/import.php
@@ -40,7 +40,7 @@
         print_error('nocourseid');
     }
     require_login($course);
-    $context = get_context_instance(CONTEXT_COURSE, $course->id);
+    $context = context_course::instance($course->id);
 
     if (empty($CFG->enableoutcomes)) {
         redirect('../../index.php?id='.$courseid);
@@ -49,7 +49,7 @@
 } else {
     require_once $CFG->libdir.'/adminlib.php';
     admin_externalpage_setup('outcomes');
-    $context = get_context_instance(CONTEXT_SYSTEM);
+    $context = context_system::instance();
 }
 
 require_capability('moodle/grade:manageoutcomes', $context);
@@ -79,7 +79,7 @@
 if (isset($courseid) && ($scope  == 'custom')) {
     // custom scale
     $local_scope = true;
-} elseif (($scope == 'global') && has_capability('moodle/grade:manage', get_context_instance(CONTEXT_SYSTEM))) {
+} elseif (($scope == 'global') && has_capability('moodle/grade:manage', context_system::instance())) {
     // global scale
     $local_scope = false;
 } else {

diff --git a/grade/edit/outcome/import_outcomes_form.php b/grade/edit/outcome/import_outcomes_form.php
@@ -41,7 +41,7 @@ public function definition() {
         $mform->setType('id', PARAM_INT);
 
         $scope = array();
-        if (($PAGE->course->id > 1) && has_capability('moodle/grade:manage', get_context_instance(CONTEXT_SYSTEM))) {
+        if (($PAGE->course->id > 1) && has_capability('moodle/grade:manage', context_system::instance())) {
             $mform->addElement('radio', 'scope', get_string('importcustom', 'grades'), null, 'custom');
             $mform->addElement('radio', 'scope', get_string('importstandard', 'grades'), null, 'global');
             $mform->setDefault('scope', 'custom');

diff --git a/grade/edit/outcome/index.php b/grade/edit/outcome/index.php
@@ -36,7 +36,7 @@
 if ($courseid) {
     $course = $DB->get_record('course', array('id' => $courseid), '*', MUST_EXIST);
     require_login($course);
-    $context = get_context_instance(CONTEXT_COURSE, $course->id);
+    $context = context_course::instance($course->id);
     require_capability('moodle/grade:manageoutcomes', $context);
 
     if (empty($CFG->enableoutcomes)) {
@@ -76,7 +76,7 @@
         }
 
         if (empty($outcome->courseid)) {
-            require_capability('moodle/grade:manage', get_context_instance(CONTEXT_SYSTEM));
+            require_capability('moodle/grade:manage', context_system::instance());
         } else if ($outcome->courseid != $courseid) {
             print_error('invalidcourseid');
         }
@@ -105,7 +105,7 @@
         break;
 }
 
-$systemcontext = get_context_instance(CONTEXT_SYSTEM);
+$systemcontext = context_system::instance();
 $caneditsystemscales = has_capability('moodle/course:managescales', $systemcontext);
 
 if ($courseid) {
@@ -138,7 +138,7 @@
             } else if ($scale->courseid == $courseid) {
                 $caneditthisscale = $caneditcoursescales;
             } else {
-                $context = get_context_instance(CONTEXT_COURSE, $scale->courseid);
+                $context = context_course::instance($scale->courseid);
                 $caneditthisscale = has_capability('moodle/course:managescales', $context);
             }
             if ($caneditthisscale) {
@@ -187,7 +187,7 @@
             } else if ($scale->courseid == $courseid) {
                 $caneditthisscale = $caneditcoursescales;
             } else {
-                $context = get_context_instance(CONTEXT_COURSE, $scale->courseid);
+                $context = context_course::instance($scale->courseid);
                 $caneditthisscale = has_capability('moodle/course:managescales', $context);
             }
             if ($caneditthisscale) {
@@ -201,10 +201,10 @@
         $line[] = $outcome->get_item_uses_count();
 
         $buttons = "";
-        if (has_capability('moodle/grade:manage', get_context_instance(CONTEXT_SYSTEM))) {
+        if (has_capability('moodle/grade:manage', context_system::instance())) {
             $buttons .= grade_button('edit', $courseid, $outcome);
         }
-        if (has_capability('moodle/grade:manage', get_context_instance(CONTEXT_SYSTEM)) and $outcome->can_delete()) {
+        if (has_capability('moodle/grade:manage', context_system::instance()) and $outcome->can_delete()) {
             $buttons .= grade_button('delete', $courseid, $outcome);
         }
         $line[] = $buttons;

diff --git a/grade/edit/outcome/tabs.php b/grade/edit/outcome/tabs.php
@@ -24,7 +24,7 @@
 
     $row = $tabs = array();
 
-    $coursecontext = get_context_instance(CONTEXT_COURSE, $courseid);
+    $context = context_course::instance($courseid);
 
     $row[] = new tabobject('courseoutcomes',
                            $CFG->wwwroot.'/grade/edit/outcome/course.php?id='.$courseid,

diff --git a/grade/edit/scale/edit.php b/grade/edit/scale/edit.php
@@ -33,7 +33,7 @@
 $PAGE->set_url('/grade/edit/scale/edit.php', array('id' => $id, 'courseid' => $courseid));
 $PAGE->set_pagelayout('admin');
 
-$systemcontext = get_context_instance(CONTEXT_SYSTEM);
+$systemcontext = context_system::instance();
 $heading = '';
 
 // a bit complex access control :-O
@@ -50,7 +50,7 @@
             print_error('invalidcourseid');
         }
         require_login($course);
-        $context = get_context_instance(CONTEXT_COURSE, $course->id);
+        $context = context_course::instance($course->id);
         require_capability('moodle/course:managescales', $context);
         $courseid = $course->id;
     } else {
@@ -75,7 +75,7 @@
     $scale_rec->standard = 0;
     $scale_rec->courseid = $courseid;
     require_login($course);
-    $context = get_context_instance(CONTEXT_COURSE, $course->id);
+    $context = context_course::instance($course->id);
     require_capability('moodle/course:managescales', $context);
 
 } else {

diff --git a/grade/edit/scale/edit_form.php b/grade/edit/scale/edit_form.php
@@ -88,7 +88,7 @@ function definition_after_data() {
             if (empty($courseid)) {
                 $mform->hardFreeze('standard');
 
-            } else if (!has_capability('moodle/course:managescales', get_context_instance(CONTEXT_SYSTEM))) {
+            } else if (!has_capability('moodle/course:managescales', context_system::instance())) {
                 //if they dont have managescales at system level the shouldnt be allowed to make scales standard (or not standard)
                 $mform->hardFreeze('standard');
 
@@ -102,7 +102,7 @@ function definition_after_data() {
 
         } else {
             $mform->removeElement('used');
-            if (empty($courseid) or !has_capability('moodle/course:managescales', get_context_instance(CONTEXT_SYSTEM))) {
+            if (empty($courseid) or !has_capability('moodle/course:managescales', context_system::instance())) {
                 $mform->hardFreeze('standard');
             }
         }

diff --git a/grade/edit/scale/index.php b/grade/edit/scale/index.php
@@ -37,7 +37,7 @@
         print_error('nocourseid');
     }
     require_login($course);
-    $context = get_context_instance(CONTEXT_COURSE, $course->id);
+    $context = context_course::instance($course->id);
     require_capability('moodle/course:managescales', $context);
     $PAGE->set_pagelayout('admin');
 } else {
@@ -69,7 +69,7 @@
         }
 
         if (empty($scale->courseid)) {
-            require_capability('moodle/course:managescales', get_context_instance(CONTEXT_SYSTEM));
+            require_capability('moodle/course:managescales', context_system::instance());
         } else if ($scale->courseid != $courseid) {
             print_error('invalidcourseid');
         }
@@ -147,10 +147,10 @@
         $line[] = $used ? get_string('yes') : get_string('no');
 
         $buttons = "";
-        if (has_capability('moodle/course:managescales', get_context_instance(CONTEXT_SYSTEM))) {
+        if (has_capability('moodle/course:managescales', context_system::instance())) {
             $buttons .= grade_button('edit', $courseid, $scale);
         }
-        if (!$used and has_capability('moodle/course:managescales', get_context_instance(CONTEXT_SYSTEM))) {
+        if (!$used and has_capability('moodle/course:managescales', context_system::instance())) {
             $buttons .= grade_button('delete', $courseid, $scale);
         }
         $line[] = $buttons;

diff --git a/grade/edit/settings/form.php b/grade/edit/settings/form.php
@@ -39,7 +39,7 @@ function definition() {
 
         $mform =& $this->_form;
 
-        $systemcontext = get_context_instance(CONTEXT_SYSTEM);
+        $systemcontext = context_system::instance();
         $can_view_admin_links = false;
         if (has_capability('moodle/grade:manage', $systemcontext)) {
             $can_view_admin_links = true;

diff --git a/grade/edit/settings/index.php b/grade/edit/settings/index.php
@@ -36,7 +36,7 @@
     print_error('nocourseid');
 }
 require_login($course);
-$context = get_context_instance(CONTEXT_COURSE, $course->id);
+$context = context_course::instance($course->id);
 
 require_capability('moodle/grade:manage', $context);
 

diff --git a/grade/edit/tree/action.php b/grade/edit/tree/action.php
@@ -36,7 +36,7 @@
     print_error('nocourseid');
 }
 require_login($course);
-$context = get_context_instance(CONTEXT_COURSE, $course->id);
+$context = context_course::instance($course->id);
 
 // default return url
 $gpr = new grade_plugin_return();

diff --git a/grade/edit/tree/calculation.php b/grade/edit/tree/calculation.php
@@ -43,7 +43,7 @@
 }
 
 require_login($course);
-$context = get_context_instance(CONTEXT_COURSE, $course->id);
+$context = context_course::instance($course->id);
 require_capability('moodle/grade:manage', $context);
 
 // default return url

diff --git a/grade/edit/tree/category.php b/grade/edit/tree/category.php
@@ -42,7 +42,7 @@
 }
 
 require_login($course);
-$context = get_context_instance(CONTEXT_COURSE, $course->id);
+$context = context_course::instance($course->id);
 require_capability('moodle/grade:manage', $context);
 
 // default return url

diff --git a/grade/edit/tree/grade.php b/grade/edit/tree/grade.php
@@ -50,7 +50,7 @@
 
 $PAGE->set_pagelayout('incourse');
 require_login($course);
-$context = get_context_instance(CONTEXT_COURSE, $course->id);
+$context = context_course::instance($course->id);
 if (!has_capability('moodle/grade:manage', $context)) {
     require_capability('moodle/grade:edit', $context);
 }

diff --git a/grade/edit/tree/grade_form.php b/grade/edit/tree/grade_form.php
@@ -139,7 +139,7 @@ function definition() {
     function definition_after_data() {
         global $CFG, $COURSE, $DB;
 
-        $context = get_context_instance(CONTEXT_COURSE, $COURSE->id);
+        $context = context_course::instance($COURSE->id);
 
         $mform =& $this->_form;
         $grade_item = $this->_customdata['grade_item'];

diff --git a/grade/edit/tree/index.php b/grade/edit/tree/index.php
@@ -47,7 +47,7 @@
 }
 
 require_login($course);
-$context = get_context_instance(CONTEXT_COURSE, $course->id);
+$context = context_course::instance($course->id);
 require_capability('moodle/grade:manage', $context);
 
 // todo $PAGE->requires->js_module() should be used here instead

diff --git a/grade/edit/tree/item.php b/grade/edit/tree/item.php
@@ -43,7 +43,7 @@
 }
 
 require_login($course);
-$context = get_context_instance(CONTEXT_COURSE, $course->id);
+$context = context_course::instance($course->id);
 require_capability('moodle/grade:manage', $context);
 
 // default return url

diff --git a/grade/edit/tree/outcomeitem.php b/grade/edit/tree/outcomeitem.php
@@ -41,7 +41,7 @@
 }
 
 require_login($course);
-$context = get_context_instance(CONTEXT_COURSE, $course->id);
+$context = context_course::instance($course->id);
 require_capability('moodle/grade:manage', $context);
 
 

diff --git a/grade/export/grade_export_form.php b/grade/export/grade_export_form.php
@@ -119,7 +119,7 @@ function definition() {
 
         if ($grade_items = $gseq->items) {
             $needs_multiselect = false;
-            $canviewhidden = has_capability('moodle/grade:viewhidden', get_context_instance(CONTEXT_COURSE, $COURSE->id));
+            $canviewhidden = has_capability('moodle/grade:viewhidden', context_course::instance($COURSE->id));
 
             foreach ($grade_items as $grade_item) {
                 // Is the grade_item hidden? If so, can the user see hidden grade_items?

diff --git a/grade/export/key.php b/grade/export/key.php
@@ -59,7 +59,7 @@
 $key->courseid = $course->id;
 
 require_login($course);
-$context = get_context_instance(CONTEXT_COURSE, $course->id);
+$context = context_course::instance($course->id);
 require_capability('moodle/grade:export', $context);
 
 // extra security check

diff --git a/grade/export/keymanager.php b/grade/export/keymanager.php
@@ -35,7 +35,7 @@
 }
 
 require_login($course);
-$context = get_context_instance(CONTEXT_COURSE, $id);
+$context = context_course::instance($id);
 
 require_capability('moodle/grade:export', $context);
 

diff --git a/grade/export/ods/dump.php b/grade/export/ods/dump.php
@@ -29,7 +29,7 @@
     print_error('gradepubdisable');
 }
 
-$context = get_context_instance(CONTEXT_COURSE, $id);
+$context = context_course::instance($id);
 require_capability('gradeexport/ods:publish', $context);
 
 // use the same page parameters as export.php and append &key=sdhakjsahdksahdkjsahksadjksahdkjsadhksa

diff --git a/grade/export/ods/export.php b/grade/export/ods/export.php
@@ -33,7 +33,7 @@
 }
 
 require_login($course);
-$context = get_context_instance(CONTEXT_COURSE, $id);
+$context = context_course::instance($id);
 
 require_capability('moodle/grade:export', $context);
 require_capability('gradeexport/ods:view', $context);

diff --git a/grade/export/ods/grade_export_ods.php b/grade/export/ods/grade_export_ods.php
@@ -32,7 +32,7 @@ function print_grades() {
 
         $strgrades = get_string('grades');
 
-        $shortname = format_string($this->course->shortname, true, array('context' => get_context_instance(CONTEXT_COURSE, $this->course->id)));
+        $shortname = format_string($this->course->shortname, true, array('context' => context_course::instance($this->course->id)));
 
         // Calculate file name
         $downloadfilename = clean_filename("$shortname $strgrades.ods");