L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-19009 cleanup - there is no CONTEXT_GROUP and pinned block context; backported from HEAD

Browse Source
This commit is contained in:
skodak
2009-05-04 20:24:45 +00:00
parent 45c3dd8fce
commit 400688352e
3 changed files with 1 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/accesslib.php
+1 -40
View File
@@ -141,7 +141,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);
@@ -2420,13 +2419,6 @@ function cleanup_contexts() {
LEFT OUTER JOIN {$CFG->prefix}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 {$CFG->prefix}context c
LEFT OUTER JOIN {$CFG->prefix}groups t
ON c.instanceid = t.id
WHERE t.id IS NULL AND c.contextlevel = " . CONTEXT_GROUP . "
";
if ($rs = get_recordset_sql($sql)) {
begin_sql();
@@ -2502,7 +2494,7 @@ function preload_course_contexts($courseid) {
function get_context_instance($contextlevel, $instance=0) {
global $context_cache, $context_cache_id, $CFG;
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
@@ -3475,14 +3467,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 = get_record('course_modules','id',$context->instanceid)) {
if ($module = get_record('modules','id',$cm->module)) {
@@ -3771,33 +3755,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 {$CFG->prefix}context ctx
WHERE ctx.path LIKE '{$context->path}/%'
AND ctx.contextlevel IN (".CONTEXT_MODULE.",".CONTEXT_BLOCK.")
UNION
SELECT ctx.*
FROM {$CFG->prefix}context ctx
JOIN {$CFG->prefix}groups g
ON (ctx.instanceid=g.id AND ctx.contextlevel=".CONTEXT_GROUP.")
WHERE g.courseid={$context->instanceid}
UNION
SELECT ctx.*
FROM {$CFG->prefix}context ctx
JOIN {$CFG->prefix}block_pinned b
ON (ctx.instanceid=b.blockid AND ctx.contextlevel=".CONTEXT_BLOCK.")
WHERE b.pagetype='course-view'
";
$rs = get_recordset_sql($sql);
$records = array();
@@ -3994,10 +3959,6 @@ function get_component_string($component, $contextlevel) {
}
break;
case CONTEXT_GROUP:
$string = get_string('group');
break;
case CONTEXT_MODULE:
$string = get_string('modulename', basename($component));
break;