From 12d06877488d4ce35c9bf9964bb04c60f17429a2 Mon Sep 17 00:00:00 2001 From: dongsheng Date: Thu, 1 May 2008 06:07:24 +0000 Subject: [PATCH] "MDL-14460, fix get_context_instance, merged from MOODLE_19_STABLE" --- lib/datalib.php | 10 +++++----- lib/db/mysql.php | 2 +- lib/db/postgres7.php | 2 +- lib/db/upgrade.php | 2 +- lib/deprecatedlib.php | 14 +++++++------- lib/statslib.php | 4 ++-- lib/weblib.php | 8 ++++---- my/pagelib.php | 4 ++-- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/lib/datalib.php b/lib/datalib.php index cd8260a132..4816efc7aa 100644 --- a/lib/datalib.php +++ b/lib/datalib.php @@ -442,7 +442,7 @@ function get_courses($categoryid="all", $sort="c.sortorder ASC", $fields="c.*") $sqland = "AND "; } if (!empty($USER->id)) { // May need to check they are a teacher - if (!has_capability('moodle/course:create', get_context_instance(CONTEXT_SYSTEM, SITEID))) { + if (!has_capability('moodle/course:create', get_context_instance(CONTEXT_SYSTEM))) { $visiblecourses = "$sqland ((c.visible > 0) OR t.userid = '$USER->id')"; $teachertable = "LEFT JOIN {$CFG->prefix}user_teachers t ON t.course = c.id"; } @@ -543,7 +543,7 @@ function get_courses_page($categoryid="all", $sort="c.sortorder ASC", $fields="c $sqland = "AND "; } if (!empty($USER) and !empty($USER->id)) { // May need to check they are a teacher - if (!has_capability('moodle/course:create', get_context_instance(CONTEXT_SYSTEM, SITEID))) { + if (!has_capability('moodle/course:create', get_context_instance(CONTEXT_SYSTEM))) { $visiblecourses = "$sqland ((c.visible > 0) OR t.userid = '$USER->id')"; $teachertable = "LEFT JOIN {$CFG->prefix}user_teachers t ON t.course=c.id"; } @@ -815,7 +815,7 @@ function get_my_courses($userid, $sort='visible DESC,sortorder ASC', $fields=NUL global $CFG,$USER; // Guest's do not have any courses - $sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID); + $sitecontext = get_context_instance(CONTEXT_SYSTEM); if (has_capability('moodle/legacy:guest',$sitecontext,$userid,false)) { return(array()); } @@ -2135,7 +2135,7 @@ function count_login_failures($mode, $username, $lastlogin) { $select = 'module=\'login\' AND action=\'error\' AND time > '. $lastlogin; - if (has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID))) { // Return information about all accounts + if (has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM))) { // Return information about all accounts if ($count->attempts = count_records_select('log', $select)) { $count->accounts = count_records_select('log', $select, 'COUNT(DISTINCT info)'); return $count; @@ -2252,7 +2252,7 @@ function user_can_create_courses() { global $USER; // if user has course creation capability at any site or course cat, then return true; - if (has_capability('moodle/course:create', get_context_instance(CONTEXT_SYSTEM, SITEID))) { + if (has_capability('moodle/course:create', get_context_instance(CONTEXT_SYSTEM))) { return true; } else { return (bool) count(get_creatable_categories()); diff --git a/lib/db/mysql.php b/lib/db/mysql.php index d7a39f9584..3e27b02c1a 100644 --- a/lib/db/mysql.php +++ b/lib/db/mysql.php @@ -2199,7 +2199,7 @@ function main_upgrade($oldversion=0) { if (!empty($CFG->rolesactive) and $oldversion < 2006091212) { // Reload the guest roles completely with new defaults if ($guestroles = get_roles_with_capability('moodle/legacy:guest', CAP_ALLOW)) { delete_records('capabilities'); - $sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID); + $sitecontext = get_context_instance(CONTEXT_SYSTEM); foreach ($guestroles as $guestrole) { delete_records('role_capabilities', 'roleid', $guestrole->id); assign_capability('moodle/legacy:guest', CAP_ALLOW, $guestrole->id, $sitecontext->id); diff --git a/lib/db/postgres7.php b/lib/db/postgres7.php index 8e1d6cf3a7..3decbc2832 100644 --- a/lib/db/postgres7.php +++ b/lib/db/postgres7.php @@ -1798,7 +1798,7 @@ function main_upgrade($oldversion=0) { if (!empty($CFG->rolesactive) and $oldversion < 2006091212) { // Reload the guest roles completely with new defaults if ($guestroles = get_roles_with_capability('moodle/legacy:guest', CAP_ALLOW)) { delete_records('capabilities'); - $sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID); + $sitecontext = get_context_instance(CONTEXT_SYSTEM); foreach ($guestroles as $guestrole) { delete_records('role_capabilities', 'roleid', $guestrole->id); assign_capability('moodle/legacy:guest', CAP_ALLOW, $guestrole->id, $sitecontext->id); diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php index 9c7fad1149..6487ea45ad 100644 --- a/lib/db/upgrade.php +++ b/lib/db/upgrade.php @@ -881,7 +881,7 @@ function xmldb_main_upgrade($oldversion=0) { if( $defaultroleid != $userrole->id ) { // Add in the new moodle/my:manageblocks capibility to the default user role - $context = get_context_instance(CONTEXT_SYSTEM, SITEID); + $context = get_context_instance(CONTEXT_SYSTEM); assign_capability('moodle/my:manageblocks',CAP_ALLOW,$defaultroleid,$context->id); } diff --git a/lib/deprecatedlib.php b/lib/deprecatedlib.php index 0d25719fc7..32d1048ec9 100644 --- a/lib/deprecatedlib.php +++ b/lib/deprecatedlib.php @@ -119,7 +119,7 @@ function isadmin($userid=0) { return record_exists('user_admins', 'userid', $userid); } - $context = get_context_instance(CONTEXT_SYSTEM, SITEID); + $context = get_context_instance(CONTEXT_SYSTEM); return has_capability('moodle/legacy:admin', $context, $userid, false); } @@ -145,7 +145,7 @@ function isteacher($courseid=0, $userid=0, $obsolete_includeadmin=true) { if ($courseid) { $context = get_context_instance(CONTEXT_COURSE, $courseid); } else { - $context = get_context_instance(CONTEXT_SYSTEM, SITEID); + $context = get_context_instance(CONTEXT_SYSTEM); } return (has_capability('moodle/legacy:teacher', $context, $userid, false) @@ -199,7 +199,7 @@ function isteacherinanycourse($userid=0, $includeadmin=true) { /// Include admins if required if ($includeadmin) { - $context = get_context_instance(CONTEXT_SYSTEM, SITEID); + $context = get_context_instance(CONTEXT_SYSTEM); if (has_capability('moodle/legacy:admin', $context, $userid, false)) { return true; } @@ -223,7 +223,7 @@ function isteacheredit($courseid, $userid=0, $obsolete_ignorestudentview=false) } if (empty($courseid)) { - $context = get_context_instance(CONTEXT_SYSTEM, SITEID); + $context = get_context_instance(CONTEXT_SYSTEM); } else { $context = get_context_instance(CONTEXT_COURSE, $courseid); } @@ -245,7 +245,7 @@ function iscreator ($userid=0) { return false; } - $context = get_context_instance(CONTEXT_SYSTEM, SITEID); + $context = get_context_instance(CONTEXT_SYSTEM); return (has_capability('moodle/legacy:coursecreator', $context, $userid, false) or has_capability('moodle/legacy:admin', $context, $userid, false)); @@ -271,7 +271,7 @@ function isstudent($courseid=0, $userid=0) { } if ($courseid == 0) { - $context = get_context_instance(CONTEXT_SYSTEM, SITEID); + $context = get_context_instance(CONTEXT_SYSTEM); } else { $context = get_context_instance(CONTEXT_COURSE, $courseid); } @@ -355,7 +355,7 @@ function unenrol_student($userid, $courseid=0) { } /// remove from all legacy student roles if ($courseid == SITEID) { - $context = get_context_instance(CONTEXT_SYSTEM, SITEID); + $context = get_context_instance(CONTEXT_SYSTEM); } else if (!$context = get_context_instance(CONTEXT_COURSE, $courseid)) { return false; } diff --git a/lib/statslib.php b/lib/statslib.php index 77b9695afd..92b21fb194 100644 --- a/lib/statslib.php +++ b/lib/statslib.php @@ -1304,13 +1304,13 @@ function stats_get_report_options($courseid,$mode) { case STATS_MODE_DETAILED: $reportoptions[STATS_REPORT_USER_ACTIVITY] = get_string('statsreport'.STATS_REPORT_USER_ACTIVITY); $reportoptions[STATS_REPORT_USER_ALLACTIVITY] = get_string('statsreport'.STATS_REPORT_USER_ALLACTIVITY); - if (has_capability('moodle/site:viewreports', get_context_instance(CONTEXT_SYSTEM, SITEID))) { + if (has_capability('moodle/site:viewreports', get_context_instance(CONTEXT_SYSTEM))) { $site = get_site(); $reportoptions[STATS_REPORT_USER_LOGINS] = get_string('statsreport'.STATS_REPORT_USER_LOGINS); } break; case STATS_MODE_RANKED: - if (has_capability('moodle/site:viewreports', get_context_instance(CONTEXT_SYSTEM, SITEID))) { + if (has_capability('moodle/site:viewreports', get_context_instance(CONTEXT_SYSTEM))) { $reportoptions[STATS_REPORT_ACTIVE_COURSES] = get_string('statsreport'.STATS_REPORT_ACTIVE_COURSES); $reportoptions[STATS_REPORT_ACTIVE_COURSES_WEIGHTED] = get_string('statsreport'.STATS_REPORT_ACTIVE_COURSES_WEIGHTED); $reportoptions[STATS_REPORT_PARTICIPATORY_COURSES] = get_string('statsreport'.STATS_REPORT_PARTICIPATORY_COURSES); diff --git a/lib/weblib.php b/lib/weblib.php index c3b1a271e8..75fc71ebe6 100644 --- a/lib/weblib.php +++ b/lib/weblib.php @@ -2499,7 +2499,7 @@ function print_header ($title='', $heading='', $navigation='', $focus='', } else { $menu .= get_string('failedloginattemptsall', '', $count); } - if (has_capability('moodle/site:viewreports', get_context_instance(CONTEXT_SYSTEM, SITEID))) { + if (has_capability('moodle/site:viewreports', get_context_instance(CONTEXT_SYSTEM))) { $menu .= ' ('.get_string('logs').')'; } @@ -4802,7 +4802,7 @@ function print_recent_activity_note($time, $user, $text, $link, $return=false, $ $output = ''; if (is_null($viewfullnames)) { - $context = get_context_instance(CONTEXT_SYSTEM, SITEID); + $context = get_context_instance(CONTEXT_SYSTEM); $viewfullnames = has_capability('moodle/site:viewfullnames', $context); } @@ -5195,7 +5195,7 @@ function update_category_button($categoryid) { function update_categories_button() { global $CFG, $USER; - if (has_capability('moodle/category:update', get_context_instance(CONTEXT_SYSTEM, SITEID))) { + if (has_capability('moodle/category:update', get_context_instance(CONTEXT_SYSTEM))) { if (!empty($USER->categoryediting)) { $string = get_string('turneditingoff'); $categoryedit = 'off'; @@ -5221,7 +5221,7 @@ function update_categories_search_button($search,$page,$perpage) { global $CFG, $USER; // not sure if this capability is the best here - if (has_capability('moodle/category:update', get_context_instance(CONTEXT_SYSTEM, SITEID))) { + if (has_capability('moodle/category:update', get_context_instance(CONTEXT_SYSTEM))) { if (!empty($USER->categoryediting)) { $string = get_string("turneditingoff"); $edit = "off"; diff --git a/my/pagelib.php b/my/pagelib.php index 1789ac0936..3366ddc51d 100644 --- a/my/pagelib.php +++ b/my/pagelib.php @@ -12,7 +12,7 @@ class page_my_moodle extends page_base { page_id_and_class($id,$class); if ($id == PAGE_MY_MOODLE) { return true; - } else if (has_capability('moodle/my:manageblocks', get_context_instance(CONTEXT_SYSTEM, SITEID)) && defined('ADMIN_STICKYBLOCKS')) { + } else if (has_capability('moodle/my:manageblocks', get_context_instance(CONTEXT_SYSTEM)) && defined('ADMIN_STICKYBLOCKS')) { return true; } return false; @@ -20,7 +20,7 @@ class page_my_moodle extends page_base { function user_is_editing() { global $USER; - if (has_capability('moodle/my:manageblocks', get_context_instance(CONTEXT_SYSTEM, SITEID)) && defined('ADMIN_STICKYBLOCKS')) { + if (has_capability('moodle/my:manageblocks', get_context_instance(CONTEXT_SYSTEM)) && defined('ADMIN_STICKYBLOCKS')) { return true; } return (!empty($USER->editing)); -- 2.39.5