From 8ead7b59831728e430b98cad1a465ca984e217cf Mon Sep 17 00:00:00 2001 From: skodak Date: Mon, 4 May 2009 20:23:20 +0000 Subject: [PATCH] MDL-19009 cleanup - there is no CONTEXT_GROUP and pinned block context --- admin/roles/tabs.php | 3 --- lib/accesslib.php | 42 ++---------------------------------------- 2 files changed, 2 insertions(+), 43 deletions(-) diff --git a/admin/roles/tabs.php b/admin/roles/tabs.php index 86194b87e1e..e2921311909 100755 --- a/admin/roles/tabs.php +++ b/admin/roles/tabs.php @@ -99,9 +99,6 @@ if ($currenttab != 'update') { } break; - case CONTEXT_GROUP: - break; - case CONTEXT_MODULE: if (!$cm = get_coursemodule_from_id('', $context->instanceid)) { print_error('invalidcoursemodule', 'error'); diff --git a/lib/accesslib.php b/lib/accesslib.php index 21125fa9328..2ded5fb2b6e 100755 --- a/lib/accesslib.php +++ b/lib/accesslib.php @@ -142,7 +142,6 @@ define('CONTEXT_SYSTEM', 10); define('CONTEXT_USER', 30); define('CONTEXT_COURSECAT', 40); define('CONTEXT_COURSE', 50); -define('CONTEXT_GROUP', 60); define('CONTEXT_MODULE', 70); define('CONTEXT_BLOCK', 80); @@ -2363,13 +2362,6 @@ function cleanup_contexts() { LEFT OUTER JOIN {block_instance} t ON c.instanceid = t.id WHERE t.id IS NULL AND c.contextlevel = ".CONTEXT_BLOCK." - UNION - SELECT c.contextlevel, - c.instanceid - FROM {context} c - LEFT OUTER JOIN {groups} t - ON c.instanceid = t.id - WHERE t.id IS NULL AND c.contextlevel = ".CONTEXT_GROUP." "; if ($rs = $DB->get_recordset_sql($sql)) { $DB->begin_sql(); @@ -2446,7 +2438,7 @@ function preload_course_contexts($courseid) { function get_context_instance($contextlevel, $instance=0) { global $DB, $ACCESSLIB_PRIVATE; - static $allowed_contexts = array(CONTEXT_SYSTEM, CONTEXT_USER, CONTEXT_COURSECAT, CONTEXT_COURSE, CONTEXT_GROUP, CONTEXT_MODULE, CONTEXT_BLOCK); + static $allowed_contexts = array(CONTEXT_SYSTEM, CONTEXT_USER, CONTEXT_COURSECAT, CONTEXT_COURSE, CONTEXT_MODULE, CONTEXT_BLOCK); if ($contextlevel === 'clearcache') { // TODO: Remove for v2.0 @@ -3422,14 +3414,6 @@ function print_context_name($context, $withprefix = true, $short = false) { } break; - case CONTEXT_GROUP: // 1 to 1 to course - if ($name = groups_get_group_name($context->instanceid)) { - if ($withprefix){ - $name = get_string('group').': '. $name; - } - } - break; - case CONTEXT_MODULE: // 1 to 1 to course if ($cm = $DB->get_record_sql('SELECT cm.*, md.name AS modname FROM {course_modules} cm ' . 'JOIN {modules} md ON md.id = cm.module WHERE cm.id = ?', array($context->instanceid))) { @@ -3508,7 +3492,6 @@ function get_context_url($context) { break; case CONTEXT_SYSTEM: - case CONTEXT_GROUP: case CONTEXT_BLOCK: default: $url = ''; @@ -3814,31 +3797,14 @@ function get_child_contexts($context) { return array(); break; - case CONTEXT_GROUP: - // No children. - return array(); - break; - case CONTEXT_COURSE: // Find // - module instances - easy - // - groups // - blocks assigned to the course-view page explicitly - easy - // - blocks pinned (note! we get all of them here, regardless of vis) $sql = " SELECT ctx.* FROM {context} ctx WHERE ctx.path LIKE ? - AND ctx.contextlevel IN (".CONTEXT_MODULE.",".CONTEXT_BLOCK.") - UNION - SELECT ctx.* - FROM {context} ctx - JOIN {groups} g ON (ctx.instanceid=g.id AND ctx.contextlevel=".CONTEXT_GROUP.") - WHERE g.courseid=? - UNION - SELECT ctx.* - FROM {context} ctx - JOIN {block_pinned} b ON (ctx.instanceid=b.blockid AND ctx.contextlevel=".CONTEXT_BLOCK.") - WHERE b.pagetype='course-view'"; + AND ctx.contextlevel IN (".CONTEXT_MODULE.",".CONTEXT_BLOCK.")"; $params = array("{$context->path}/%", $context->instanceid); $records = $DB->get_recordset_sql($sql, $params); foreach ($records as $rec) { @@ -4034,10 +4000,6 @@ function get_component_string($component, $contextlevel) { } break; - case CONTEXT_GROUP: - $string = get_string('group'); - break; - case CONTEXT_MODULE: if (preg_match('|^quizreport/([a-z_]*)|', $component, $matches)){ $langname = 'quiz_'.$matches[1];