MDL-31607 use full course object for require_login() if already avail…

…able This eliminates 1 db query.
ingoj · Apr 22, 2012 · cdbea7e · cdbea7e
1 parent ead4f18
commit cdbea7e
Show file tree

Hide file tree

Showing 85 changed files with 88 additions and 88 deletions.
diff --git a/course/completion.php b/course/completion.php
@@ -52,7 +52,7 @@
     if (!$course = $DB->get_record('course', array('id'=>$id))) {
         print_error('invalidcourseid');
     }
-    require_login($course->id);
+    require_login($course);
     require_capability('moodle/course:update', get_context_instance(CONTEXT_COURSE, $course->id));
 
 } else {

diff --git a/course/view.php b/course/view.php
@@ -60,7 +60,7 @@
         if (is_array($aroles) && isset($aroles[$switchrole])) {
             role_switch($switchrole, $context);
             // Double check that this role is allowed here
-            require_login($course->id);
+            require_login($course);
         }
         // reset course page state - this prevents some weird problems ;-)
         $USER->activitycopy = false;

diff --git a/file.php b/file.php
@@ -71,7 +71,7 @@
 }
 
 if ($course->id != SITEID) {
-    require_login($course->id, true, null, false);
+    require_login($course, true, null, false);
 
 } else if ($CFG->forcelogin) {
     if (!empty($CFG->sitepolicy)

diff --git a/grade/report/grader/preferences.php b/grade/report/grader/preferences.php
@@ -38,7 +38,7 @@
     print_error('nocourseid');
 }
 
-require_login($course->id);
+require_login($course);
 
 $context = get_context_instance(CONTEXT_COURSE, $course->id);
 $systemcontext = get_context_instance(CONTEXT_SYSTEM);

diff --git a/grade/report/outcomes/index.php b/grade/report/outcomes/index.php
@@ -34,7 +34,7 @@
     print_error('nocourseid');
 }
 
-require_login($course->id);
+require_login($course);
 $context = get_context_instance(CONTEXT_COURSE, $course->id);
 
 require_capability('gradereport/outcomes:view', $context);

diff --git a/mod/assignment/delete.php b/mod/assignment/delete.php
@@ -34,7 +34,7 @@
 }
 
 $PAGE->set_url($url);
-require_login($course->id, false, $cm);
+require_login($course, false, $cm);
 
 /// Load up the required assignment code
 require($CFG->dirroot.'/mod/assignment/type/'.$assignment->assignmenttype.'/assignment.class.php');

diff --git a/mod/assignment/submissions.php b/mod/assignment/submissions.php
@@ -40,7 +40,7 @@
     $url->param('mode', $mode);
 }
 $PAGE->set_url($url);
-require_login($course->id, false, $cm);
+require_login($course, false, $cm);
 
 require_capability('mod/assignment:grade', get_context_instance(CONTEXT_MODULE, $cm->id));
 

diff --git a/mod/assignment/type/online/file.php b/mod/assignment/type/online/file.php
@@ -25,7 +25,7 @@
     print_error('usermisconf', 'assignment');
 }
 
