From cdbea7eed1ff577f8d08e80ff67e97db11ffeed4 Mon Sep 17 00:00:00 2001 From: Petr Skoda Date: Sun, 22 Apr 2012 17:41:47 +0200 Subject: [PATCH] MDL-31607 use full course object for require_login() if already available This eliminates 1 db query. --- course/completion.php | 2 +- course/view.php | 2 +- file.php | 2 +- grade/report/grader/preferences.php | 2 +- grade/report/outcomes/index.php | 2 +- mod/assignment/delete.php | 2 +- mod/assignment/submissions.php | 2 +- mod/assignment/type/online/file.php | 2 +- mod/assignment/type/upload/assignment.class.php | 2 +- mod/assignment/type/upload/notes.php | 2 +- mod/assignment/upload.php | 2 +- mod/chat/gui_ajax/index.php | 2 +- mod/chat/gui_basic/index.php | 2 +- mod/chat/gui_header_js/index.php | 2 +- mod/chat/report.php | 2 +- mod/choice/report.php | 2 +- mod/data/edit.php | 2 +- mod/data/export.php | 2 +- mod/data/field.php | 2 +- mod/data/preset.php | 2 +- mod/data/templates.php | 2 +- mod/feedback/analysis.php | 4 ++-- mod/feedback/analysis_course.php | 2 +- mod/feedback/analysis_to_excel.php | 2 +- mod/feedback/complete.php | 4 ++-- mod/feedback/delete_completed.php | 2 +- mod/feedback/delete_item.php | 2 +- mod/feedback/delete_template.php | 2 +- mod/feedback/edit.php | 2 +- mod/feedback/edit_item.php | 2 +- mod/feedback/export.php | 2 +- mod/feedback/import.php | 2 +- mod/feedback/index.php | 2 +- mod/feedback/mapcourse.php | 2 +- mod/feedback/print.php | 2 +- mod/feedback/show_entries.php | 2 +- mod/feedback/show_entries_anonym.php | 2 +- mod/feedback/show_nonrespondents.php | 2 +- mod/feedback/use_templ.php | 2 +- mod/feedback/view.php | 4 ++-- mod/forum/subscribe.php | 2 +- mod/forum/subscribers.php | 2 +- mod/glossary/deleteentry.php | 2 +- mod/glossary/editcategories.php | 2 +- mod/glossary/export.php | 2 +- mod/glossary/import.php | 2 +- mod/glossary/view.php | 2 +- mod/lesson/importppt.php | 2 +- mod/quiz/comment.php | 2 +- mod/quiz/index.php | 2 +- mod/quiz/lib.php | 2 +- mod/quiz/reviewquestion.php | 2 +- mod/quiz/startattempt.php | 2 +- mod/quiz/view.php | 2 +- mod/scorm/api.php | 2 +- mod/scorm/datamodel.php | 2 +- mod/scorm/grade.php | 2 +- mod/scorm/loadSCO.php | 2 +- mod/scorm/player.php | 2 +- mod/scorm/prereqs.php | 2 +- mod/scorm/report.php | 2 +- mod/scorm/userreport.php | 2 +- mod/scorm/view.php | 2 +- mod/survey/download.php | 2 +- mod/survey/graph.php | 2 +- mod/survey/report.php | 2 +- mod/survey/save.php | 2 +- mod/survey/view.php | 2 +- mod/wiki/admin.php | 2 +- mod/wiki/comments.php | 2 +- mod/wiki/create.php | 2 +- mod/wiki/diff.php | 2 +- mod/wiki/editcomments.php | 2 +- mod/wiki/history.php | 2 +- mod/wiki/index.php | 2 +- mod/wiki/instancecomments.php | 2 +- mod/wiki/lock.php | 2 +- mod/wiki/map.php | 2 +- mod/wiki/overridelocks.php | 2 +- mod/wiki/prettyview.php | 2 +- mod/wiki/restoreversion.php | 2 +- mod/wiki/viewversion.php | 2 +- tag/coursetags_edit.php | 2 +- user/addnote.php | 2 +- user/groupaddnote.php | 2 +- 85 files changed, 88 insertions(+), 88 deletions(-) diff --git a/course/completion.php b/course/completion.php index e6ffef893e9..2bd3ed9ee2c 100644 --- a/course/completion.php +++ b/course/completion.php @@ -52,7 +52,7 @@ if ($id) { // editing course 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 index 49bbbe87c92..bfb377ee10a 100644 --- 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 index 55854897c5f..52983dee1f8 100644 --- a/file.php +++ b/file.php @@ -71,7 +71,7 @@ if ($course->legacyfiles != 2) { } 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 index 0bac965cb84..b4a7bf0f768 100644 --- a/grade/report/grader/preferences.php +++ b/grade/report/grader/preferences.php @@ -38,7 +38,7 @@ if (!$course = $DB->get_record('course', array('id' => $courseid))) { 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 index ab49694cdcf..32068f4508a 100644 --- a/grade/report/outcomes/index.php +++ b/grade/report/outcomes/index.php @@ -34,7 +34,7 @@ if (!$course = $DB->get_record('course', array('id' => $courseid))) { 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 index de27dd68784..c5cbea76b6c 100644 --- a/mod/assignment/delete.php +++ b/mod/assignment/delete.php @@ -34,7 +34,7 @@ if ($id) { } $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 index 23584656c64..ac6961c506a 100644 --- a/mod/assignment/submissions.php +++ b/mod/assignment/submissions.php @@ -40,7 +40,7 @@ if ($mode !== 'all') { $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 index c7164f298b1..f5346ece263 100644 --- a/mod/assignment/type/online/file.php +++ b/mod/assignment/type/online/file.php @@ -25,7 +25,7 @@ if (! $user = $DB->get_record("user", array("id"=>$userid))) { 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 index 0b537d5adb4..4f1f5672540 100644 --- a/mod/assignment/type/upload/assignment.class.php +++ b/mod/assignment/type/upload/assignment.class.php @@ -842,7 +842,7 @@ class assignment_upload extends assignment_base { $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 index 17b5760937b..cd549188a71 100644 --- a/mod/assignment/type/upload/notes.php +++ b/mod/assignment/type/upload/notes.php @@ -34,7 +34,7 @@ if (! $user = $DB->get_record('user', array('id'=>$userid))) { 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 index c8843499dbd..acaaa3b1222 100644 --- a/mod/assignment/upload.php +++ b/mod/assignment/upload.php @@ -34,7 +34,7 @@ if ($id) { } $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 index 99dc589fb0b..6955693a6c1 100644 --- a/mod/chat/gui_ajax/index.php +++ b/mod/chat/gui_ajax/index.php @@ -17,7 +17,7 @@ $course = $DB->get_record('course', array('id'=>$chat->course), '*', MUST_EXIST) $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 index 56542148106..57699cb8584 100644 --- a/mod/chat/gui_basic/index.php +++ b/mod/chat/gui_basic/index.php @@ -41,7 +41,7 @@ if (!$cm = get_coursemodule_from_instance('chat', $chat->id, $course->id)) { } $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 index 43d0f0b56d4..0d3555f570c 100644 --- a/mod/chat/gui_header_js/index.php +++ b/mod/chat/gui_header_js/index.php @@ -26,7 +26,7 @@ if (!$cm = get_coursemodule_from_instance('chat', $chat->id, $course->id)) { $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 index 0c1da708934..db22c83640e 100644 --- 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 index 14973764646..b1723dd2620 100644 --- 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 index ac2e702a0b5..e90727d68ef 100644 --- a/mod/data/edit.php +++ b/mod/data/edit.php @@ -68,7 +68,7 @@ if ($id) { } } -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 index e865858c3ec..3040ef66424 100644 --- a/mod/data/export.php +++ b/mod/data/export.php @@ -53,7 +53,7 @@ if (! $context = get_context_instance(CONTEXT_MODULE, $cm->id)) { 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 index 01ec6dfdc9f..db5eb05a56b 100644 --- a/mod/data/field.php +++ b/mod/data/field.php @@ -86,7 +86,7 @@ if ($id) { } } -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 index 86cc0668c40..26f39686334 100644 --- a/mod/data/preset.php +++ b/mod/data/preset.php @@ -45,7 +45,7 @@ if ($id) { $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 index 5e321e792ef..404f28d2553 100644 --- a/mod/data/templates.php +++ b/mod/data/templates.php @@ -64,7 +64,7 @@ if ($id) { } } -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 index da86ecf7f4a..76a590174ed 100644 --- a/mod/feedback/analysis.php +++ b/mod/feedback/analysis.php @@ -53,9 +53,9 @@ if (!$context = get_context_instance(CONTEXT_MODULE, $cm->id)) { } 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 index 9378c720224..b0ab0dc57e2 100644 --- a/mod/feedback/analysis_course.php +++ b/mod/feedback/analysis_course.php @@ -72,7 +72,7 @@ if (!$context = get_context_instance(CONTEXT_MODULE, $cm->id)) { 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 index 089bc9d601f..d6320efc0f6 100644 --- a/mod/feedback/analysis_to_excel.php +++ b/mod/feedback/analysis_to_excel.php @@ -55,7 +55,7 @@ if (!$context = get_context_instance(CONTEXT_MODULE, $cm->id)) { 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 index 1ccf71ea280..7fee6412d83 100644 --- a/mod/feedback/complete.php +++ b/mod/feedback/complete.php @@ -114,9 +114,9 @@ if ($course->id == SITEID AND !has_capability('mod/feedback:edititems', $context 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 index a571b2a38ea..b2362b04287 100644 --- a/mod/feedback/delete_completed.php +++ b/mod/feedback/delete_completed.php @@ -54,7 +54,7 @@ if (!$context = get_context_instance(CONTEXT_MODULE, $cm->id)) { 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 index cbd36bfe30e..31cc3c0faa9 100644 --- a/mod/feedback/delete_item.php +++ b/mod/feedback/delete_item.php @@ -47,7 +47,7 @@ if (!$context = get_context_instance(CONTEXT_MODULE, $cm->id)) { 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 index 2d36e82a1af..d710b2b064a 100644 --- a/mod/feedback/delete_template.php +++ b/mod/feedback/delete_template.php @@ -71,7 +71,7 @@ if (!$context = get_context_instance(CONTEXT_MODULE, $cm->id)) { 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 index 67b7b6da408..ce0e245a4af 100644 --- a/mod/feedback/edit.php +++ b/mod/feedback/edit.php @@ -61,7 +61,7 @@ if (!$context = get_context_instance(CONTEXT_MODULE, $cm->id)) { 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 index 28bd0c0300c..5879d61073b 100644 --- a/mod/feedback/edit_item.php +++ b/mod/feedback/edit_item.php @@ -71,7 +71,7 @@ if (!$context = get_context_instance(CONTEXT_MODULE, $cm->id)) { 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 index 705db01aad1..a7a080f4c24 100644 --- a/mod/feedback/export.php +++ b/mod/feedback/export.php @@ -51,7 +51,7 @@ if (!$context = get_context_instance(CONTEXT_MODULE, $cm->id)) { 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 index 896ccd86e50..212e6cce1a2 100644 --- a/mod/feedback/import.php +++ b/mod/feedback/import.php @@ -56,7 +56,7 @@ if (!$context = get_context_instance(CONTEXT_MODULE, $cm->id)) { 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 index 860a196a08f..d48325784a4 100644 --- a/mod/feedback/index.php +++ b/mod/feedback/index.php @@ -39,7 +39,7 @@ if (!$context = get_context_instance(CONTEXT_COURSE, $course->id)) { 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 index 3708b1a567d..8014ca7d7db 100644 --- a/mod/feedback/mapcourse.php +++ b/mod/feedback/mapcourse.php @@ -65,7 +65,7 @@ if (!$context = get_context_instance(CONTEXT_MODULE, $cm->id)) { 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 index db6bca737db..7f63d9ca735 100644 --- a/mod/feedback/print.php +++ b/mod/feedback/print.php @@ -45,7 +45,7 @@ if (!$context = get_context_instance(CONTEXT_MODULE, $cm->id)) { 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 index 00c3d0b9090..fba8c0e1082 100644 --- a/mod/feedback/show_entries.php +++ b/mod/feedback/show_entries.php @@ -65,7 +65,7 @@ if (!$context = get_context_instance(CONTEXT_MODULE, $cm->id)) { 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 index 288eae4ab6d..1a76475b59b 100644 --- a/mod/feedback/show_entries_anonym.php +++ b/mod/feedback/show_entries_anonym.php @@ -56,7 +56,7 @@ if (!$context = get_context_instance(CONTEXT_MODULE, $cm->id)) { 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 index 63b780211e1..de5d0c70281 100644 --- a/mod/feedback/show_nonrespondents.php +++ b/mod/feedback/show_nonrespondents.php @@ -74,7 +74,7 @@ if (!$coursecontext = get_context_instance(CONTEXT_COURSE, $course->id)) { 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 index 0e27313521f..ed5bc812d49 100644 --- a/mod/feedback/use_templ.php +++ b/mod/feedback/use_templ.php @@ -56,7 +56,7 @@ if (!$context = get_context_instance(CONTEXT_MODULE, $cm->id)) { 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 index 4997a61ddaa..aa01dd9b5d3 100644 --- a/mod/feedback/view.php +++ b/mod/feedback/view.php @@ -76,9 +76,9 @@ if ($course->id == SITEID AND !has_capability('mod/feedback:edititems', $context 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 index f722456f943..9066c8eb0a2 100644 --- a/mod/forum/subscribe.php +++ b/mod/forum/subscribe.php @@ -78,7 +78,7 @@ if ($groupmode && !forum_is_subscribed($user->id, $forum) && !has_capability('mo } } -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 index 086ed3afebb..e10e958c530 100644 --- a/mod/forum/subscribers.php +++ b/mod/forum/subscribers.php @@ -45,7 +45,7 @@ if (! $cm = get_coursemodule_from_instance('forum', $forum->id, $course->id)) { $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 index e02f2917583..a1a928bdcba 100644 --- a/mod/glossary/deleteentry.php +++ b/mod/glossary/deleteentry.php @@ -39,7 +39,7 @@ if (! $entry = $DB->get_record("glossary_entries", array("id"=>$entry))) { 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); diff --git a/mod/glossary/editcategories.php b/mod/glossary/editcategories.php index 6a12d4d9d00..963865a9deb 100644 --- a/mod/glossary/editcategories.php +++ b/mod/glossary/editcategories.php @@ -61,7 +61,7 @@ if ($hook > 0) { } } -require_login($course->id, false, $cm); +require_login($course, false, $cm); $context = get_context_instance(CONTEXT_MODULE, $cm->id); require_capability('mod/glossary:managecategories', $context); diff --git a/mod/glossary/export.php b/mod/glossary/export.php index 586b35094bc..204a91510d4 100644 --- a/mod/glossary/export.php +++ b/mod/glossary/export.php @@ -31,7 +31,7 @@ if (! $glossary = $DB->get_record("glossary", array("id"=>$cm->instance))) { print_error('invalidid', 'glossary'); } -require_login($course->id, false, $cm); +require_login($course, false, $cm); $context = get_context_instance(CONTEXT_MODULE, $cm->id); require_capability('mod/glossary:export', $context); diff --git a/mod/glossary/import.php b/mod/glossary/import.php index 1b12c6bac67..cc411dd9215 100644 --- a/mod/glossary/import.php +++ b/mod/glossary/import.php @@ -31,7 +31,7 @@ if (! $glossary = $DB->get_record("glossary", array("id"=>$cm->instance))) { print_error('invalidid', 'glossary'); } -require_login($course->id, false, $cm); +require_login($course, false, $cm); $context = get_context_instance(CONTEXT_MODULE, $cm->id); require_capability('mod/glossary:import', $context); diff --git a/mod/glossary/view.php b/mod/glossary/view.php index 369885384be..c580d6d22d2 100644 --- a/mod/glossary/view.php +++ b/mod/glossary/view.php @@ -118,7 +118,7 @@ if ( $show ) { } /// Processing standard security processes if ($course->id != SITEID) { - require_login($course->id); + require_login($course); } if (!$cm->visible and !has_capability('moodle/course:viewhiddenactivities', $context)) { echo $OUTPUT->header(); diff --git a/mod/lesson/importppt.php b/mod/lesson/importppt.php index 243ff3de324..84bd61b08ee 100644 --- a/mod/lesson/importppt.php +++ b/mod/lesson/importppt.php @@ -52,7 +52,7 @@ $modname = 'lesson'; $mod = $cm; require_login($course, false, $cm); -require_login($course->id, false, $cm); +require_login($course, false, $cm); $context = get_context_instance(CONTEXT_MODULE, $cm->id); require_capability('mod/lesson:edit', $context); diff --git a/mod/quiz/comment.php b/mod/quiz/comment.php index 4736946ed26..1d51ade4ffd 100644 --- a/mod/quiz/comment.php +++ b/mod/quiz/comment.php @@ -40,7 +40,7 @@ if (!$attemptobj->is_finished()) { } // Check login and permissions. -require_login($attemptobj->get_courseid(), false, $attemptobj->get_cm()); +require_login($attemptobj->get_course(), false, $attemptobj->get_cm()); $attemptobj->require_capability('mod/quiz:grade'); // Log this action. diff --git a/mod/quiz/index.php b/mod/quiz/index.php index 926fa2e0516..6b59c397cfe 100644 --- a/mod/quiz/index.php +++ b/mod/quiz/index.php @@ -33,7 +33,7 @@ if (!$course = $DB->get_record('course', array('id' => $id))) { print_error('invalidcourseid'); } $coursecontext = get_context_instance(CONTEXT_COURSE, $id); -require_login($course->id); +require_login($course); $PAGE->set_pagelayout('incourse'); add_to_log($course->id, "quiz", "view all", "index.php?id=$course->id", ""); diff --git a/mod/quiz/lib.php b/mod/quiz/lib.php index 8720e253183..4f0bc18e666 100644 --- a/mod/quiz/lib.php +++ b/mod/quiz/lib.php @@ -1712,7 +1712,7 @@ function mod_quiz_question_pluginfile($course, $context, $component, require_once($CFG->dirroot . '/mod/quiz/locallib.php'); $attemptobj = quiz_attempt::create_from_usage_id($qubaid); - require_login($attemptobj->get_courseid(), false, $attemptobj->get_cm()); + require_login($attemptobj->get_course(), false, $attemptobj->get_cm()); if ($attemptobj->is_own_attempt() && !$attemptobj->is_finished()) { // In the middle of an attempt. diff --git a/mod/quiz/reviewquestion.php b/mod/quiz/reviewquestion.php index 0e3e68df2f3..5751216d591 100644 --- a/mod/quiz/reviewquestion.php +++ b/mod/quiz/reviewquestion.php @@ -43,7 +43,7 @@ $PAGE->set_url($currenturl); $attemptobj = quiz_attempt::create($attemptid); // Check login. -require_login($attemptobj->get_courseid(), false, $attemptobj->get_cm()); +require_login($attemptobj->get_course(), false, $attemptobj->get_cm()); $attemptobj->check_review_capability(); $accessmanager = $attemptobj->get_access_manager(time()); diff --git a/mod/quiz/startattempt.php b/mod/quiz/startattempt.php index 57321937c44..44636d1d3e0 100644 --- a/mod/quiz/startattempt.php +++ b/mod/quiz/startattempt.php @@ -47,7 +47,7 @@ $quizobj = quiz::create($cm->instance, $USER->id); $PAGE->set_url($quizobj->view_url()); // Check login and sesskey. -require_login($quizobj->get_courseid(), false, $quizobj->get_cm()); +require_login($quizobj->get_course(), false, $quizobj->get_cm()); require_sesskey(); // if no questions have been set up yet redirect to edit.php or display an error. diff --git a/mod/quiz/view.php b/mod/quiz/view.php index f21f3d9ee5e..933f6620024 100644 --- a/mod/quiz/view.php +++ b/mod/quiz/view.php @@ -53,7 +53,7 @@ if ($id) { } // Check login and get context. -require_login($course->id, false, $cm); +require_login($course, false, $cm); $context = get_context_instance(CONTEXT_MODULE, $cm->id); require_capability('mod/quiz:view', $context); diff --git a/mod/scorm/api.php b/mod/scorm/api.php index 1acc5ef0a46..a23cfb136bf 100644 --- a/mod/scorm/api.php +++ b/mod/scorm/api.php @@ -56,7 +56,7 @@ if (!empty($id)) { $PAGE->set_url('/mod/scorm/api.php', array('scoid'=>$scoid, 'id'=>$cm->id)); -require_login($course->id, false, $cm); +require_login($course, false, $cm); if ($usertrack = scorm_get_tracks($scoid, $USER->id, $attempt)) { //according to SCORM 2004 spec(RTE V1, 4.2.8), only cmi.exit==suspend should allow previous datamodel elements on re-launch diff --git a/mod/scorm/datamodel.php b/mod/scorm/datamodel.php index 16a819aea58..2e8b94fddb5 100644 --- a/mod/scorm/datamodel.php +++ b/mod/scorm/datamodel.php @@ -48,7 +48,7 @@ if (!empty($id)) { $PAGE->set_url('/mod/scorm/datamodel.php', array('scoid'=>$scoid, 'attempt'=>$attempt, 'id'=>$cm->id)); -require_login($course->id, false, $cm); +require_login($course, false, $cm); if (confirm_sesskey() && (!empty($scoid))) { $result = true; diff --git a/mod/scorm/grade.php b/mod/scorm/grade.php index 26c1f06fd5d..227a208f2ea 100644 --- a/mod/scorm/grade.php +++ b/mod/scorm/grade.php @@ -39,7 +39,7 @@ if (! $course = $DB->get_record('course', array('id'=> $scorm->course))) { print_error('coursemisconf'); } -require_login($course->id, false, $cm); +require_login($course, false, $cm); if (has_capability('mod/scorm:viewreport', get_context_instance(CONTEXT_MODULE, $cm->id))) { redirect('report.php?id='.$cm->id); diff --git a/mod/scorm/loadSCO.php b/mod/scorm/loadSCO.php index ea2a6b8ca43..90fd45bfed1 100644 --- a/mod/scorm/loadSCO.php +++ b/mod/scorm/loadSCO.php @@ -49,7 +49,7 @@ if (!empty($id)) { $PAGE->set_url('/mod/scorm/loadSCO.php', array('scoid'=>$scoid, 'id'=>$cm->id)); -require_login($course->id, false, $cm); +require_login($course, false, $cm); //check if scorm closed $timenow = time(); diff --git a/mod/scorm/player.php b/mod/scorm/player.php index 7c73db9cbe9..e39a61902b2 100644 --- a/mod/scorm/player.php +++ b/mod/scorm/player.php @@ -86,7 +86,7 @@ if (!empty($forcejs)) { $PAGE->add_body_class('forcejavascript'); } -require_login($course->id, false, $cm); +require_login($course, false, $cm); $strscorms = get_string('modulenameplural', 'scorm'); $strscorm = get_string('modulename', 'scorm'); diff --git a/mod/scorm/prereqs.php b/mod/scorm/prereqs.php index 341248c4bd4..3909735bfc2 100644 --- a/mod/scorm/prereqs.php +++ b/mod/scorm/prereqs.php @@ -52,7 +52,7 @@ if (!empty($id)) { $PAGE->set_url('/mod/scorm/prereqs.php', array('scoid'=>$scoid, 'attempt'=>$attempt, 'id'=>$cm->id)); -require_login($course->id, false, $cm); +require_login($course, false, $cm); $scorm->version = strtolower(clean_param($scorm->version, PARAM_SAFEDIR)); // Just to be safe if (!file_exists($CFG->dirroot.'/mod/scorm/datamodels/'.$scorm->version.'lib.php')) { diff --git a/mod/scorm/report.php b/mod/scorm/report.php index 11a7efa9e06..78ea4a44f9f 100644 --- a/mod/scorm/report.php +++ b/mod/scorm/report.php @@ -51,7 +51,7 @@ $url->param('mode', $mode); $PAGE->set_url($url); -require_login($course->id, false, $cm); +require_login($course, false, $cm); require_capability('mod/scorm:viewreport', $contextmodule); diff --git a/mod/scorm/userreport.php b/mod/scorm/userreport.php index 06dcb37f738..3633b0411c0 100644 --- a/mod/scorm/userreport.php +++ b/mod/scorm/userreport.php @@ -63,7 +63,7 @@ $PAGE->set_url($url); //END of url setting + data buildup // checking login +logging +getting context -require_login($course->id, false, $cm); +require_login($course, false, $cm); $contextmodule = get_context_instance(CONTEXT_MODULE, $cm->id); require_capability('mod/scorm:viewreport', $contextmodule); diff --git a/mod/scorm/view.php b/mod/scorm/view.php index 787b8b1f1e1..2e518f21bfb 100644 --- a/mod/scorm/view.php +++ b/mod/scorm/view.php @@ -56,7 +56,7 @@ if (!empty($forcejs)) { $PAGE->add_body_class('forcejavascript'); } -require_login($course->id, false, $cm); +require_login($course, false, $cm); $context = get_context_instance(CONTEXT_COURSE, $course->id); $contextmodule = get_context_instance(CONTEXT_MODULE, $cm->id); diff --git a/mod/survey/download.php b/mod/survey/download.php index eec48d674cc..562e84e2040 100644 --- a/mod/survey/download.php +++ b/mod/survey/download.php @@ -44,7 +44,7 @@ $context = get_context_instance(CONTEXT_MODULE, $cm->id); $PAGE->set_url('/mod/survey/download.php', array('id'=>$id, 'type'=>$type, 'group'=>$group)); -require_login($course->id, false, $cm); +require_login($course, false, $cm); require_capability('mod/survey:download', $context) ; if (! $survey = $DB->get_record("survey", array("id"=>$cm->instance))) { diff --git a/mod/survey/graph.php b/mod/survey/graph.php index cd92e214cd2..14dabc107fd 100644 --- a/mod/survey/graph.php +++ b/mod/survey/graph.php @@ -36,7 +36,7 @@ } } - require_login($course->id, false, $cm); + require_login($course, false, $cm); $groupmode = groups_get_activity_groupmode($cm); // Groups are being used $context = get_context_instance(CONTEXT_MODULE, $cm->id); diff --git a/mod/survey/report.php b/mod/survey/report.php index f40d3d48304..a5a641d822b 100644 --- a/mod/survey/report.php +++ b/mod/survey/report.php @@ -61,7 +61,7 @@ } $PAGE->set_url($url); - require_login($course->id, false, $cm); + require_login($course, false, $cm); $context = get_context_instance(CONTEXT_MODULE, $cm->id); diff --git a/mod/survey/save.php b/mod/survey/save.php index 1ed6e79f4ea..7fde436276e 100644 --- a/mod/survey/save.php +++ b/mod/survey/save.php @@ -45,7 +45,7 @@ } $PAGE->set_url('/mod/survey/save.php', array('id'=>$id)); - require_login($course->id, false, $cm); + require_login($course, false, $cm); $context = get_context_instance(CONTEXT_MODULE, $cm->id); require_capability('mod/survey:participate', $context); diff --git a/mod/survey/view.php b/mod/survey/view.php index 34e2f689754..6eb955128b0 100644 --- a/mod/survey/view.php +++ b/mod/survey/view.php @@ -37,7 +37,7 @@ } $PAGE->set_url('/mod/survey/view.php', array('id'=>$id)); - require_login($course->id, false, $cm); + require_login($course, false, $cm); $context = get_context_instance(CONTEXT_MODULE, $cm->id); require_capability('mod/survey:participate', $context); diff --git a/mod/wiki/admin.php b/mod/wiki/admin.php index b2b720b1d76..567b7a62c17 100644 --- a/mod/wiki/admin.php +++ b/mod/wiki/admin.php @@ -53,7 +53,7 @@ if (!$wiki = wiki_get_wiki($subwiki->wikiid)) { print_error('incorrectwikiid', 'wiki'); } -require_login($course->id, true, $cm); +require_login($course, true, $cm); $context = get_context_instance(CONTEXT_MODULE, $cm->id); diff --git a/mod/wiki/comments.php b/mod/wiki/comments.php index 3032dba5080..f10fccb6e5d 100644 --- a/mod/wiki/comments.php +++ b/mod/wiki/comments.php @@ -57,7 +57,7 @@ if (!$cm = get_coursemodule_from_instance('wiki', $wiki->id)) { $course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST); -require_login($course->id, true, $cm); +require_login($course, true, $cm); add_to_log($course->id, 'wiki', 'comments', "comments.php?pageid=".$pageid, $pageid, $cm->id); diff --git a/mod/wiki/create.php b/mod/wiki/create.php index 0931b54b9fb..a61deaf9038 100644 --- a/mod/wiki/create.php +++ b/mod/wiki/create.php @@ -64,7 +64,7 @@ if (!$cm = get_coursemodule_from_instance('wiki', $wiki->id)) { $course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST); -require_login($course->id, true, $cm); +require_login($course, true, $cm); $wikipage = new page_wiki_create($wiki, $subwiki, $cm); diff --git a/mod/wiki/diff.php b/mod/wiki/diff.php index c5eed893598..cdd354c0d67 100644 --- a/mod/wiki/diff.php +++ b/mod/wiki/diff.php @@ -66,7 +66,7 @@ if ($compare >= $comparewith) { print_error("A page version can only be compared with an older version."); } -require_login($course->id, true, $cm); +require_login($course, true, $cm); $wikipage = new page_wiki_diff($wiki, $subwiki, $cm); diff --git a/mod/wiki/editcomments.php b/mod/wiki/editcomments.php index 88993276077..5f04d17ddf0 100644 --- a/mod/wiki/editcomments.php +++ b/mod/wiki/editcomments.php @@ -52,7 +52,7 @@ $course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST) if (!$wiki = wiki_get_wiki($subwiki->wikiid)) { print_error('incorrectwikiid', 'wiki'); } -require_login($course->id, true, $cm); +require_login($course, true, $cm); $editcomments = new page_wiki_editcomment($wiki, $subwiki, $cm); $comment = new stdClass(); diff --git a/mod/wiki/history.php b/mod/wiki/history.php index 59851b1e2a8..803eeef6a4c 100644 --- a/mod/wiki/history.php +++ b/mod/wiki/history.php @@ -58,7 +58,7 @@ if (!$cm = get_coursemodule_from_instance('wiki', $wiki->id)) { $course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST); -require_login($course->id, true, $cm); +require_login($course, true, $cm); $context = get_context_instance(CONTEXT_MODULE, $cm->id); require_capability('mod/wiki:viewpage', $context); add_to_log($course->id, 'wiki', 'history', "history.php?pageid=".$pageid, $pageid, $cm->id); diff --git a/mod/wiki/index.php b/mod/wiki/index.php index 7f13ee24a4e..3b566836739 100644 --- a/mod/wiki/index.php +++ b/mod/wiki/index.php @@ -41,7 +41,7 @@ if (!$course = $DB->get_record('course', array('id' => $id))) { print_error('invalidcourseid'); } -require_login($course->id, true); +require_login($course, true); $PAGE->set_pagelayout('incourse'); $context = get_context_instance(CONTEXT_COURSE, $course->id); diff --git a/mod/wiki/instancecomments.php b/mod/wiki/instancecomments.php index 4467b171e96..731d6dd5381 100644 --- a/mod/wiki/instancecomments.php +++ b/mod/wiki/instancecomments.php @@ -58,7 +58,7 @@ $course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST) if (!$wiki = wiki_get_wiki($subwiki->wikiid)) { print_error('incorrectwikiid', 'wiki'); } -require_login($course->id, true, $cm); +require_login($course, true, $cm); if ($action == 'add' || $action == 'edit') { //just check sesskey diff --git a/mod/wiki/lock.php b/mod/wiki/lock.php index d82a0f0db1b..10d5fc6b3d0 100644 --- a/mod/wiki/lock.php +++ b/mod/wiki/lock.php @@ -66,7 +66,7 @@ if (!empty($section) && !$sectioncontent = wiki_get_section_page($page, $section print_error('invalidsection', 'wiki'); } -require_login($course->id, false, $cm); +require_login($course, false, $cm); $context = get_context_instance(CONTEXT_MODULE, $cm->id); require_capability('mod/wiki:editpage', $context); diff --git a/mod/wiki/map.php b/mod/wiki/map.php index edd49d1c8b8..b5afd382e5a 100644 --- a/mod/wiki/map.php +++ b/mod/wiki/map.php @@ -53,7 +53,7 @@ if (!$wiki = wiki_get_wiki($subwiki->wikiid)) { print_error('incorrectwikiid', 'wiki'); } -require_login($course->id, true, $cm); +require_login($course, true, $cm); $context = get_context_instance(CONTEXT_MODULE, $cm->id); require_capability('mod/wiki:viewpage', $context); diff --git a/mod/wiki/overridelocks.php b/mod/wiki/overridelocks.php index f725976f3de..f43faf4bc73 100644 --- a/mod/wiki/overridelocks.php +++ b/mod/wiki/overridelocks.php @@ -62,7 +62,7 @@ if (!empty($section) && !$sectioncontent = wiki_get_section_page($page, $section print_error('invalidsection', 'wiki'); } -require_login($course->id, true, $cm); +require_login($course, true, $cm); $context = get_context_instance(CONTEXT_MODULE, $cm->id); require_capability('mod/wiki:overridelock', $context); diff --git a/mod/wiki/prettyview.php b/mod/wiki/prettyview.php index 6556ed76488..ab4a3eecc95 100644 --- a/mod/wiki/prettyview.php +++ b/mod/wiki/prettyview.php @@ -51,7 +51,7 @@ if (!$wiki = wiki_get_wiki($subwiki->wikiid)) { print_error('incorrectwikiid', 'wiki'); } -require_login($course->id, true, $cm); +require_login($course, true, $cm); $context = get_context_instance(CONTEXT_MODULE, $cm->id); require_capability('mod/wiki:viewpage', $context); diff --git a/mod/wiki/restoreversion.php b/mod/wiki/restoreversion.php index eba4e2379f9..d5ad02cbd70 100644 --- a/mod/wiki/restoreversion.php +++ b/mod/wiki/restoreversion.php @@ -58,7 +58,7 @@ if (!$cm = get_coursemodule_from_instance('wiki', $wiki->id)) { $course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST); -require_login($course->id, true, $cm); +require_login($course, true, $cm); if ($confirm) { if (!confirm_sesskey()) { diff --git a/mod/wiki/viewversion.php b/mod/wiki/viewversion.php index fb36789e173..ecdd6504bcc 100644 --- a/mod/wiki/viewversion.php +++ b/mod/wiki/viewversion.php @@ -58,7 +58,7 @@ if (!$cm = get_coursemodule_from_instance('wiki', $wiki->id)) { $course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST); -require_login($course->id, true, $cm); +require_login($course, true, $cm); $wikipage = new page_wiki_viewversion($wiki, $subwiki, $cm); diff --git a/tag/coursetags_edit.php b/tag/coursetags_edit.php index 8bb33b4a74f..8dbc285dffa 100644 --- a/tag/coursetags_edit.php +++ b/tag/coursetags_edit.php @@ -60,7 +60,7 @@ if ($courseid != SITEID) { // Permissions $sitecontext = get_context_instance(CONTEXT_SYSTEM); -require_login($course->id); +require_login($course); $canedit = has_capability('moodle/tag:create', $sitecontext); // Language strings diff --git a/user/addnote.php b/user/addnote.php index 5a0d0a8d9bb..1b899822686 100644 --- a/user/addnote.php +++ b/user/addnote.php @@ -38,7 +38,7 @@ if (! $course = $DB->get_record('course', array('id'=>$id))) { } $context = get_context_instance(CONTEXT_COURSE, $id); -require_login($course->id); +require_login($course); // to create notes the current user needs a capability require_capability('moodle/notes:manage', $context); diff --git a/user/groupaddnote.php b/user/groupaddnote.php index 90f1b3d9d6c..26649da10ba 100644 --- a/user/groupaddnote.php +++ b/user/groupaddnote.php @@ -45,7 +45,7 @@ if (! $course = $DB->get_record('course', array('id'=>$id))) { } $context = get_context_instance(CONTEXT_COURSE, $id); -require_login($course->id); +require_login($course); // to create notes the current user needs a capability require_capability('moodle/notes:manage', $context);