From bf0f06b1beb2bc2f88b0391aeaa656b6b1fbc76f Mon Sep 17 00:00:00 2001 From: Ankit Agarwal Date: Thu, 2 Aug 2012 11:20:48 +0800 Subject: [PATCH] MDL-34471 libraries: Replace all uses of get_context_instance() with respective context_XXXX::instance() method --- auth/fc/auth.php | 2 +- auth/ldap/auth.php | 6 +- auth/ldap/ntlmsso_attempt.php | 2 +- auth/ldap/ntlmsso_finish.php | 2 +- auth/ldap/ntlmsso_magic.php | 2 +- auth/mnet/auth.php | 6 +- auth/shibboleth/index.php | 2 +- comment/index.php | 2 +- .../criteria/completion_criteria_course.php | 4 +- file.php | 2 +- group/assign.php | 2 +- group/autogroup.php | 4 +- group/autogroup_form.php | 2 +- group/delete.php | 2 +- group/externallib.php | 14 +-- group/group.php | 2 +- group/grouping.php | 2 +- group/groupings.php | 2 +- group/import.php | 4 +- group/index.php | 2 +- group/lib.php | 22 ++-- group/members.php | 2 +- group/overview.php | 2 +- help.php | 2 +- index.php | 6 +- iplookup/index.php | 4 +- message/defaultoutputs.php | 4 +- message/edit.php | 6 +- message/externallib.php | 2 +- message/index.php | 4 +- message/lib.php | 8 +- message/search_advanced.html | 2 +- mod/forum/discuss.php | 8 +- mod/forum/index.php | 12 +- mod/forum/lib.php | 118 +++++++++--------- mod/forum/locallib.php | 4 +- mod/forum/post.php | 20 +-- mod/forum/post_form.php | 2 +- mod/forum/search.php | 4 +- mod/forum/subscribe.php | 2 +- mod/forum/subscribers.php | 2 +- mod/forum/unsubscribeall.php | 2 +- mod/forum/user.php | 8 +- mod/forum/view.php | 4 +- mod/resource/lib.php | 4 +- mod/resource/locallib.php | 6 +- mod/resource/mod_form.php | 2 +- mod/resource/view.php | 2 +- my/index.php | 8 +- my/indexsys.php | 2 +- my/lib.php | 8 +- notes/delete.php | 4 +- notes/edit.php | 4 +- notes/externallib.php | 2 +- notes/index.php | 16 +-- notes/lib.php | 4 +- 56 files changed, 189 insertions(+), 189 deletions(-) diff --git a/auth/fc/auth.php b/auth/fc/auth.php index 3717dc4bf7f98..73e803d3e308e 100644 --- a/auth/fc/auth.php +++ b/auth/fc/auth.php @@ -180,7 +180,7 @@ function sync_roles($user) { if ($roles = get_archetype_roles('coursecreator')) { $creatorrole = array_shift($roles); // We can only use one, let's use the first one - $systemcontext = get_context_instance(CONTEXT_SYSTEM); + $systemcontext = context_system::instance(); if ($iscreator) { // Following calls will not create duplicates role_assign($creatorrole->id, $user->id, $systemcontext->id, 'auth_fc'); diff --git a/auth/ldap/auth.php b/auth/ldap/auth.php index bc90ebc10e0bd..53f867faac97c 100644 --- a/auth/ldap/auth.php +++ b/auth/ldap/auth.php @@ -771,7 +771,7 @@ function sync_users($do_updates=true) { if (!empty($users)) { print_string('userentriestoupdate', 'auth_ldap', count($users)); - $sitecontext = get_context_instance(CONTEXT_SYSTEM); + $sitecontext = context_system::instance(); if (!empty($this->config->creators) and !empty($this->config->memberattribute) and $roles = get_archetype_roles('coursecreator')) { $creatorrole = array_shift($roles); // We can only use one, let's use the first one @@ -820,7 +820,7 @@ function sync_users($do_updates=true) { if (!empty($add_users)) { print_string('userentriestoadd', 'auth_ldap', count($add_users)); - $sitecontext = get_context_instance(CONTEXT_SYSTEM); + $sitecontext = context_system::instance(); if (!empty($this->config->creators) and !empty($this->config->memberattribute) and $roles = get_archetype_roles('coursecreator')) { $creatorrole = array_shift($roles); // We can only use one, let's use the first one @@ -1649,7 +1649,7 @@ function sync_roles($user) { if ($roles = get_archetype_roles('coursecreator')) { $creatorrole = array_shift($roles); // We can only use one, let's use the first one - $systemcontext = get_context_instance(CONTEXT_SYSTEM); + $systemcontext = context_system::instance(); if ($iscreator) { // Following calls will not create duplicates role_assign($creatorrole->id, $user->id, $systemcontext->id, $this->roleauth); diff --git a/auth/ldap/ntlmsso_attempt.php b/auth/ldap/ntlmsso_attempt.php index 69bbd42624b0d..de1e4eb28ef30 100644 --- a/auth/ldap/ntlmsso_attempt.php +++ b/auth/ldap/ntlmsso_attempt.php @@ -6,7 +6,7 @@ $PAGE->https_required(); $PAGE->set_url('/auth/ldap/ntlmsso_attempt.php'); -$PAGE->set_context(get_context_instance(CONTEXT_SYSTEM)); +$PAGE->set_context(context_system::instance()); // Define variables used in page $site = get_site(); diff --git a/auth/ldap/ntlmsso_finish.php b/auth/ldap/ntlmsso_finish.php index 0c1ad6f2e3b59..04bcb0fd63a12 100644 --- a/auth/ldap/ntlmsso_finish.php +++ b/auth/ldap/ntlmsso_finish.php @@ -6,7 +6,7 @@ $PAGE->https_required(); $PAGE->set_url('/auth/ldap/ntlmsso_finish.php'); -$PAGE->set_context(get_context_instance(CONTEXT_SYSTEM)); +$PAGE->set_context(context_system::instance()); // Define variables used in page $site = get_site(); diff --git a/auth/ldap/ntlmsso_magic.php b/auth/ldap/ntlmsso_magic.php index f7cd208cce20b..0d349c5eef9b7 100644 --- a/auth/ldap/ntlmsso_magic.php +++ b/auth/ldap/ntlmsso_magic.php @@ -11,7 +11,7 @@ //HTTPS is required in this page when $CFG->loginhttps enabled $PAGE->https_required(); -$PAGE->set_context(get_context_instance(CONTEXT_SYSTEM)); +$PAGE->set_context(context_system::instance()); $authsequence = get_enabled_auth_plugins(true); // auths, in sequence if (!in_array('ldap', $authsequence, true)) { diff --git a/auth/mnet/auth.php b/auth/mnet/auth.php index 0a136e846ee98..ee103bb39a304 100644 --- a/auth/mnet/auth.php +++ b/auth/mnet/auth.php @@ -81,7 +81,7 @@ function user_authorise($token, $useragent) { if (array_key_exists('picture', $userdata) && !empty($user->picture)) { $fs = get_file_storage(); - $usercontext = get_context_instance(CONTEXT_USER, $user->id, MUST_EXIST); + $usercontext = context_user::instance($user->id, MUST_EXIST); if ($usericonfile = $fs->get_file($usercontext->id, 'user', 'icon', 0, '/', 'f1.png')) { $userdata['_mnet_userpicture_timemodified'] = $usericonfile->get_timemodified(); $userdata['_mnet_userpicture_mimetype'] = $usericonfile->get_mimetype(); @@ -299,7 +299,7 @@ function confirm_mnet_session($token, $remotepeer) { if ($key == '_mnet_userpicture_timemodified' and empty($CFG->disableuserimages) and isset($remoteuser->picture)) { // update the user picture if there is a newer verion at the identity provider - $usercontext = get_context_instance(CONTEXT_USER, $localuser->id, MUST_EXIST); + $usercontext = context_user::instance($localuser->id, MUST_EXIST); if ($usericonfile = $fs->get_file($usercontext->id, 'user', 'icon', 0, '/', 'f1.png')) { $localtimemodified = $usericonfile->get_timemodified(); } else if ($usericonfile = $fs->get_file($usercontext->id, 'user', 'icon', 0, '/', 'f1.jpg')) { @@ -1136,7 +1136,7 @@ function fetch_user_image($username) { if ($user = $DB->get_record('user', array('username' => $username, 'mnethostid' => $CFG->mnet_localhost_id))) { $fs = get_file_storage(); - $usercontext = get_context_instance(CONTEXT_USER, $user->id, MUST_EXIST); + $usercontext = context_user::instance($user->id, MUST_EXIST); $return = array(); if ($f1 = $fs->get_file($usercontext->id, 'user', 'icon', 0, '/', 'f1.png')) { $return['f1'] = base64_encode($f1->get_content()); diff --git a/auth/shibboleth/index.php b/auth/shibboleth/index.php index a1e4a1c38407a..bd4eddb9a4a08 100644 --- a/auth/shibboleth/index.php +++ b/auth/shibboleth/index.php @@ -72,7 +72,7 @@ } /// Go to my-moodle page instead of homepage if defaulthomepage enabled - if (!has_capability('moodle/site:config',get_context_instance(CONTEXT_SYSTEM)) and !empty($CFG->defaulthomepage) && $CFG->defaulthomepage == HOMEPAGE_MY and !isguestuser()) { + if (!has_capability('moodle/site:config',context_system::instance()) and !empty($CFG->defaulthomepage) && $CFG->defaulthomepage == HOMEPAGE_MY and !isguestuser()) { if ($urltogo == $CFG->wwwroot or $urltogo == $CFG->wwwroot.'/' or $urltogo == $CFG->wwwroot.'/index.php') { $urltogo = $CFG->wwwroot.'/my/'; } diff --git a/comment/index.php b/comment/index.php index ab5daa378333e..06bb7da65c40c 100644 --- a/comment/index.php +++ b/comment/index.php @@ -29,7 +29,7 @@ require_login(); admin_externalpage_setup('comments', '', null, '', array('pagelayout'=>'report')); -$context = get_context_instance(CONTEXT_SYSTEM); +$context = context_system::instance(); require_capability('moodle/comment:delete', $context); $PAGE->requires->js_init_call('M.core_comment.init_admin', null, true); diff --git a/completion/criteria/completion_criteria_course.php b/completion/criteria/completion_criteria_course.php index 3fc19db9eee0b..c5eb9cb151c66 100644 --- a/completion/criteria/completion_criteria_course.php +++ b/completion/criteria/completion_criteria_course.php @@ -135,7 +135,7 @@ public function get_title_detailed() { global $DB; $prereq = $DB->get_record('course', array('id' => $this->courseinstance)); - $coursecontext = get_context_instance(CONTEXT_COURSE, $prereq->id, MUST_EXIST); + $coursecontext = context_course::instance($prereq->id, MUST_EXIST); $fullname = format_string($prereq->fullname, true, array('context' => $coursecontext)); return shorten_text(urldecode($fullname)); } @@ -215,7 +215,7 @@ public function get_details($completion) { $info = new completion_info($course); $prereq = $DB->get_record('course', array('id' => $this->courseinstance)); - $coursecontext = get_context_instance(CONTEXT_COURSE, $prereq->id, MUST_EXIST); + $coursecontext = context_course::instance($prereq->id, MUST_EXIST); $fullname = format_string($prereq->fullname, true, array('context' => $coursecontext)); $prereq_info = new completion_info($prereq); diff --git a/file.php b/file.php index 52983dee1f8dd..fce3f788ec18f 100644 --- a/file.php +++ b/file.php @@ -83,7 +83,7 @@ } } -$context = get_context_instance(CONTEXT_COURSE, $course->id); +$context = context_course::instance($course->id); $fs = get_file_storage(); diff --git a/group/assign.php b/group/assign.php index 3b26a2cc221b2..e42a1315e5297 100644 --- a/group/assign.php +++ b/group/assign.php @@ -40,7 +40,7 @@ $courseid = $course->id; require_login($course); -$context = get_context_instance(CONTEXT_COURSE, $courseid); +$context = context_course::instance($courseid); require_capability('moodle/course:managegroups', $context); $returnurl = $CFG->wwwroot.'/group/groupings.php?id='.$courseid; diff --git a/group/autogroup.php b/group/autogroup.php index 344b3da907da3..7b01c8886f72a 100644 --- a/group/autogroup.php +++ b/group/autogroup.php @@ -41,8 +41,8 @@ // Make sure that the user has permissions to manage groups. require_login($course); -$context = get_context_instance(CONTEXT_COURSE, $courseid); -$systemcontext = get_context_instance(CONTEXT_SYSTEM); +$context = context_course::instance($courseid); +$systemcontext = context_system::instance(); require_capability('moodle/course:managegroups', $context); $returnurl = $CFG->wwwroot.'/group/index.php?id='.$course->id; diff --git a/group/autogroup_form.php b/group/autogroup_form.php index 36343b525737f..8c67714d4d37b 100644 --- a/group/autogroup_form.php +++ b/group/autogroup_form.php @@ -59,7 +59,7 @@ function definition() { $mform->setDefault('roleid', $student->id); } - $context = get_context_instance(CONTEXT_COURSE, $COURSE->id); + $context = context_course::instance($COURSE->id); if (has_capability('moodle/cohort:view', $context)) { $options = cohort_get_visible_list($COURSE); if ($options) { diff --git a/group/delete.php b/group/delete.php index 158b8eba32ef5..b58bb0c0420dc 100644 --- a/group/delete.php +++ b/group/delete.php @@ -38,7 +38,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:managegroups', $context); $changeidnumber = has_capability('moodle/course:changeidnumber', $context); diff --git a/group/externallib.php b/group/externallib.php index 4e0ad27533ba2..c44e784e6d154 100644 --- a/group/externallib.php +++ b/group/externallib.php @@ -89,7 +89,7 @@ public static function create_groups($groups) { } // now security checks - $context = get_context_instance(CONTEXT_COURSE, $group->courseid); + $context = context_course::instance($group->courseid); try { self::validate_context($context); } catch (Exception $e) { @@ -168,7 +168,7 @@ public static function get_groups($groupids) { $group = groups_get_group($groupid, 'id, courseid, name, description, descriptionformat, enrolmentkey', MUST_EXIST); // now security checks - $context = get_context_instance(CONTEXT_COURSE, $group->courseid); + $context = context_course::instance($group->courseid); try { self::validate_context($context); } catch (Exception $e) { @@ -235,7 +235,7 @@ public static function get_course_groups($courseid) { $params = self::validate_parameters(self::get_course_groups_parameters(), array('courseid'=>$courseid)); // now security checks - $context = get_context_instance(CONTEXT_COURSE, $params['courseid']); + $context = context_course::instance($params['courseid']); try { self::validate_context($context); } catch (Exception $e) { @@ -318,7 +318,7 @@ public static function delete_groups($groupids) { } // now security checks - $context = get_context_instance(CONTEXT_COURSE, $group->courseid); + $context = context_course::instance($group->courseid); try { self::validate_context($context); } catch (Exception $e) { @@ -376,7 +376,7 @@ public static function get_group_members($groupids) { // validate params $group = groups_get_group($groupid, 'id, courseid, name, enrolmentkey', MUST_EXIST); // now security checks - $context = get_context_instance(CONTEXT_COURSE, $group->courseid); + $context = context_course::instance($group->courseid); try { self::validate_context($context); } catch (Exception $e) { @@ -456,7 +456,7 @@ public static function add_group_members($members) { $user = $DB->get_record('user', array('id'=>$userid, 'deleted'=>0, 'mnethostid'=>$CFG->mnet_localhost_id), '*', MUST_EXIST); // now security checks - $context = get_context_instance(CONTEXT_COURSE, $group->courseid); + $context = context_course::instance($group->courseid); try { self::validate_context($context); } catch (Exception $e) { @@ -534,7 +534,7 @@ public static function delete_group_members($members) { $user = $DB->get_record('user', array('id'=>$userid, 'deleted'=>0, 'mnethostid'=>$CFG->mnet_localhost_id), '*', MUST_EXIST); // now security checks - $context = get_context_instance(CONTEXT_COURSE, $group->courseid); + $context = context_course::instance($group->courseid); try { self::validate_context($context); } catch (Exception $e) { diff --git a/group/group.php b/group/group.php index a16909118c000..4e0d8b0ca040d 100644 --- a/group/group.php +++ b/group/group.php @@ -71,7 +71,7 @@ } require_login($course); -$context = get_context_instance(CONTEXT_COURSE, $course->id); +$context = context_course::instance($course->id); require_capability('moodle/course:managegroups', $context); $returnurl = $CFG->wwwroot.'/group/index.php?id='.$course->id.'&group='.$id; diff --git a/group/grouping.php b/group/grouping.php index b612873655e32..bdfe58acd203f 100644 --- a/group/grouping.php +++ b/group/grouping.php @@ -63,7 +63,7 @@ $PAGE->set_url($url); require_login($course); -$context = get_context_instance(CONTEXT_COURSE, $course->id); +$context = context_course::instance($course->id); require_capability('moodle/course:managegroups', $context); $returnurl = $CFG->wwwroot.'/group/groupings.php?id='.$course->id; diff --git a/group/groupings.php b/group/groupings.php index a137da4730586..04800d24e5158 100644 --- a/group/groupings.php +++ b/group/groupings.php @@ -35,7 +35,7 @@ } require_login($course); -$context = get_context_instance(CONTEXT_COURSE, $course->id); +$context = context_course::instance($course->id); require_capability('moodle/course:managegroups', $context); $strgrouping = get_string('grouping', 'group'); diff --git a/group/import.php b/group/import.php index 9baf3721f8421..36a11b995e63d 100644 --- a/group/import.php +++ b/group/import.php @@ -35,7 +35,7 @@ $PAGE->set_url('/group/import.php', array('id'=>$id)); require_login($course); -$context = get_context_instance(CONTEXT_COURSE, $id); +$context = context_course::instance($id); require_capability('moodle/course:managegroups', $context); @@ -160,7 +160,7 @@ if (isset($newgroup->courseid)) { $linenum++; $groupname = $newgroup->name; - $newgrpcoursecontext = get_context_instance(CONTEXT_COURSE, $newgroup->courseid); + $newgrpcoursecontext = context_course::instance($newgroup->courseid); ///Users cannot upload groups in courses they cannot update. if (!has_capability('moodle/course:managegroups', $newgrpcoursecontext) or (!is_enrolled($newgrpcoursecontext) and !has_capability('moodle/course:view', $newgrpcoursecontext))) { diff --git a/group/index.php b/group/index.php index 1f7aabd603c73..7500cc4c54f5c 100644 --- a/group/index.php +++ b/group/index.php @@ -59,7 +59,7 @@ $PAGE->requires->yui2_lib('connection'); $PAGE->requires->js('/group/clientlib.js'); -$context = get_context_instance(CONTEXT_COURSE, $course->id); +$context = context_course::instance($course->id); if (!has_capability('moodle/course:managegroups', $context)) { redirect('/course/view.php', array('id'=>$course->id)); // Not allowed to manage all groups } diff --git a/group/lib.php b/group/lib.php index d93ce756d8008..68d3385c7dd78 100644 --- a/group/lib.php +++ b/group/lib.php @@ -56,7 +56,7 @@ function groups_add_member($grouporid, $userorid) { } //check if the user a participant of the group course - if (!is_enrolled(get_context_instance(CONTEXT_COURSE, $group->courseid), $userid)) { + if (!is_enrolled(context_course::instance($group->courseid), $userid)) { return false; } @@ -140,7 +140,7 @@ function groups_create_group($data, $editform = false, $editoroptions = false) { //check that courseid exists $course = $DB->get_record('course', array('id' => $data->courseid), '*', MUST_EXIST); - $context = get_context_instance(CONTEXT_COURSE, $course->id); + $context = context_course::instance($course->id); $data->timecreated = time(); $data->timemodified = $data->timecreated; @@ -236,7 +236,7 @@ function groups_update_group_icon($group, $data, $editform) { require_once("$CFG->libdir/gdlib.php"); $fs = get_file_storage(); - $context = get_context_instance(CONTEXT_COURSE, $group->courseid, MUST_EXIST); + $context = context_course::instance($group->courseid, MUST_EXIST); //TODO: it would make sense to allow picture deleting too (skodak) @@ -264,7 +264,7 @@ function groups_update_group_icon($group, $data, $editform) { function groups_update_group($data, $editform = false, $editoroptions = false) { global $CFG, $DB; - $context = get_context_instance(CONTEXT_COURSE, $data->courseid); + $context = context_course::instance($data->courseid); $data->timemodified = time(); $data->name = trim($data->name); @@ -353,7 +353,7 @@ function groups_delete_group($grouporid) { $DB->delete_records('groups', array('id'=>$groupid)); // Delete all files associated with this group - $context = get_context_instance(CONTEXT_COURSE, $group->courseid); + $context = context_course::instance($group->courseid); $fs = get_file_storage(); $fs->delete_area_files($context->id, 'group', 'description', $groupid); $fs->delete_area_files($context->id, 'group', 'icon', $groupid); @@ -393,7 +393,7 @@ function groups_delete_grouping($groupingorid) { //group itself last $DB->delete_records('groupings', array('id'=>$groupingid)); - $context = get_context_instance(CONTEXT_COURSE, $grouping->courseid); + $context = context_course::instance($grouping->courseid); $fs = get_file_storage(); $files = $fs->get_area_files($context->id, 'grouping', 'description', $groupingid); foreach ($files as $file) { @@ -484,7 +484,7 @@ function groups_delete_groups($courseid, $showfeedback=false) { groups_delete_group_members($courseid, 0, $showfeedback); // delete group pictures and descriptions - $context = get_context_instance(CONTEXT_COURSE, $courseid); + $context = context_course::instance($courseid); $fs = get_file_storage(); $fs->delete_area_files($context->id, 'group'); @@ -492,7 +492,7 @@ function groups_delete_groups($courseid, $showfeedback=false) { $groupssql = "SELECT id FROM {groups} g WHERE g.courseid = ?"; $DB->delete_records_select('event', "groupid IN ($groupssql)", array($courseid)); - $context = get_context_instance(CONTEXT_COURSE, $courseid); + $context = context_course::instance($courseid); $fs = get_file_storage(); $fs->delete_area_files($context->id, 'group'); @@ -529,7 +529,7 @@ function groups_delete_groupings($courseid, $showfeedback=false) { $DB->set_field('course_modules', 'groupingid', 0, array('course'=>$courseid)); // Delete all files associated with groupings for this course - $context = get_context_instance(CONTEXT_COURSE, $courseid); + $context = context_course::instance($courseid); $fs = get_file_storage(); $fs->delete_area_files($context->id, 'grouping'); @@ -574,7 +574,7 @@ function groups_get_possible_roles($context) { function groups_get_potential_members($courseid, $roleid = null, $cohortid = null, $orderby = 'lastname ASC, firstname ASC') { global $DB; - $context = get_context_instance(CONTEXT_COURSE, $courseid); + $context = context_course::instance($courseid); // we are looking for all users with this role assigned in this context or higher $listofcontexts = get_related_contexts_string($context); @@ -689,7 +689,7 @@ function groups_get_members_by_role($groupid, $courseid, $fields='u.*', // Retrieve information about all users and their roles on the course or // parent ('related') contexts - $context = get_context_instance(CONTEXT_COURSE, $courseid); + $context = context_course::instance($courseid); if ($extrawheretest) { $extrawheretest = ' AND ' . $extrawheretest; diff --git a/group/members.php b/group/members.php index df0a26647d58f..2f65beb127593 100644 --- a/group/members.php +++ b/group/members.php @@ -38,7 +38,7 @@ $PAGE->set_pagelayout('standard'); require_login($course); -$context = get_context_instance(CONTEXT_COURSE, $course->id); +$context = context_course::instance($course->id); require_capability('moodle/course:managegroups', $context); $returnurl = $CFG->wwwroot.'/group/index.php?id='.$course->id.'&group='.$group->id; diff --git a/group/overview.php b/group/overview.php index d9f94e1807d7b..c6634f75e1481 100644 --- a/group/overview.php +++ b/group/overview.php @@ -49,7 +49,7 @@ // Make sure that the user has permissions to manage groups. require_login($course); -$context = get_context_instance(CONTEXT_COURSE, $courseid); +$context = context_course::instance($courseid); require_capability('moodle/course:managegroups', $context); $strgroups = get_string('groups'); diff --git a/help.php b/help.php index 197c98427d384..390b29e9d85ac 100644 --- a/help.php +++ b/help.php @@ -44,7 +44,7 @@ $PAGE->set_url('/help.php'); $PAGE->set_pagelayout('popup'); -$PAGE->set_context(get_context_instance(CONTEXT_SYSTEM)); +$PAGE->set_context(context_system::instance()); if ($ajax) { @header('Content-Type: text/plain; charset=utf-8'); diff --git a/index.php b/index.php index da6545b455287..38a4438e18bbc 100644 --- a/index.php +++ b/index.php @@ -50,7 +50,7 @@ user_accesstime_log(); } - $hassiteconfig = has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM)); + $hassiteconfig = has_capability('moodle/site:config', context_system::instance()); /// If the site is currently under maintenance, then print a message if (!empty($CFG->maintenance_enabled) and !$hassiteconfig) { @@ -128,7 +128,7 @@ echo '

'; } - $context = get_context_instance(CONTEXT_COURSE, SITEID); + $context = context_course::instance(SITEID); $summarytext = file_rewrite_pluginfile_urls($section->summary, 'pluginfile.php', $context->id, 'course', 'section', $section->id); $summaryformatoptions = new stdClass(); $summaryformatoptions->noclean = true; @@ -176,7 +176,7 @@ // fetch news forum context for proper filtering to happen $newsforumcm = get_coursemodule_from_instance('forum', $newsforum->id, $SITE->id, false, MUST_EXIST); - $newsforumcontext = get_context_instance(CONTEXT_MODULE, $newsforumcm->id, MUST_EXIST); + $newsforumcontext = context_module::instance($newsforumcm->id, MUST_EXIST); $forumname = format_string($newsforum->name, true, array('context' => $newsforumcontext)); echo html_writer::tag('a', get_string('skipa', 'access', textlib::strtolower(strip_tags($forumname))), array('href'=>'#skipsitenews', 'class'=>'skip-block')); diff --git a/iplookup/index.php b/iplookup/index.php index afb5383919e81..e876e8f264106 100644 --- a/iplookup/index.php +++ b/iplookup/index.php @@ -41,7 +41,7 @@ $PAGE->set_url('/iplookup/index.php', array('id'=>$ip, 'user'=>$user)); $PAGE->set_pagelayout('popup'); -$PAGE->set_context(get_context_instance(CONTEXT_SYSTEM)); +$PAGE->set_context(context_system::instance()); $info = array($ip); $note = array(); @@ -68,7 +68,7 @@ if ($user) { if ($user = $DB->get_record('user', array('id'=>$user, 'deleted'=>0))) { // note: better not show full names to everybody - if (has_capability('moodle/user:viewdetails', get_context_instance(CONTEXT_USER, $user->id))) { + if (has_capability('moodle/user:viewdetails', context_user::instance($user->id))) { array_unshift($info['title'], fullname($user)); } } diff --git a/message/defaultoutputs.php b/message/defaultoutputs.php index d87b9e0735c8a..58513ead29b9c 100644 --- a/message/defaultoutputs.php +++ b/message/defaultoutputs.php @@ -29,7 +29,7 @@ admin_externalpage_setup('defaultmessageoutputs'); // Require site configuration capability -require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM)); +require_capability('moodle/site:config', context_system::instance()); // Fetch processors $processors = get_message_processors(true); @@ -98,7 +98,7 @@ // Page settings -$PAGE->set_context(get_context_instance(CONTEXT_SYSTEM)); +$PAGE->set_context(context_system::instance()); $PAGE->requires->js_init_call('M.core_message.init_defaultoutputs'); // Grab the renderer diff --git a/message/edit.php b/message/edit.php index c0b2cb45afd12..c3d6b357bd440 100644 --- a/message/edit.php +++ b/message/edit.php @@ -59,9 +59,9 @@ print_error('invaliduserid'); } -$systemcontext = get_context_instance(CONTEXT_SYSTEM); -$personalcontext = get_context_instance(CONTEXT_USER, $user->id); -$coursecontext = get_context_instance(CONTEXT_COURSE, $course->id); +$systemcontext = context_system::instance(); +$personalcontext = context_user::instance($user->id); +$coursecontext = context_course::instance($course->id); $PAGE->set_context($personalcontext); $PAGE->set_pagelayout('course'); diff --git a/message/externallib.php b/message/externallib.php index ca28d2db37624..13319eaced280 100644 --- a/message/externallib.php +++ b/message/externallib.php @@ -77,7 +77,7 @@ public static function send_instant_messages($messages = array()) { } // Ensure the current user is allowed to run this function - $context = get_context_instance(CONTEXT_SYSTEM); + $context = context_system::instance(); self::validate_context($context); require_capability('moodle/site:sendmessage', $context); diff --git a/message/index.php b/message/index.php index daaa5ff56ff93..3ab24b2e591d1 100644 --- a/message/index.php +++ b/message/index.php @@ -82,14 +82,14 @@ $PAGE->set_url($url); -$PAGE->set_context(get_context_instance(CONTEXT_USER, $USER->id)); +$PAGE->set_context(context_user::instance($USER->id)); $PAGE->navigation->extend_for_user($USER); $PAGE->set_pagelayout('course'); // Disable message notification popups while the user is viewing their messages $PAGE->set_popup_notification_allowed(false); -$context = get_context_instance(CONTEXT_SYSTEM); +$context = context_system::instance(); $user1 = null; $currentuser = true; diff --git a/message/lib.php b/message/lib.php index feb364b365773..49e2ed7f8a471 100644 --- a/message/lib.php +++ b/message/lib.php @@ -523,7 +523,7 @@ function message_get_course_contexts($courses) { $coursecontexts = array(); foreach($courses as $course) { - $coursecontexts[$course->id] = get_context_instance(CONTEXT_COURSE, $course->id); + $coursecontexts[$course->id] = context_course::instance($course->id); } return $coursecontexts; @@ -1498,7 +1498,7 @@ function message_search_users($courseid, $searchtext, $sort='', $exceptions='') $order", $params); } else { //TODO: add enabled enrolment join here (skodak) - $context = get_context_instance(CONTEXT_COURSE, $courseid); + $context = context_course::instance($courseid); $contextlists = get_related_contexts_string($context); // everyone who has a role assignment in this course or higher @@ -1535,7 +1535,7 @@ function message_search($searchterms, $fromme=true, $tome=true, $courseid='none' global $CFG, $USER, $DB; // If user is searching all messages check they are allowed to before doing anything else - if ($courseid == SITEID && !has_capability('moodle/site:readallmessages', get_context_instance(CONTEXT_SYSTEM))) { + if ($courseid == SITEID && !has_capability('moodle/site:readallmessages', context_system::instance())) { print_error('accessdenied','admin'); } @@ -2031,7 +2031,7 @@ function message_post_message($userfrom, $userto, $message, $format) { $eventdata->smallmessage = $message;//store the message unfiltered. Clean up on output. $s = new stdClass(); - $s->sitename = format_string($SITE->shortname, true, array('context' => get_context_instance(CONTEXT_COURSE, SITEID))); + $s->sitename = format_string($SITE->shortname, true, array('context' => context_course::instance(SITEID))); $s->url = $CFG->wwwroot.'/message/index.php?user='.$userto->id.'&id='.$userfrom->id; $emailtagline = get_string_manager()->get_string('emailtagline', 'message', $s, $userto->lang); diff --git a/message/search_advanced.html b/message/search_advanced.html index 1eac7dd15946d..c4df7ea741980 100644 --- a/message/search_advanced.html +++ b/message/search_advanced.html @@ -42,7 +42,7 @@     - +   diff --git a/mod/forum/discuss.php b/mod/forum/discuss.php index 382b7be8a9962..aa52759fc1158 100644 --- a/mod/forum/discuss.php +++ b/mod/forum/discuss.php @@ -54,13 +54,13 @@ // move this down fix for MDL-6926 require_once($CFG->dirroot.'/mod/forum/lib.php'); - $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id); + $modcontext = context_module::instance($cm->id); require_capability('mod/forum:viewdiscussion', $modcontext, NULL, true, 'noviewdiscussionspermission', 'forum'); if (!empty($CFG->enablerssfeeds) && !empty($CFG->forum_enablerssfeeds) && $forum->rsstype && $forum->rssarticles) { require_once("$CFG->libdir/rsslib.php"); - $rsstitle = format_string($course->shortname, true, array('context' => get_context_instance(CONTEXT_COURSE, $course->id))) . ': %fullname%'; + $rsstitle = format_string($course->shortname, true, array('context' => context_course::instance($course->id))) . ': %fullname%'; rss_add_http_header($modcontext, 'mod_forum', $forum, $rsstitle); } @@ -98,7 +98,7 @@ print_error('cannotmovenotvisible', 'forum', $return); } - require_capability('mod/forum:startdiscussion', get_context_instance(CONTEXT_MODULE,$cmto->id)); + require_capability('mod/forum:startdiscussion', context_module::instance($cmto->id)); if (!forum_move_attachments($discussion, $forum->id, $forumto->id)) { echo $OUTPUT->notification("Errors occurred while moving attachment directories - check your file permissions"); @@ -229,7 +229,7 @@ $forumcheck = $DB->get_records('forum', array('course' => $course->id),'', 'id, type'); foreach ($modinfo->instances['forum'] as $forumcm) { if (!$forumcm->uservisible || !has_capability('mod/forum:startdiscussion', - get_context_instance(CONTEXT_MODULE,$forumcm->id))) { + context_module::instance($forumcm->id))) { continue; } $section = $forumcm->sectionnum; diff --git a/mod/forum/index.php b/mod/forum/index.php index 5899c412bccb8..aaea9159eafd8 100644 --- a/mod/forum/index.php +++ b/mod/forum/index.php @@ -46,7 +46,7 @@ require_course_login($course); $PAGE->set_pagelayout('incourse'); -$coursecontext = get_context_instance(CONTEXT_COURSE, $course->id); +$coursecontext = context_course::instance($course->id); unset($SESSION->fromdiscussion); @@ -129,7 +129,7 @@ $forum = $forums[$forumid]; - if (!$context = get_context_instance(CONTEXT_MODULE, $cm->id)) { + if (!$context = context_module::instance($cm->id)) { continue; // Shouldn't happen } @@ -158,7 +158,7 @@ // Can proceed now, the user is not guest and is enrolled foreach ($modinfo->instances['forum'] as $forumid=>$cm) { $forum = $forums[$forumid]; - $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id); + $modcontext = context_module::instance($cm->id); $cansub = false; if (has_capability('mod/forum:viewdiscussion', $modcontext)) { @@ -179,7 +179,7 @@ } } $returnto = forum_go_back_to("index.php?id=$course->id"); - $shortname = format_string($course->shortname, true, array('context' => get_context_instance(CONTEXT_COURSE, $course->id))); + $shortname = format_string($course->shortname, true, array('context' => context_course::instance($course->id))); if ($subscribe) { add_to_log($course->id, 'forum', 'subscribeall', "index.php?id=$course->id", $course->id); redirect($returnto, get_string('nowallsubscribed', 'forum', $shortname), 1); @@ -194,7 +194,7 @@ if ($generalforums) { foreach ($generalforums as $forum) { $cm = $modinfo->instances['forum'][$forum->id]; - $context = get_context_instance(CONTEXT_MODULE, $cm->id); + $context = context_module::instance($cm->id); $count = forum_count_discussions($forum, $cm, $course); @@ -321,7 +321,7 @@ $currentsection = ''; foreach ($learningforums as $forum) { $cm = $modinfo->instances['forum'][$forum->id]; - $context = get_context_instance(CONTEXT_MODULE, $cm->id); + $context = context_module::instance($cm->id); $count = forum_count_discussions($forum, $cm, $course); diff --git a/mod/forum/lib.php b/mod/forum/lib.php index 8ee61aed0ab63..75717c4b15c58 100644 --- a/mod/forum/lib.php +++ b/mod/forum/lib.php @@ -77,7 +77,7 @@ function forum_add_instance($forum, $mform = null) { } $forum->id = $DB->insert_record('forum', $forum); - $modcontext = get_context_instance(CONTEXT_MODULE, $forum->coursemodule); + $modcontext = context_module::instance($forum->coursemodule); if ($forum->type == 'single') { // Create related discussion. $discussion = new stdClass(); @@ -87,7 +87,7 @@ function forum_add_instance($forum, $mform = null) { $discussion->assessed = $forum->assessed; $discussion->message = $forum->intro; $discussion->messageformat = $forum->introformat; - $discussion->messagetrust = trusttext_trusted(get_context_instance(CONTEXT_COURSE, $forum->course)); + $discussion->messagetrust = trusttext_trusted(context_course::instance($forum->course)); $discussion->mailnow = false; $discussion->groupid = -1; @@ -191,7 +191,7 @@ function forum_update_instance($forum, $mform) { } $cm = get_coursemodule_from_instance('forum', $forum->id); - $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id, MUST_EXIST); + $modcontext = context_module::instance($cm->id, MUST_EXIST); if ($mform and $draftid = file_get_submitted_draft_itemid('introeditor')) { // ugly hack - we need to copy the files somehow @@ -244,7 +244,7 @@ function forum_delete_instance($id) { return false; } - $context = get_context_instance(CONTEXT_MODULE, $cm->id); + $context = context_module::instance($cm->id); // now get rid of all files $fs = get_file_storage(); @@ -509,7 +509,7 @@ function forum_cron() { // caching subscribed users of each forum if (!isset($subscribedusers[$forumid])) { - $modcontext = get_context_instance(CONTEXT_MODULE, $coursemodules[$forumid]->id); + $modcontext = context_module::instance($coursemodules[$forumid]->id); if ($subusers = forum_subscribed_users($courses[$courseid], $forums[$forumid], 0, $modcontext, "u.*")) { foreach ($subusers as $postuser) { // this user is subscribed to this forum @@ -620,11 +620,11 @@ function forum_cron() { // Fill caches if (!isset($userto->viewfullnames[$forum->id])) { - $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id); + $modcontext = context_module::instance($cm->id); $userto->viewfullnames[$forum->id] = has_capability('moodle/site:viewfullnames', $modcontext); } if (!isset($userto->canpost[$discussion->id])) { - $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id); + $modcontext = context_module::instance($cm->id); $userto->canpost[$discussion->id] = forum_user_can_post($forum, $discussion, $userto, $cm, $course, $modcontext); } if (!isset($userfrom->groups[$forum->id])) { @@ -691,7 +691,7 @@ function forum_cron() { $userfrom->customheaders[] = 'References: '.forum_get_email_message_id($post->parent, $userto->id, $hostname); } - $shortname = format_string($course->shortname, true, array('context' => get_context_instance(CONTEXT_COURSE, $course->id))); + $shortname = format_string($course->shortname, true, array('context' => context_course::instance($course->id))); $postsubject = html_to_text("$shortname: ".format_string($post->subject, true)); $posttext = forum_make_mail_text($course, $cm, $forum, $discussion, $post, $userfrom, $userto); @@ -903,18 +903,18 @@ function forum_cron() { // Fill caches if (!isset($userto->viewfullnames[$forum->id])) { - $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id); + $modcontext = context_module::instance($cm->id); $userto->viewfullnames[$forum->id] = has_capability('moodle/site:viewfullnames', $modcontext); } if (!isset($userto->canpost[$discussion->id])) { - $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id); + $modcontext = context_module::instance($cm->id); $userto->canpost[$discussion->id] = forum_user_can_post($forum, $discussion, $userto, $cm, $course, $modcontext); } $strforums = get_string('forums', 'forum'); $canunsubscribe = ! forum_is_forcesubscribed($forum); $canreply = $userto->canpost[$discussion->id]; - $shortname = format_string($course->shortname, true, array('context' => get_context_instance(CONTEXT_COURSE, $course->id))); + $shortname = format_string($course->shortname, true, array('context' => context_course::instance($course->id))); $posttext .= "\n \n"; $posttext .= '====================================================================='; @@ -1074,7 +1074,7 @@ function forum_cron() { function forum_make_mail_text($course, $cm, $forum, $discussion, $post, $userfrom, $userto, $bare = false) { global $CFG, $USER; - $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id); + $modcontext = context_module::instance($cm->id); if (!isset($userto->viewfullnames[$forum->id])) { $viewfullnames = has_capability('moodle/site:viewfullnames', $modcontext, $userto->id); @@ -1101,7 +1101,7 @@ function forum_make_mail_text($course, $cm, $forum, $discussion, $post, $userfro $posttext = ''; if (!$bare) { - $shortname = format_string($course->shortname, true, array('context' => get_context_instance(CONTEXT_COURSE, $course->id))); + $shortname = format_string($course->shortname, true, array('context' => context_course::instance($course->id))); $posttext = "$shortname -> $strforums -> ".format_string($forum->name,true); if ($discussion->name != $forum->name) { @@ -1165,7 +1165,7 @@ function forum_make_mail_html($course, $cm, $forum, $discussion, $post, $userfro $strforums = get_string('forums', 'forum'); $canunsubscribe = ! forum_is_forcesubscribed($forum); - $shortname = format_string($course->shortname, true, array('context' => get_context_instance(CONTEXT_COURSE, $course->id))); + $shortname = format_string($course->shortname, true, array('context' => context_course::instance($course->id))); $posthtml = ''; /* foreach ($CFG->stylesheets as $stylesheet) { @@ -1477,7 +1477,7 @@ function forum_print_recent_activity($course, $viewfullnames, $timestart) { if (!$cm->uservisible) { continue; } - $context = get_context_instance(CONTEXT_MODULE, $cm->id); + $context = context_module::instance($cm->id); if (!has_capability('mod/forum:viewdiscussion', $context)) { continue; @@ -1902,7 +1902,7 @@ function forum_get_readable_forums($userid, $courseid=0) { if (!$cm->uservisible or !isset($courseforums[$forumid])) { continue; } - $context = get_context_instance(CONTEXT_MODULE, $cm->id); + $context = context_module::instance($cm->id); $forum = $courseforums[$forumid]; $forum->context = $context; $forum->cm = $cm; @@ -2205,7 +2205,7 @@ function forum_get_user_posts($forumid, $userid) { if (!empty($CFG->forum_enabletimedposts)) { $cm = get_coursemodule_from_instance('forum', $forumid); - if (!has_capability('mod/forum:viewhiddentimedposts' , get_context_instance(CONTEXT_MODULE, $cm->id))) { + if (!has_capability('mod/forum:viewhiddentimedposts' , context_module::instance($cm->id))) { $now = time(); $timedsql = "AND (d.timestart < ? AND (d.timeend = 0 OR d.timeend > ?))"; $params[] = $now; @@ -2241,7 +2241,7 @@ function forum_get_user_involved_discussions($forumid, $userid) { $params = array($forumid, $userid); if (!empty($CFG->forum_enabletimedposts)) { $cm = get_coursemodule_from_instance('forum', $forumid); - if (!has_capability('mod/forum:viewhiddentimedposts' , get_context_instance(CONTEXT_MODULE, $cm->id))) { + if (!has_capability('mod/forum:viewhiddentimedposts' , context_module::instance($cm->id))) { $now = time(); $timedsql = "AND (d.timestart < ? AND (d.timeend = 0 OR d.timeend > ?))"; $params[] = $now; @@ -2274,7 +2274,7 @@ function forum_count_user_posts($forumid, $userid) { $params = array($forumid, $userid); if (!empty($CFG->forum_enabletimedposts)) { $cm = get_coursemodule_from_instance('forum', $forumid); - if (!has_capability('mod/forum:viewhiddentimedposts' , get_context_instance(CONTEXT_MODULE, $cm->id))) { + if (!has_capability('mod/forum:viewhiddentimedposts' , context_module::instance($cm->id))) { $now = time(); $timedsql = "AND (d.timestart < ? AND (d.timeend = 0 OR d.timeend > ?))"; $params[] = $now; @@ -2464,7 +2464,7 @@ function forum_count_discussions($forum, $cm, $course) { return $cache[$course->id][$forum->id]; } - if (has_capability('moodle/site:accessallgroups', get_context_instance(CONTEXT_MODULE, $cm->id))) { + if (has_capability('moodle/site:accessallgroups', context_module::instance($cm->id))) { return $cache[$course->id][$forum->id]; } @@ -2576,7 +2576,7 @@ function forum_get_discussions($cm, $forumsort="d.timemodified DESC", $fullpost= $now = round(time(), -2); $params = array($cm->instance); - $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id); + $modcontext = context_module::instance($cm->id); if (!has_capability('mod/forum:viewdiscussion', $modcontext)) { /// User must have perms to view discussions return array(); @@ -2612,7 +2612,7 @@ function forum_get_discussions($cm, $forumsort="d.timemodified DESC", $fullpost= if ($groupmode) { if (empty($modcontext)) { - $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id); + $modcontext = context_module::instance($cm->id); } if ($groupmode == VISIBLEGROUPS or has_capability('moodle/site:accessallgroups', $modcontext)) { @@ -2687,7 +2687,7 @@ function forum_get_discussions_unread($cm) { $currentgroup = groups_get_activity_group($cm); if ($groupmode) { - $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id); + $modcontext = context_module::instance($cm->id); if ($groupmode == VISIBLEGROUPS or has_capability('moodle/site:accessallgroups', $modcontext)) { if ($currentgroup) { @@ -2757,7 +2757,7 @@ function forum_get_discussions_count($cm) { $currentgroup = groups_get_activity_group($cm); if ($groupmode) { - $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id); + $modcontext = context_module::instance($cm->id); if ($groupmode == VISIBLEGROUPS or has_capability('moodle/site:accessallgroups', $modcontext)) { if ($currentgroup) { @@ -2786,7 +2786,7 @@ function forum_get_discussions_count($cm) { if (!empty($CFG->forum_enabletimedposts)) { - $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id); + $modcontext = context_module::instance($cm->id); if (!has_capability('mod/forum:viewhiddentimedposts', $modcontext)) { $timelimit = " AND ((d.timestart <= ? AND (d.timeend = 0 OR d.timeend > ?))"; @@ -2914,7 +2914,7 @@ function forum_subscribed_users($course, $forum, $groupid=0, $context = null, $f if (empty($context)) { $cm = get_coursemodule_from_instance('forum', $forum->id, $course->id); - $context = get_context_instance(CONTEXT_MODULE, $cm->id); + $context = context_module::instance($cm->id); } if (forum_is_forcesubscribed($forum)) { @@ -3047,7 +3047,7 @@ function forum_make_mail_post($course, $cm, $forum, $discussion, $post, $userfro global $CFG, $OUTPUT; - $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id); + $modcontext = context_module::instance($cm->id); if (!isset($userto->viewfullnames[$forum->id])) { $viewfullnames = has_capability('moodle/site:viewfullnames', $modcontext, $userto->id); @@ -3182,7 +3182,7 @@ function forum_print_post($post, $discussion, $forum, &$cm, $course, $ownpost=fa // String cache static $str; - $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id); + $modcontext = context_module::instance($cm->id); $post->course = $course->id; $post->forum = $forum->id; @@ -3577,7 +3577,7 @@ function forum_rating_validate($params) { $forum = $DB->get_record('forum', array('id' => $discussion->forum), '*', MUST_EXIST); $course = $DB->get_record('course', array('id' => $forum->course), '*', MUST_EXIST); $cm = get_coursemodule_from_instance('forum', $forum->id, $course->id , false, MUST_EXIST); - $context = get_context_instance(CONTEXT_MODULE, $cm->id); + $context = context_module::instance($cm->id); // Make sure the context provided is the context of the forum if ($context->id != $params['context']->id) { @@ -3669,7 +3669,7 @@ function forum_print_discussion_header(&$post, $forum, $group=-1, $datestring="" if (!$cm = get_coursemodule_from_instance('forum', $forum->id, $forum->course)) { print_error('invalidcoursemodule'); } - $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id); + $modcontext = context_module::instance($cm->id); } if (!isset($rowcount)) { @@ -3933,8 +3933,8 @@ function forum_move_attachments($discussion, $forumfrom, $forumto) { $newcm = get_coursemodule_from_instance('forum', $forumto); $oldcm = get_coursemodule_from_instance('forum', $forumfrom); - $newcontext = get_context_instance(CONTEXT_MODULE, $newcm->id); - $oldcontext = get_context_instance(CONTEXT_MODULE, $oldcm->id); + $newcontext = context_module::instance($newcm->id); + $oldcontext = context_module::instance($oldcm->id); // loop through all posts, better not use attachment flag ;-) if ($posts = $DB->get_records('forum_posts', array('discussion'=>$discussion->id), '', 'id, attachment')) { @@ -3980,7 +3980,7 @@ function forum_print_attachments($post, $cm, $type) { return $type !== 'separateimages' ? '' : array('', ''); } - if (!$context = get_context_instance(CONTEXT_MODULE, $cm->id)) { + if (!$context = context_module::instance($cm->id)) { return $type !== 'separateimages' ? '' : array('', ''); } $strattachment = get_string('attachment', 'forum'); @@ -4257,7 +4257,7 @@ function forum_add_attachment($post, $forum, $cm, $mform=null, &$message=null) { return true; // Nothing to do } - $context = get_context_instance(CONTEXT_MODULE, $cm->id); + $context = context_module::instance($cm->id); $info = file_get_draft_area_info($post->attachments); $present = ($info['filecount']>0) ? '1' : ''; @@ -4286,7 +4286,7 @@ function forum_add_new_post($post, $mform, &$message) { $discussion = $DB->get_record('forum_discussions', array('id' => $post->discussion)); $forum = $DB->get_record('forum', array('id' => $discussion->forum)); $cm = get_coursemodule_from_instance('forum', $forum->id); - $context = get_context_instance(CONTEXT_MODULE, $cm->id); + $context = context_module::instance($cm->id); $post->created = $post->modified = time(); $post->mailed = "0"; @@ -4330,7 +4330,7 @@ function forum_update_post($post, $mform, &$message) { $discussion = $DB->get_record('forum_discussions', array('id' => $post->discussion)); $forum = $DB->get_record('forum', array('id' => $discussion->forum)); $cm = get_coursemodule_from_instance('forum', $forum->id); - $context = get_context_instance(CONTEXT_MODULE, $cm->id); + $context = context_module::instance($cm->id); $post->modified = time(); @@ -4410,7 +4410,7 @@ function forum_add_discussion($discussion, $mform=null, &$message=null, $userid= // TODO: Fix the calling code so that there always is a $cm when this function is called if (!empty($cm->id) && !empty($discussion->itemid)) { // In "single simple discussions" this may not exist yet - $context = get_context_instance(CONTEXT_MODULE, $cm->id); + $context = context_module::instance($cm->id); $text = file_save_draft_area_files($discussion->itemid, $context->id, 'mod_forum', 'post', $post->id, mod_forum_post_form::editor_options(), $post->message); $DB->set_field('forum_posts', 'message', $text, array('id'=>$post->id)); @@ -4511,7 +4511,7 @@ function forum_delete_post($post, $children, $course, $cm, $forum, $skipcompleti global $DB, $CFG; require_once($CFG->libdir.'/completionlib.php'); - $context = get_context_instance(CONTEXT_MODULE, $cm->id); + $context = context_module::instance($cm->id); if ($children !== 'ignore' && ($childposts = $DB->get_records('forum_posts', array('parent'=>$post->id)))) { if ($children) { @@ -4791,7 +4791,7 @@ function forum_post_subscription($post, $forum) { return ""; } elseif (($forum->forcesubscribe == FORUM_DISALLOWSUBSCRIBE) - && !has_capability('moodle/course:manageactivities', get_context_instance(CONTEXT_COURSE, $forum->course), $USER->id)) { + && !has_capability('moodle/course:manageactivities', context_course::instance($forum->course), $USER->id)) { if ($subscribed) { $action = 'unsubscribe'; // sanity check, following MDL-14558 } else { @@ -5066,7 +5066,7 @@ function forum_user_can_post_discussion($forum, $currentgroup=null, $unused=-1, } if (!$context) { - $context = get_context_instance(CONTEXT_MODULE, $cm->id); + $context = context_module::instance($cm->id); } if ($currentgroup === null) { @@ -5159,7 +5159,7 @@ function forum_user_can_post($forum, $discussion, $user=NULL, $cm=NULL, $course= } if (!$context) { - $context = get_context_instance(CONTEXT_MODULE, $cm->id); + $context = context_module::instance($cm->id); } // normal users with temporary guest access can not post, suspended users can not post either @@ -5224,7 +5224,7 @@ function forum_user_can_view_post($post, $course, $cm, $forum, $discussion, $use $user = $USER; } - $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id); + $modcontext = context_module::instance($cm->id); if (!has_capability('mod/forum:viewdiscussion', $modcontext)) { return false; } @@ -5332,8 +5332,8 @@ function forum_user_can_see_post($forum, $discussion, $post, $user=NULL, $cm=NUL $user = $USER; } - $canviewdiscussion = !empty($cm->cache->caps['mod/forum:viewdiscussion']) || has_capability('mod/forum:viewdiscussion', get_context_instance(CONTEXT_MODULE, $cm->id), $user->id); - if (!$canviewdiscussion && !has_all_capabilities(array('moodle/user:viewdetails', 'moodle/user:readuserposts'), get_context_instance(CONTEXT_USER, $post->userid))) { + $canviewdiscussion = !empty($cm->cache->caps['mod/forum:viewdiscussion']) || has_capability('mod/forum:viewdiscussion', context_module::instance($cm->id), $user->id); + if (!$canviewdiscussion && !has_all_capabilities(array('moodle/user:viewdetails', 'moodle/user:readuserposts'), context_user::instance($post->userid))) { return false; } @@ -5349,7 +5349,7 @@ function forum_user_can_see_post($forum, $discussion, $post, $user=NULL, $cm=NUL if ($forum->type == 'qanda') { $firstpost = forum_get_firstpost_from_discussion($discussion->id); - $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id); + $modcontext = context_module::instance($cm->id); $userfirstpost = forum_get_user_posted_time($discussion->id, $user->id); return (($userfirstpost !== false && (time() - $userfirstpost >= $CFG->maxeditingtime)) || @@ -5385,7 +5385,7 @@ function forum_print_latest_discussions($course, $forum, $maxdiscussions=-1, $di print_error('invalidcoursemodule'); } } - $context = get_context_instance(CONTEXT_MODULE, $cm->id); + $context = context_module::instance($cm->id); if (empty($sort)) { $sort = "d.timemodified DESC"; @@ -5614,7 +5614,7 @@ function forum_print_latest_discussions($course, $forum, $maxdiscussions=-1, $di if ($discussion->replies) { $link = true; } else { - $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id); + $modcontext = context_module::instance($cm->id); $link = forum_user_can_post($forum, $discussion, $USER, $cm, $course, $modcontext); } @@ -5672,7 +5672,7 @@ function forum_print_discussion($course, $cm, $forum, $discussion, $post, $mode, $ownpost = (isloggedin() && $USER->id == $post->userid); - $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id); + $modcontext = context_module::instance($cm->id); if ($canreply === NULL) { $reply = forum_user_can_post($forum, $discussion, $USER, $cm, $course, $modcontext); } else { @@ -5819,7 +5819,7 @@ function forum_print_posts_threaded($course, &$cm, $forum, $discussion, $parent, if (!empty($posts[$parent->id]->children)) { $posts = $posts[$parent->id]->children; - $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id); + $modcontext = context_module::instance($cm->id); $canviewfullnames = has_capability('moodle/site:viewfullnames', $modcontext); foreach ($posts as $post) { @@ -5951,7 +5951,7 @@ function forum_get_recent_mod_activity(&$activities, &$index, $timestart, $cours } $groupmode = groups_get_activity_groupmode($cm, $course); - $cm_context = get_context_instance(CONTEXT_MODULE, $cm->id); + $cm_context = context_module::instance($cm->id); $viewhiddentimed = has_capability('mod/forum:viewhiddentimedposts', $cm_context); $accessallgroups = has_capability('moodle/site:accessallgroups', $cm_context); @@ -6610,7 +6610,7 @@ function forum_tp_count_forum_unread_posts($cm, $course) { return $readcache[$course->id][$forumid]; } - if (has_capability('moodle/site:accessallgroups', get_context_instance(CONTEXT_MODULE, $cm->id))) { + if (has_capability('moodle/site:accessallgroups', context_module::instance($cm->id))) { return $readcache[$course->id][$forumid]; } @@ -6995,7 +6995,7 @@ function forum_check_throttling($forum, $cm=null) { } } - $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id); + $modcontext = context_module::instance($cm->id); if(has_capability('mod/forum:postwithoutthrottling', $modcontext)) { return true; } @@ -7128,7 +7128,7 @@ function forum_reset_userdata($data) { if (!$cm = get_coursemodule_from_instance('forum', $forumid)) { continue; } - $context = get_context_instance(CONTEXT_MODULE, $cm->id); + $context = context_module::instance($cm->id); $fs->delete_area_files($context->id, 'mod_forum', 'attachment'); $fs->delete_area_files($context->id, 'mod_forum', 'post'); @@ -7175,7 +7175,7 @@ function forum_reset_userdata($data) { if (!$cm = get_coursemodule_from_instance('forum', $forumid)) { continue; } - $context = get_context_instance(CONTEXT_MODULE, $cm->id); + $context = context_module::instance($cm->id); //remove ratings $ratingdeloptions->contextid = $context->id; @@ -7308,7 +7308,7 @@ function forum_convert_to_roles($forum, $forummodid, $teacherroles=array(), $forum->type = 'general'; $DB->update_record('forum', $forum); - $context = get_context_instance(CONTEXT_MODULE, $cmid); + $context = context_module::instance($cmid); // Create overrides for default student and guest roles (prevent). foreach ($studentroles as $studentrole) { @@ -7362,7 +7362,7 @@ function forum_convert_to_roles($forum, $forummodid, $teacherroles=array(), $cmid = $cm->id; } } - $context = get_context_instance(CONTEXT_MODULE, $cmid); + $context = context_module::instance($cmid); // $forum->open defines what students can do: // 0 = No discussions, no replies @@ -7602,7 +7602,7 @@ function forum_extend_settings_navigation(settings_navigation $settingsnav, navi $forumobject = $DB->get_record("forum", array("id" => $PAGE->cm->instance)); if (empty($PAGE->cm->context)) { - $PAGE->cm->context = get_context_instance(CONTEXT_MODULE, $PAGE->cm->instance); + $PAGE->cm->context = context_module::instance($PAGE->cm->instance); } // for some actions you need to be enrolled, beiing admin is not enough sometimes here @@ -8104,7 +8104,7 @@ function forum_get_posts_by_user($user, array $courses, $musthaveaccess = false, // Checkout whether or not the current user has capabilities over the requested // user and if so they have the capabilities required to view the requested // users content. - $usercontext = get_context_instance(CONTEXT_USER, $user->id, MUST_EXIST); + $usercontext = context_user::instance($user->id, MUST_EXIST); $hascapsonuser = !$iscurrentuser && $DB->record_exists('role_assignments', array('userid' => $USER->id, 'contextid' => $usercontext->id)); $hascapsonuser = $hascapsonuser && has_all_capabilities(array('moodle/user:viewdetails', 'moodle/user:readuserposts'), $usercontext); @@ -8112,7 +8112,7 @@ function forum_get_posts_by_user($user, array $courses, $musthaveaccess = false, // course. If the user doesn't have the appropraite access then we either throw an // error if a particular course was requested or we just skip over the course. foreach ($courses as $course) { - $coursecontext = get_context_instance(CONTEXT_COURSE, $course->id, MUST_EXIST); + $coursecontext = context_course::instance($course->id, MUST_EXIST); if ($iscurrentuser || $hascapsonuser) { // If it is the current user, or the current user has capabilities to the // requested user then all we need to do is check the requested users diff --git a/mod/forum/locallib.php b/mod/forum/locallib.php index dd1b3affb32cb..263af852c3a7a 100644 --- a/mod/forum/locallib.php +++ b/mod/forum/locallib.php @@ -91,7 +91,7 @@ public function load_data() { throw new portfolio_caller_exception('invalidcoursemodule'); } - $this->modcontext = get_context_instance(CONTEXT_MODULE, $this->cm->id); + $this->modcontext = context_module::instance($this->cm->id); $fs = get_file_storage(); if ($this->post) { if ($this->attachment) { @@ -372,7 +372,7 @@ function expected_time() { * @return bool */ function check_permissions() { - $context = get_context_instance(CONTEXT_MODULE, $this->cm->id); + $context = context_module::instance($this->cm->id); if ($this->post) { return (has_capability('mod/forum:exportpost', $context) || ($this->post->userid == $this->user->id diff --git a/mod/forum/post.php b/mod/forum/post.php index 1162e6aea95c7..8008e8aa735c3 100644 --- a/mod/forum/post.php +++ b/mod/forum/post.php @@ -49,7 +49,7 @@ //these page_params will be passed as hidden variables later in the form. $page_params = array('reply'=>$reply, 'forum'=>$forum, 'edit'=>$edit); -$sitecontext = get_context_instance(CONTEXT_SYSTEM); +$sitecontext = context_system::instance(); if (!isloggedin() or isguestuser()) { @@ -80,7 +80,7 @@ if (!$cm = get_coursemodule_from_instance('forum', $forum->id, $course->id)) { // For the logs print_error('invalidcoursemodule'); } else { - $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id); + $modcontext = context_module::instance($cm->id); } $PAGE->set_cm($cm, $course, $forum); @@ -107,7 +107,7 @@ print_error("invalidcoursemodule"); } - $coursecontext = get_context_instance(CONTEXT_COURSE, $course->id); + $coursecontext = context_course::instance($course->id); if (! forum_user_can_post_discussion($forum, $groupid, -1, $cm)) { if (!isguestuser()) { @@ -175,8 +175,8 @@ // Ensure lang, theme, etc. is set up properly. MDL-6926 $PAGE->set_cm($cm, $course, $forum); - $coursecontext = get_context_instance(CONTEXT_COURSE, $course->id); - $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id); + $coursecontext = context_course::instance($course->id); + $modcontext = context_module::instance($cm->id); if (! forum_user_can_post($forum, $discussion, $USER, $cm, $course, $modcontext)) { if (!isguestuser()) { @@ -252,7 +252,7 @@ if (!$cm = get_coursemodule_from_instance("forum", $forum->id, $course->id)) { print_error('invalidcoursemodule'); } else { - $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id); + $modcontext = context_module::instance($cm->id); } $PAGE->set_cm($cm, $course, $forum); @@ -299,7 +299,7 @@ } require_login($course, false, $cm); - $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id); + $modcontext = context_module::instance($cm->id); if ( !(($post->userid == $USER->id && has_capability('mod/forum:deleteownpost', $modcontext)) || has_capability('mod/forum:deleteanypost', $modcontext)) ) { @@ -416,7 +416,7 @@ if (!$cm = get_coursemodule_from_instance("forum", $forum->id, $forum->course)) { // For the logs print_error('invalidcoursemodule'); } else { - $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id); + $modcontext = context_module::instance($cm->id); } if (!has_capability('mod/forum:splitdiscussions', $modcontext)) { print_error('cannotsplit', 'forum'); @@ -484,7 +484,7 @@ if (!isset($coursecontext)) { // Has not yet been set by post.php. - $coursecontext = get_context_instance(CONTEXT_COURSE, $forum->course); + $coursecontext = context_course::instance($forum->course); } @@ -493,7 +493,7 @@ if (!$cm = get_coursemodule_from_instance('forum', $forum->id, $course->id)) { // For the logs print_error('invalidcoursemodule'); } -$modcontext = get_context_instance(CONTEXT_MODULE, $cm->id); +$modcontext = context_module::instance($cm->id); require_login($course, false, $cm); if (isguestuser()) { diff --git a/mod/forum/post_form.php b/mod/forum/post_form.php index c710567c628ac..02e935b23f056 100644 --- a/mod/forum/post_form.php +++ b/mod/forum/post_form.php @@ -138,7 +138,7 @@ function definition() { if (groups_get_activity_groupmode($cm, $course)) { // hack alert $groupdata = groups_get_activity_allowed_groups($cm); $groupcount = count($groupdata); - $modulecontext = get_context_instance(CONTEXT_MODULE, $cm->id); + $modulecontext = context_module::instance($cm->id); $contextcheck = has_capability('mod/forum:movediscussions', $modulecontext) && empty($post->parent) && $groupcount > 1; if ($contextcheck) { $groupinfo = array('0' => get_string('allparticipants')); diff --git a/mod/forum/search.php b/mod/forum/search.php index ebbc99f7f8199..e4a59414a34a3 100644 --- a/mod/forum/search.php +++ b/mod/forum/search.php @@ -241,7 +241,7 @@ //add the ratings information to the post //Unfortunately seem to have do this individually as posts may be from different forums if ($forum->assessed != RATING_AGGREGATE_NONE) { - $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id); + $modcontext = context_module::instance($cm->id); $ratingoptions->context = $modcontext; $ratingoptions->items = array($post); $ratingoptions->aggregate = $forum->assessed;//the aggregation method @@ -454,7 +454,7 @@ function forum_menu_list($course) { if (!$cm->uservisible) { continue; } - $context = get_context_instance(CONTEXT_MODULE, $cm->id); + $context = context_module::instance($cm->id); if (!has_capability('mod/forum:viewdiscussion', $context)) { continue; } diff --git a/mod/forum/subscribe.php b/mod/forum/subscribe.php index 58a5fd52df4f6..68abac333aa3b 100644 --- a/mod/forum/subscribe.php +++ b/mod/forum/subscribe.php @@ -55,7 +55,7 @@ $forum = $DB->get_record('forum', array('id' => $id), '*', MUST_EXIST); $course = $DB->get_record('course', array('id' => $forum->course), '*', MUST_EXIST); $cm = get_coursemodule_from_instance('forum', $forum->id, $course->id, false, MUST_EXIST); -$context = get_context_instance(CONTEXT_MODULE, $cm->id); +$context = context_module::instance($cm->id); if ($user) { require_sesskey(); diff --git a/mod/forum/subscribers.php b/mod/forum/subscribers.php index e10e958c53070..87c3b5429ef1f 100644 --- a/mod/forum/subscribers.php +++ b/mod/forum/subscribers.php @@ -47,7 +47,7 @@ require_login($course, false, $cm); -$context = get_context_instance(CONTEXT_MODULE, $cm->id); +$context = context_module::instance($cm->id); if (!has_capability('mod/forum:viewsubscribers', $context)) { print_error('nopermissiontosubscribe', 'forum'); } diff --git a/mod/forum/unsubscribeall.php b/mod/forum/unsubscribeall.php index f66ad261b9912..13eafe5f344fb 100644 --- a/mod/forum/unsubscribeall.php +++ b/mod/forum/unsubscribeall.php @@ -27,7 +27,7 @@ $confirm = optional_param('confirm', false, PARAM_BOOL); $PAGE->set_url('/mod/forum/unsubscribeall.php'); -$PAGE->set_context(get_context_instance(CONTEXT_USER, $USER->id)); +$PAGE->set_context(context_user::instance($USER->id)); // Do not autologin guest. Only proper users can have forum subscriptions. require_login(null, false); diff --git a/mod/forum/user.php b/mod/forum/user.php index 48c2e76af37fd..25ad9a39b973b 100644 --- a/mod/forum/user.php +++ b/mod/forum/user.php @@ -65,7 +65,7 @@ add_to_log(($isspecificcourse)?$courseid:SITEID, "forum", "user report", 'user.php?'.$url->get_query_string(), $userid); $user = $DB->get_record("user", array("id" => $userid), '*', MUST_EXIST); -$usercontext = get_context_instance(CONTEXT_USER, $user->id, MUST_EXIST); +$usercontext = context_user::instance($user->id, MUST_EXIST); // Check if the requested user is the guest user if (isguestuser($user)) { // The guest user cannot post, so it is not possible to view any posts. @@ -91,7 +91,7 @@ if ($isspecificcourse) { // Get the requested course and its context $course = $DB->get_record('course', array('id' => $courseid), '*', MUST_EXIST); - $coursecontext = get_context_instance(CONTEXT_COURSE, $courseid, MUST_EXIST); + $coursecontext = context_course::instance($courseid, MUST_EXIST); // We have a specific course to search, which we will also assume we are within. if ($hasparentaccess) { // A `parent` role won't likely have access to the course so we won't attempt @@ -144,7 +144,7 @@ $sharedcourses = enrol_get_shared_courses($USER->id, $user->id, true); foreach ($sharedcourses as $sharedcourse) { // Check the view cap within the course context - if (has_capability('moodle/user:viewdetails', get_context_instance(CONTEXT_COURSE, $sharedcourse->id))) { + if (has_capability('moodle/user:viewdetails', context_course::instance($sharedcourse->id))) { $canviewuser = true; break; } @@ -256,7 +256,7 @@ $result->posts[$updatedpost[0]->id] = $updatedpost[0]; } - $courseshortname = format_string($course->shortname, true, array('context' => get_context_instance(CONTEXT_COURSE, $course->id))); + $courseshortname = format_string($course->shortname, true, array('context' => context_course::instance($course->id))); $forumname = format_string($forum->name, true, array('context' => $cm->context)); $fullsubjects = array(); diff --git a/mod/forum/view.php b/mod/forum/view.php index 8601fe1bf8a54..459572f421c62 100644 --- a/mod/forum/view.php +++ b/mod/forum/view.php @@ -90,13 +90,13 @@ $PAGE->set_button(forum_search_form($course, $search)); } - $context = get_context_instance(CONTEXT_MODULE, $cm->id); + $context = context_module::instance($cm->id); $PAGE->set_context($context); if (!empty($CFG->enablerssfeeds) && !empty($CFG->forum_enablerssfeeds) && $forum->rsstype && $forum->rssarticles) { require_once("$CFG->libdir/rsslib.php"); - $rsstitle = format_string($course->shortname, true, array('context' => get_context_instance(CONTEXT_COURSE, $course->id))) . ': %fullname%'; + $rsstitle = format_string($course->shortname, true, array('context' => context_course::instance($course->id))) . ': %fullname%'; rss_add_http_header($context, 'mod_forum', $forum, $rsstitle); } diff --git a/mod/resource/lib.php b/mod/resource/lib.php index b5007847bb577..d2cf5e12e7841 100644 --- a/mod/resource/lib.php +++ b/mod/resource/lib.php @@ -234,7 +234,7 @@ function resource_get_coursemodule_info($coursemodule) { require_once("$CFG->dirroot/mod/resource/locallib.php"); require_once($CFG->libdir.'/completionlib.php'); - $context = get_context_instance(CONTEXT_MODULE, $coursemodule->id); + $context = context_module::instance($coursemodule->id); if (!$resource = $DB->get_record('resource', array('id'=>$coursemodule->instance), 'id, name, display, displayoptions, tobemigrated, revision, intro, introformat')) { @@ -455,7 +455,7 @@ function resource_page_type_list($pagetype, $parentcontext, $currentcontext) { function resource_export_contents($cm, $baseurl) { global $CFG, $DB; $contents = array(); - $context = get_context_instance(CONTEXT_MODULE, $cm->id); + $context = context_module::instance($cm->id); $resource = $DB->get_record('resource', array('id'=>$cm->instance), '*', MUST_EXIST); $fs = get_file_storage(); diff --git a/mod/resource/locallib.php b/mod/resource/locallib.php index a117614c750b9..efef5551ff10b 100644 --- a/mod/resource/locallib.php +++ b/mod/resource/locallib.php @@ -66,7 +66,7 @@ function resource_display_embed($resource, $cm, $course, $file) { $clicktoopen = resource_get_clicktoopen($file, $resource->revision); - $context = get_context_instance(CONTEXT_MODULE, $cm->id); + $context = context_module::instance($cm->id); $path = '/'.$context->id.'/mod_resource/content/'.$resource->revision.$file->get_filepath().$file->get_filename(); $fullurl = file_encode_url($CFG->wwwroot.'/pluginfile.php', $path, false); $moodleurl = new moodle_url('/pluginfile.php' . $path); @@ -132,7 +132,7 @@ function resource_display_frame($resource, $cm, $course, $file) { } else { $config = get_config('resource'); - $context = get_context_instance(CONTEXT_MODULE, $cm->id); + $context = context_module::instance($cm->id); $path = '/'.$context->id.'/mod_resource/content/'.$resource->revision.$file->get_filepath().$file->get_filename(); $fileurl = file_encode_url($CFG->wwwroot.'/pluginfile.php', $path, false); $navurl = "$CFG->wwwroot/mod/resource/view.php?id=$cm->id&frameset=top"; @@ -460,7 +460,7 @@ function resource_set_mainfile($data) { $cmid = $data->coursemodule; $draftitemid = $data->files; - $context = get_context_instance(CONTEXT_MODULE, $cmid); + $context = context_module::instance($cmid); if ($draftitemid) { file_save_draft_area_files($draftitemid, $context->id, 'mod_resource', 'content', 0, array('subdirs'=>true)); } diff --git a/mod/resource/mod_form.php b/mod/resource/mod_form.php index 7b9d6454d97e9..40be302c05369 100644 --- a/mod/resource/mod_form.php +++ b/mod/resource/mod_form.php @@ -210,7 +210,7 @@ function validation($data, $files) { $errors = parent::validation($data, $files); - $usercontext = get_context_instance(CONTEXT_USER, $USER->id); + $usercontext = context_user::instance($USER->id); $fs = get_file_storage(); if (!$files = $fs->get_area_files($usercontext->id, 'user', 'draft', $data['files'], 'sortorder, id', false)) { $errors['files'] = get_string('required'); diff --git a/mod/resource/view.php b/mod/resource/view.php index 7901843ba6568..0fb05f4660674 100644 --- a/mod/resource/view.php +++ b/mod/resource/view.php @@ -50,7 +50,7 @@ $course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST); require_course_login($course, true, $cm); -$context = get_context_instance(CONTEXT_MODULE, $cm->id); +$context = context_module::instance($cm->id); require_capability('mod/resource:view', $context); add_to_log($course->id, 'resource', 'view', 'view.php?id='.$cm->id, $resource->id, $cm->id); diff --git a/my/index.php b/my/index.php index 1324c79ab2757..dafea3f36fe8a 100644 --- a/my/index.php +++ b/my/index.php @@ -50,13 +50,13 @@ if (isguestuser()) { // Force them to see system default, no editing allowed $userid = NULL; $USER->editing = $edit = 0; // Just in case - $context = get_context_instance(CONTEXT_SYSTEM); + $context = context_system::instance(); $PAGE->set_blocks_editing_capability('moodle/my:configsyspages'); // unlikely :) $header = "$SITE->shortname: $strmymoodle (GUEST)"; } else { // We are trying to view or edit our own My Moodle page $userid = $USER->id; // Owner of the page - $context = get_context_instance(CONTEXT_USER, $USER->id); + $context = context_user::instance($USER->id); $PAGE->set_blocks_editing_capability('moodle/my:manageblocks'); $header = "$SITE->shortname: $strmymoodle"; } @@ -67,7 +67,7 @@ } if (!$currentpage->userid) { - $context = get_context_instance(CONTEXT_SYSTEM); // So we even see non-sticky blocks + $context = context_system::instance(); // So we even see non-sticky blocks } // Start setting up the page @@ -100,7 +100,7 @@ if (!$currentpage = my_copy_page($USER->id, MY_PAGE_PRIVATE)) { print_error('mymoodlesetup'); } - $context = get_context_instance(CONTEXT_USER, $USER->id); + $context = context_user::instance($USER->id); $PAGE->set_context($context); $PAGE->set_subpage($currentpage->id); } diff --git a/my/indexsys.php b/my/indexsys.php index 1289d40ecf361..ab6a91bb8bb78 100644 --- a/my/indexsys.php +++ b/my/indexsys.php @@ -43,7 +43,7 @@ require_login(); -$context = get_context_instance(CONTEXT_SYSTEM); +$context = context_system::instance(); require_capability('moodle/my:configsyspages', $context); $PAGE->set_blocks_editing_capability('moodle/my:configsyspages'); $header = "$SITE->shortname: ".get_string('myhome')." (".get_string('mypage', 'admin').")"; diff --git a/my/lib.php b/my/lib.php index 080332f1d9dae..70d4c7172a142 100644 --- a/my/lib.php +++ b/my/lib.php @@ -74,8 +74,8 @@ function my_copy_page($userid, $private=MY_PAGE_PRIVATE, $pagetype='my-index') { $page->id = $DB->insert_record('my_pages', $page); // Clone ALL the associated blocks as well - $systemcontext = get_context_instance(CONTEXT_SYSTEM); - $usercontext = get_context_instance(CONTEXT_USER, $userid); + $systemcontext = context_system::instance(); + $usercontext = context_user::instance($userid); $blockinstances = $DB->get_records('block_instances', array('parentcontextid' => $systemcontext->id, 'pagetypepattern' => $pagetype, @@ -85,7 +85,7 @@ function my_copy_page($userid, $private=MY_PAGE_PRIVATE, $pagetype='my-index') { $instance->parentcontextid = $usercontext->id; $instance->subpagepattern = $page->id; $instance->id = $DB->insert_record('block_instances', $instance); - $blockcontext = get_context_instance(CONTEXT_BLOCK, $instance->id); // Just creates the context record + $blockcontext = context_block::instance($instance->id); // Just creates the context record } // FIXME: block position overrides should be merged in with block instance @@ -110,7 +110,7 @@ class my_syspage_block_manager extends block_manager { */ public function load_blocks($includeinvisible = null) { $origcontext = $this->page->context; - $this->page->context = get_context_instance(CONTEXT_SYSTEM); + $this->page->context = context_system::instance(); parent::load_blocks($includeinvisible); $this->page->context = $origcontext; } diff --git a/notes/delete.php b/notes/delete.php index f69f103bd44ce..687daf47af281 100644 --- a/notes/delete.php +++ b/notes/delete.php @@ -27,7 +27,7 @@ require_login($course); // locate context information -$context = get_context_instance(CONTEXT_COURSE, $course->id); +$context = context_course::instance($course->id); // check capability if (!has_capability('moodle/notes:manage', $context)) { @@ -56,7 +56,7 @@ // output HTML $link = null; - if (has_capability('moodle/course:viewparticipants', $context) || has_capability('moodle/site:viewparticipants', get_context_instance(CONTEXT_SYSTEM))) { + if (has_capability('moodle/course:viewparticipants', $context) || has_capability('moodle/site:viewparticipants', context_system::instance())) { $link = new moodle_url('/user/index.php',array('id'=>$course->id)); } $PAGE->navbar->add(get_string('participants'), $link); diff --git a/notes/edit.php b/notes/edit.php index 47aeb2a945bea..05fe4f516bcf6 100644 --- a/notes/edit.php +++ b/notes/edit.php @@ -50,7 +50,7 @@ require_login($course); /// locate context information -$context = get_context_instance(CONTEXT_COURSE, $course->id); +$context = context_course::instance($course->id); require_capability('moodle/notes:manage', $context); if (empty($CFG->enablenotes)) { @@ -85,7 +85,7 @@ /// output HTML $link = null; -if (has_capability('moodle/course:viewparticipants', $context) || has_capability('moodle/site:viewparticipants', get_context_instance(CONTEXT_SYSTEM))) { +if (has_capability('moodle/course:viewparticipants', $context) || has_capability('moodle/site:viewparticipants', context_system::instance())) { $link = new moodle_url('/user/index.php',array('id'=>$course->id)); } $PAGE->navbar->add(get_string('participants'), $link); diff --git a/notes/externallib.php b/notes/externallib.php index f67104269103f..44b378f2979b6 100644 --- a/notes/externallib.php +++ b/notes/externallib.php @@ -113,7 +113,7 @@ public static function create_notes($notes = array()) { $errormessage = get_string('invalidcourseid', 'error'); } else { // Ensure the current user is allowed to run this function - $context = get_context_instance(CONTEXT_COURSE, $note['courseid']); + $context = context_course::instance($note['courseid']); self::validate_context($context); require_capability('moodle/notes:manage', $context); } diff --git a/notes/index.php b/notes/index.php index 54fdfc4320a50..62c01b9979d6f 100644 --- a/notes/index.php +++ b/notes/index.php @@ -69,15 +69,15 @@ /// output HTML if ($course->id == SITEID) { - $coursecontext = get_context_instance(CONTEXT_SYSTEM); // SYSTEM context + $coursecontext = context_system::instance(); // SYSTEM context } else { - $coursecontext = get_context_instance(CONTEXT_COURSE, $course->id); // Course context + $coursecontext = context_course::instance($course->id); // Course context } -$systemcontext = get_context_instance(CONTEXT_SYSTEM); // SYSTEM context +$systemcontext = context_system::instance(); // SYSTEM context $strnotes = get_string('notes', 'notes'); if ($userid) { - $PAGE->set_context(get_context_instance(CONTEXT_USER, $user->id)); + $PAGE->set_context(context_user::instance($user->id)); $PAGE->navigation->extend_for_user($user); } else { $link = null; @@ -106,7 +106,7 @@ if ($courseid != SITEID) { //echo '' . $strsitenotes . ' | ' . $strcoursenotes . ' | ' . $strpersonalnotes . ''; - $context = get_context_instance(CONTEXT_COURSE, $courseid); + $context = context_course::instance($courseid); $addid = has_capability('moodle/notes:manage', $context) ? $courseid : 0; $view = has_capability('moodle/notes:view', $context); $fullname = format_string($course->fullname, true, array('context' => $context)); @@ -116,17 +116,17 @@ } else { // Normal course //echo '' . $strsitenotes . ' | ' . $strcoursenotes . ''; - $view = has_capability('moodle/notes:view', get_context_instance(CONTEXT_SYSTEM)); + $view = has_capability('moodle/notes:view', context_system::instance()); note_print_notes('' . $strsitenotes, 0, $view, 0, $userid, NOTES_STATE_SITE, 0); echo ''; if (!empty($userid)) { $courses = enrol_get_users_courses($userid); foreach($courses as $c) { - $ccontext = get_context_instance(CONTEXT_COURSE, $c->id); + $ccontext = context_course::instance($c->id); $cfullname = format_string($c->fullname, true, array('context' => $ccontext)); $header = '' . $cfullname . ''; - if (has_capability('moodle/notes:manage', get_context_instance(CONTEXT_COURSE, $c->id))) { + if (has_capability('moodle/notes:manage', context_course::instance($c->id))) { $addid = $c->id; } else { $addid = 0; diff --git a/notes/lib.php b/notes/lib.php index 0744211b697eb..b20421979cba9 100644 --- a/notes/lib.php +++ b/notes/lib.php @@ -170,8 +170,8 @@ function note_print($note, $detail = NOTES_SHOW_FULL) { debugging("User $note->usermodified not found"); return; } - $context = get_context_instance(CONTEXT_COURSE, $note->courseid); - $systemcontext = get_context_instance(CONTEXT_SYSTEM); + $context = context_course::instance($note->courseid); + $systemcontext = context_system::instance(); $authoring = new stdClass(); $authoring->name = ''.fullname($author).'';