-require_login($course->id, false, $cm);
+require_login($course, false, $cm);
 
 $context = get_context_instance(CONTEXT_MODULE, $cm->id);
 if (($USER->id != $user->id) && !has_capability('mod/assignment:grade', $context)) {

diff --git a/mod/assignment/type/upload/assignment.class.php b/mod/assignment/type/upload/assignment.class.php
@@ -842,7 +842,7 @@ function delete_file() {
         $mode     = optional_param('mode', '', PARAM_ALPHA);
         $offset   = optional_param('offset', 0, PARAM_INT);
 
-        require_login($this->course->id, false, $this->cm);
+        require_login($this->course, false, $this->cm);
 
         if (empty($mode)) {
             $urlreturn = 'view.php';

diff --git a/mod/assignment/type/upload/notes.php b/mod/assignment/type/upload/notes.php
@@ -34,7 +34,7 @@
     print_error("invaliduserid");
 }
 
-require_login($course->id, false, $cm);
+require_login($course, false, $cm);
 
 if (!has_capability('mod/assignment:grade', get_context_instance(CONTEXT_MODULE, $cm->id))) {
     print_error('cannotviewassignment', 'assignment');

diff --git a/mod/assignment/upload.php b/mod/assignment/upload.php
@@ -34,7 +34,7 @@
 }
 
 $PAGE->set_url($url);
-require_login($course->id, false, $cm);
+require_login($course, false, $cm);
 
 /// Load up the required assignment code
 require_once($CFG->dirroot.'/mod/assignment/type/'.$assignment->assignmenttype.'/assignment.class.php');

diff --git a/mod/chat/gui_ajax/index.php b/mod/chat/gui_ajax/index.php
@@ -17,7 +17,7 @@
 $cm = get_coursemodule_from_instance('chat', $chat->id, $course->id, false, MUST_EXIST);
 
 $context = get_context_instance(CONTEXT_MODULE, $cm->id);
-require_login($course->id, false, $cm);
+require_login($course, false, $cm);
 require_capability('mod/chat:chat', $context);
 
 /// Check to see if groups are being used here

diff --git a/mod/chat/gui_basic/index.php b/mod/chat/gui_basic/index.php
@@ -41,7 +41,7 @@
 }
 
 $context = get_context_instance(CONTEXT_MODULE, $cm->id);
-require_login($course->id, false, $cm);
+require_login($course, false, $cm);
 require_capability('mod/chat:chat', $context);
 $PAGE->set_pagelayout('base');
 

diff --git a/mod/chat/gui_header_js/index.php b/mod/chat/gui_header_js/index.php
@@ -26,7 +26,7 @@
 
 $context = get_context_instance(CONTEXT_MODULE, $cm->id);
 
-require_login($course->id, false, $cm);
+require_login($course, false, $cm);
 
 require_capability('mod/chat:chat', $context);
 

diff --git a/mod/chat/report.php b/mod/chat/report.php
@@ -40,7 +40,7 @@
     $context = get_context_instance(CONTEXT_MODULE, $cm->id);
     $PAGE->set_context($context);
 
-    require_login($course->id, false, $cm);
+    require_login($course, false, $cm);
 
     if (empty($chat->studentlogs) && !has_capability('mod/chat:readlog', $context)) {
         notice(get_string('nopermissiontoseethechatlog', 'chat'));

diff --git a/mod/choice/report.php b/mod/choice/report.php
@@ -29,7 +29,7 @@
         print_error("coursemisconf");
     }
 
-    require_login($course->id, false, $cm);
+    require_login($course, false, $cm);
 
     $context = get_context_instance(CONTEXT_MODULE, $cm->id);
 

diff --git a/mod/data/edit.php b/mod/data/edit.php
@@ -68,7 +68,7 @@
     }
 }
 
-require_login($course->id, false, $cm);
+require_login($course, false, $cm);
 
 if (isguestuser()) {
     redirect('view.php?d='.$data->id);

diff --git a/mod/data/export.php b/mod/data/export.php
@@ -53,7 +53,7 @@
     print_error('invalidcontext', '');
 }
 
-require_login($course->id, false, $cm);
+require_login($course, false, $cm);
 require_capability(DATA_CAP_EXPORT, $context);
 
 // get fields for this database

diff --git a/mod/data/field.php b/mod/data/field.php
@@ -86,7 +86,7 @@
     }
 }
 
-require_login($course->id, true, $cm);
+require_login($course, true, $cm);
 
 $context = get_context_instance(CONTEXT_MODULE, $cm->id);
 require_capability('mod/data:managetemplates', $context);

diff --git a/mod/data/preset.php b/mod/data/preset.php
@@ -45,7 +45,7 @@
     $cm = get_coursemodule_from_instance('data', $data->id, $course->id, null, MUST_EXIST);
 }
 $context = get_context_instance(CONTEXT_MODULE, $cm->id, MUST_EXIST);
-require_login($course->id, false, $cm);
+require_login($course, false, $cm);
 require_capability('mod/data:managetemplates', $context);
 $PAGE->set_url(new moodle_url('/mod/data/preset.php', array('d'=>$data->id)));
 $PAGE->set_title(get_string('course') . ': ' . $course->fullname);

