From 47af2e43f301162bcbaa41fe9b8817e0963a522c Mon Sep 17 00:00:00 2001 From: skodak Date: Sun, 23 Dec 2007 19:48:32 +0000 Subject: [PATCH] MDL-12720 removing confusing/not implemented CONTEXT_PERSONAL; merged from MOODLE_19_STABLE --- admin/roles/tabs.php | 3 --- lib/accesslib.php | 23 +---------------------- 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/admin/roles/tabs.php b/admin/roles/tabs.php index 91eac25ddb..e1549b4f81 100755 --- a/admin/roles/tabs.php +++ b/admin/roles/tabs.php @@ -19,9 +19,6 @@ if ($currenttab != 'update') { print_header($SITE->fullname, "$SITE->fullname", $navigation); break; - case CONTEXT_PERSONAL: - break; - case CONTEXT_USER: print_header(); break; diff --git a/lib/accesslib.php b/lib/accesslib.php index 7464aa2a0d..2069fe501d 100755 --- a/lib/accesslib.php +++ b/lib/accesslib.php @@ -137,7 +137,6 @@ define('CAP_PROHIBIT', -1000); // context definitions define('CONTEXT_SYSTEM', 10); -define('CONTEXT_PERSONAL', 20); define('CONTEXT_USER', 30); define('CONTEXT_COURSECAT', 40); define('CONTEXT_COURSE', 50); @@ -2226,9 +2225,6 @@ function create_context($contextlevel, $instanceid) { case CONTEXT_USER: // default to basepath break; - case CONTEXT_PERSONAL: - // default to basepath - break; } // if grandparents unknown, maybe rebuild_context_path() will solve it later @@ -2497,7 +2493,7 @@ function cleanup_contexts() { function get_context_instance($contextlevel, $instance=0) { global $context_cache, $context_cache_id; - static $allowed_contexts = array(CONTEXT_SYSTEM, CONTEXT_PERSONAL, 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_GROUP, CONTEXT_MODULE, CONTEXT_BLOCK); if ($contextlevel === 'clearcache') { // TODO: Remove for v2.0 @@ -3369,10 +3365,6 @@ function print_context_name($context, $withprefix = true, $short = false) { $name = get_string('coresystem'); break; - case CONTEXT_PERSONAL: - $name = get_string('personal'); - break; - case CONTEXT_USER: if ($user = get_record('user', 'id', $context->instanceid)) { if ($withprefix){ @@ -3482,10 +3474,6 @@ function fetch_context_capabilities($context) { $SQL = "select * from {$CFG->prefix}capabilities"; break; - case CONTEXT_PERSONAL: - $SQL = "select * from {$CFG->prefix}capabilities where contextlevel = ".CONTEXT_PERSONAL; - break; - case CONTEXT_USER: $SQL = "SELECT * FROM {$CFG->prefix}capabilities @@ -3740,11 +3728,6 @@ function get_child_contexts($context) { return array(); break; - case CONTEXT_PERSONAL: - // No children. - return array(); - break; - case CONTEXT_SYSTEM: // Just get all the contexts except for CONTEXT_SYSTEM level // and hope we don't OOM in the process - don't cache @@ -3852,10 +3835,6 @@ function get_component_string($component, $contextlevel) { } break; - case CONTEXT_PERSONAL: - $string = get_string('personal'); - break; - case CONTEXT_USER: $string = get_string('users'); break; -- 2.39.5