Rename CONTEXT_USERID --> CONTEXT_USER for consistency

diff --git a/admin/roles/assign.php b/admin/roles/assign.php
index 105dcc57658b4cf1ec1a0dc3b8e37d706c5a71ee..6dc894dde41174c217fc06e1166bac9df0bd6990 100755 (executable)
--- a/admin/roles/assign.php
+++ b/admin/roles/assign.php
@@ -63,7 +63,7 @@
 
 /// Print the header and tabs
 
-    if ($context->aggregatelevel == CONTEXT_USERID) {
+    if ($context->aggregatelevel == CONTEXT_USER) {
         /// course header
         if ($courseid!= SITEID) {
             print_header("$fullname", "$fullname",

diff --git a/admin/roles/override.php b/admin/roles/override.php
index 7b1d8c55089fced430b0c8e3188731fc14f759e9..a69609b6cc2d30ad22c7a70397d7df3a4823d594 100755 (executable)
--- a/admin/roles/override.php
+++ b/admin/roles/override.php
@@ -48,7 +48,7 @@
     
     
     // we got a few tabs there
-    if ($context->aggregatelevel == CONTEXT_USERID) {
+    if ($context->aggregatelevel == CONTEXT_USER) {
       
         /// course header
         if ($courseid!= SITEID) {

diff --git a/admin/roles/tabs.php b/admin/roles/tabs.php
index 4c5b825b5fc8f82f4132c3003ec5d57f8d465fb9..c2d8c5780cabf46ec12514089c25f06ca32c9f0d 100755 (executable)
--- a/admin/roles/tabs.php
+++ b/admin/roles/tabs.php
@@ -13,7 +13,7 @@ if ($currenttab != 'update') {
         case CONTEXT_PERSONAL:
             break;
 
-        case CONTEXT_USERID:
+        case CONTEXT_USER:
             print_header();
             break;
 

diff --git a/blog/index.php b/blog/index.php
index 323761736e087d4f2146dd34a8f4ff81827a49c5..430cbbf61ef7b22b23e41e2932fd20f9935f99ea 100755 (executable)
--- a/blog/index.php
+++ b/blog/index.php
@@ -115,7 +115,7 @@ switch ($filtertype) {
         /// check if user is editting teacher, or if spg, is member
     break;
     case 'user':
-        $context = get_context_instance(CONTEXT_USERID, $userid);
+        $context = get_context_instance(CONTEXT_USER, $userid);
         if ($CFG->bloglevel < BLOG_USER_LEVEL) {
             error ('Blogs is not enabled');
         }
@@ -160,4 +160,4 @@ add_to_log($courseid, 'blog', 'view', 'index.php?filtertype='.$filtertype.'&amp;
 include($CFG->dirroot .'/blog/footer.php');
 
 
-?>
\ No newline at end of file
+?>

diff --git a/course/user.php b/course/user.php
index ce5974298495e5b33e1aca0f9360ae83f01334a6..c8267d04b712d987e8f27e60345eaa9634822fda 100644 (file)
--- a/course/user.php
+++ b/course/user.php
@@ -24,7 +24,7 @@
     }
 
     $coursecontext = get_context_instance(CONTEXT_COURSE, $id);
-    $personalcontext = get_context_instance(CONTEXT_USERID, $user->id);
+    $personalcontext = get_context_instance(CONTEXT_USER, $user->id);
 
     // if in either context, we can read report, then we can proceed
     if (!(has_capability('moodle/site:viewreports', $coursecontext) or ($course->showreports and $USER->id == $user->id) or has_capability('moodle/user:viewuseractivitiesreport', $personalcontext))) {

diff --git a/lib/accesslib.php b/lib/accesslib.php
index 10a4ef6f2ce7bcd8b07f1fc9d08bd639e5c00267..420b8aae1f99f351c502fdbf14bfdad0351aabf9 100755 (executable)
--- a/lib/accesslib.php
+++ b/lib/accesslib.php
@@ -23,7 +23,7 @@ define('CAP_PROHIBIT', -1000);
 // context definitions
 define('CONTEXT_SYSTEM', 10);
 define('CONTEXT_PERSONAL', 20);
-define('CONTEXT_USERID', 30);
+define('CONTEXT_USER', 30);
 define('CONTEXT_COURSECAT', 40);
 define('CONTEXT_COURSE', 50);
 define('CONTEXT_GROUP', 60);
@@ -381,7 +381,7 @@ function has_capability($capability, $context=NULL, $userid=NULL, $doanything=tr
             break;
 
             default:
-                // CONTEXT_SYSTEM: CONTEXT_PERSONAL: CONTEXT_USERID:
+                // CONTEXT_SYSTEM: CONTEXT_PERSONAL: CONTEXT_USER:
                 // Do nothing.
             break;
         }
@@ -428,7 +428,7 @@ function capability_search($capability, $context, $capabilities) {
             $permission = capability_search($capability, $parentcontext, $capabilities);
         break;
 
-        case CONTEXT_USERID:
+        case CONTEXT_USER:
             $parentcontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
             $permission = capability_search($capability, $parentcontext, $capabilities);
         break;
@@ -746,7 +746,7 @@ function capability_prohibits($capability, $context, $sum='', $array='') {
             return capability_prohibits($capability, $parent);
         break;
 
-        case CONTEXT_USERID:
+        case CONTEXT_USER:
             $parent = get_context_instance(CONTEXT_SYSTEM, SITEID);
             return capability_prohibits($capability, $parent);
         break;
@@ -1690,7 +1690,7 @@ function print_context_name($context) {
             $name = get_string('personal');
             break;
 
-        case CONTEXT_USERID:
+        case CONTEXT_USER:
             if ($user = get_record('user', 'id', $context->instanceid)) {
                 $name = get_string('user').': '.fullname($user);
             }
@@ -1777,8 +1777,8 @@ function fetch_context_capabilities($context) {
             $SQL = "select * from {$CFG->prefix}capabilities where contextlevel = ".CONTEXT_PERSONAL;
         break;
         
-        case CONTEXT_USERID:
-            $SQL = "select * from {$CFG->prefix}capabilities where contextlevel = ".CONTEXT_USERID;
+        case CONTEXT_USER:
+            $SQL = "select * from {$CFG->prefix}capabilities where contextlevel = ".CONTEXT_USER;
         break;
         
         case CONTEXT_COURSECAT: // all
@@ -1905,7 +1905,7 @@ function get_parent_contexts($context) {
             }
         break;
         
-        case CONTEXT_USERID:
+        case CONTEXT_USER:
             if (!$parent = get_context_instance(CONTEXT_SYSTEM, SITEID)) {
                 return array();
             } else {
@@ -2064,7 +2064,7 @@ function get_component_string($component, $contextlevel) {
             $string = get_string('personal');
         break;
 
-        case CONTEXT_USERID:
+        case CONTEXT_USER:
             $string = get_string('users');
         break;
 

diff --git a/lib/db/access.php b/lib/db/access.php
index 41bda78c83079e5fa6666fba3f5e0a14cb658d52..190a785feb44f9a07082af64b86b11aea7212a7c 100644 (file)
--- a/lib/db/access.php
+++ b/lib/db/access.php
@@ -735,7 +735,7 @@ $moodle_capabilities = array(
     // since the next level up is site. These are more for the parent role
     'moodle/user:readuserposts' => array(
         'captype' => 'read',
-        'contextlevel' => CONTEXT_USERID,
+        'contextlevel' => CONTEXT_USER,
         'legacy' => array(
             'guest' => CAP_PREVENT,
             'student' => CAP_ALLOW,
@@ -748,7 +748,7 @@ $moodle_capabilities = array(
     
     'moodle/user:readuserblogs' => array(
         'captype' => 'read',
-        'contextlevel' => CONTEXT_USERID,
+        'contextlevel' => CONTEXT_USER,
         'legacy' => array(
             'guest' => CAP_PREVENT,
             'student' => CAP_ALLOW,
@@ -761,7 +761,7 @@ $moodle_capabilities = array(
     
     'moodle/user:viewuseractivitiesreport' => array(
         'captype' => 'read',
-        'contextlevel' => CONTEXT_USERID,
+        'contextlevel' => CONTEXT_USER,
         'legacy' => array(
             'guest' => CAP_PREVENT,
             'student' => CAP_PREVENT,
@@ -774,7 +774,7 @@ $moodle_capabilities = array(
     
     'moodle/user:editprofile' => array(
         'captype' => 'read',
-        'contextlevel' => CONTEXT_USERID,
+        'contextlevel' => CONTEXT_USER,
         'legacy' => array(
             'guest' => CAP_PREVENT,
             'student' => CAP_PREVENT,

diff --git a/user/tabs.php b/user/tabs.php
index 73f66e83a79a70989b0000d16a4b701e381200aa..5ef6324415b1f9836a6433bc47dd7c0d17b2639f 100644 (file)
--- a/user/tabs.php
+++ b/user/tabs.php
@@ -89,14 +89,14 @@
 
         $toprow[] = new tabobject('profile', $CFG->wwwroot.'/user/view.php?id='.$user->id.'&course='.$course->id, get_string('profile'));
 
-        $personalcontext = get_context_instance(CONTEXT_USERID, $user->id);
+        $personalcontext = get_context_instance(CONTEXT_USER, $user->id);
     /// Can only edit profile if it belongs to user or current user is admin and not editing primary admin
 
         if (($mainadmin = get_admin()) === false) {
             $mainadmin->id = 0; /// Weird - no primary admin!
         }
         if ((!empty($USER->id) and ($USER->id == $user->id) and !isguest()) or
-            (has_capability('moodle/user:editprofile', get_context_instance(CONTEXT_USERID, $user->id)) and ($user->id != $mainadmin->id)) ) {
+            (has_capability('moodle/user:editprofile', get_context_instance(CONTEXT_USER, $user->id)) and ($user->id != $mainadmin->id)) ) {
 
             if(empty($CFG->loginhttps)) {
                 $wwwroot = $CFG->wwwroot;
@@ -176,7 +176,7 @@
     /// this needs permission checkings
 
     if (!empty($showroles)) { // this variable controls whether this roles is showed, or not, so only user/view page should set this flag
-        $usercontext = get_context_instance(CONTEXT_USERID, $user->id);
+        $usercontext = get_context_instance(CONTEXT_USER, $user->id);
         $toprow[] = new tabobject('roles', $CFG->wwwroot.'/admin/roles/assign.php?contextid='.$usercontext->id.'&userid='.$user->id.'&courseid='.$course->id
                               ,get_string('roles'));