diff --git a/mod/data/templates.php b/mod/data/templates.php
@@ -64,7 +64,7 @@
     }
 }
 
-require_login($course->id, false, $cm);
+require_login($course, false, $cm);
 
 $context = get_context_instance(CONTEXT_MODULE, $cm->id);
 require_capability('mod/data:managetemplates', $context);

diff --git a/mod/feedback/analysis.php b/mod/feedback/analysis.php
@@ -53,9 +53,9 @@
 }
 
 if ($course->id == SITEID) {
-    require_login($course->id, true);
+    require_login($course, true);
 } else {
-    require_login($course->id, true, $cm);
+    require_login($course, true, $cm);
 }
 
 //check whether the given courseid exists

diff --git a/mod/feedback/analysis_course.php b/mod/feedback/analysis_course.php
@@ -72,7 +72,7 @@
         print_error('badcontext');
 }
 
-require_login($course->id, true, $cm);
+require_login($course, true, $cm);
 
 if (!($feedback->publish_stats OR has_capability('mod/feedback:viewreports', $context))) {
     print_error('error');

diff --git a/mod/feedback/analysis_to_excel.php b/mod/feedback/analysis_to_excel.php
@@ -55,7 +55,7 @@
         print_error('badcontext');
 }
 
-require_login($course->id, true, $cm);
+require_login($course, true, $cm);
 
 require_capability('mod/feedback:viewreports', $context);
 

diff --git a/mod/feedback/complete.php b/mod/feedback/complete.php
@@ -114,9 +114,9 @@
 
 if ($feedback->anonymous != FEEDBACK_ANONYMOUS_YES) {
     if ($course->id == SITEID) {
-        require_login($course->id, true);
+        require_login($course, true);
     } else {
-        require_login($course->id, true, $cm);
+        require_login($course, true, $cm);
     }
 } else {
     if ($course->id == SITEID) {

diff --git a/mod/feedback/delete_completed.php b/mod/feedback/delete_completed.php
@@ -54,7 +54,7 @@
         print_error('badcontext');
 }
 
-require_login($course->id, true, $cm);
+require_login($course, true, $cm);
 
 require_capability('mod/feedback:deletesubmissions', $context);
 

diff --git a/mod/feedback/delete_item.php b/mod/feedback/delete_item.php
@@ -47,7 +47,7 @@
         print_error('badcontext');
 }
 
-require_login($course->id, true, $cm);
+require_login($course, true, $cm);
 
 require_capability('mod/feedback:edititems', $context);
 

diff --git a/mod/feedback/delete_template.php b/mod/feedback/delete_template.php
@@ -71,7 +71,7 @@
         print_error('badcontext');
 }
 
-require_login($course->id, true, $cm);
+require_login($course, true, $cm);
 
 require_capability('mod/feedback:deletetemplate', $context);
 

diff --git a/mod/feedback/edit.php b/mod/feedback/edit.php
@@ -61,7 +61,7 @@
         print_error('badcontext');
 }
 
-require_login($course->id, true, $cm);
+require_login($course, true, $cm);
 
 require_capability('mod/feedback:edititems', $context);
 

diff --git a/mod/feedback/edit_item.php b/mod/feedback/edit_item.php
@@ -71,7 +71,7 @@
         print_error('badcontext');
 }
 
-require_login($course->id, true, $cm);
+require_login($course, true, $cm);
 
 require_capability('mod/feedback:edititems', $context);
 

diff --git a/mod/feedback/export.php b/mod/feedback/export.php
@@ -51,7 +51,7 @@
         print_error('badcontext');
 }
 
-require_login($course->id, true, $cm);
+require_login($course, true, $cm);
 
 require_capability('mod/feedback:edititems', $context);
 

diff --git a/mod/feedback/import.php b/mod/feedback/import.php
@@ -56,7 +56,7 @@
     print_error('badcontext');
 }
 
-require_login($course->id, true, $cm);
+require_login($course, true, $cm);
 
 require_capability('mod/feedback:edititems', $context);
 

diff --git a/mod/feedback/index.php b/mod/feedback/index.php
@@ -39,7 +39,7 @@
         print_error('badcontext');
 }
 
-require_login($course->id);
+require_login($course);
 $PAGE->set_pagelayout('incourse');
 
 add_to_log($course->id, 'feedback', 'view all', $url->out(false), $course->id);

diff --git a/mod/feedback/mapcourse.php b/mod/feedback/mapcourse.php
@@ -65,7 +65,7 @@
         print_error('badcontext');
 }
 
-require_login($course->id, true, $cm);
+require_login($course, true, $cm);
 
 require_capability('mod/feedback:mapcourse', $context);
 

diff --git a/mod/feedback/print.php b/mod/feedback/print.php
@@ -45,7 +45,7 @@
         print_error('badcontext');
 }
 
-require_login($course->id, true, $cm);
+require_login($course, true, $cm);
 
 require_capability('mod/feedback:view', $context);
 $PAGE->set_pagelayout('embedded');

diff --git a/mod/feedback/show_entries.php b/mod/feedback/show_entries.php
@@ -65,7 +65,7 @@
         print_error('badcontext');
 }
 
-require_login($course->id, true, $cm);
+require_login($course, true, $cm);
 
 if (($formdata = data_submitted()) AND !confirm_sesskey()) {
     print_error('invalidsesskey');

diff --git a/mod/feedback/show_entries_anonym.php b/mod/feedback/show_entries_anonym.php
@@ -56,7 +56,7 @@
         print_error('badcontext');
 }
 
-require_login($course->id, true, $cm);
+require_login($course, true, $cm);
 
 require_capability('mod/feedback:viewreports', $context);
 

diff --git a/mod/feedback/show_nonrespondents.php b/mod/feedback/show_nonrespondents.php
@@ -74,7 +74,7 @@
         print_error('badcontext');
 }
 
-require_login($course->id, true, $cm);
+require_login($course, true, $cm);
 
 if (($formdata = data_submitted()) AND !confirm_sesskey()) {
     print_error('invalidsesskey');

diff --git a/mod/feedback/use_templ.php b/mod/feedback/use_templ.php
@@ -56,7 +56,7 @@
         print_error('badcontext');
 }
 
-require_login($course->id, true, $cm);
+require_login($course, true, $cm);
 
 require_capability('mod/feedback:edititems', $context);
 

diff --git a/mod/feedback/view.php b/mod/feedback/view.php
@@ -76,9 +76,9 @@
 
 if ($feedback->anonymous != FEEDBACK_ANONYMOUS_YES) {
     if ($course->id == SITEID) {
-        require_login($course->id, true);
+        require_login($course, true);
     } else {
-        require_login($course->id, true, $cm);
+        require_login($course, true, $cm);
     }
 } else {
     if ($course->id == SITEID) {

diff --git a/mod/forum/subscribe.php b/mod/forum/subscribe.php
@@ -78,7 +78,7 @@
     }
 }
 
-require_login($course->id, false, $cm);
+require_login($course, false, $cm);
 
 if (is_null($mode) and !is_enrolled($context, $USER, '', true)) {   // Guests and visitors can't subscribe - only enrolled
     $PAGE->set_title($course->shortname);

diff --git a/mod/forum/subscribers.php b/mod/forum/subscribers.php
@@ -45,7 +45,7 @@
     $cm->id = 0;
 }
 
-require_login($course->id, false, $cm);
+require_login($course, false, $cm);
 
 $context = get_context_instance(CONTEXT_MODULE, $cm->id);
 if (!has_capability('mod/forum:viewsubscribers', $context)) {

diff --git a/mod/glossary/deleteentry.php b/mod/glossary/deleteentry.php
@@ -39,7 +39,7 @@
     print_error('invalidentry');
 }
 
-require_login($course->id, false, $cm);
+require_login($course, false, $cm);
 $context = get_context_instance(CONTEXT_MODULE, $cm->id);
 $manageentries = has_capability('mod/glossary:manageentries', $context);