"MDL-14460, fix all the other get_context_instance, merged from MOODLE_19_STABLE"

diff --git a/admin/dbperformance.php b/admin/dbperformance.php
index e3080608ce192236a972acd8b234523c460455c7..648a2ec8c957a43d4612dd7c4015996e29c43dfa 100644 (file)
--- a/admin/dbperformance.php
+++ b/admin/dbperformance.php
@@ -12,7 +12,7 @@
 
     require_login();
 
-    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
+    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
 
     $strdatabaseperformance = get_string("databaseperformance");
     $stradministration = get_string("administration");

diff --git a/admin/delete.php b/admin/delete.php
index afc7ea9933e11e88fb1f8ba2a48f063cc08ce5fc..55f52c8e09dd6b9625999abf704c89bbde5c1f0a 100644 (file)
--- a/admin/delete.php
+++ b/admin/delete.php
@@ -13,7 +13,7 @@
     $sure       = optional_param('sure', 0, PARAM_BOOL);
     $reallysure = optional_param('reallysure', 0, PARAM_BOOL);
 
-    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
+    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
 
     $deletedir = $CFG->dataroot;   // The directory to delete!
 

diff --git a/admin/health.php b/admin/health.php
index 4ad667da05c586957500ae606e9019a4196f6669..e9fe728ed776ab017b2f8f5fa61d99f8ae8d86e8 100644 (file)
--- a/admin/health.php
+++ b/admin/health.php
@@ -24,7 +24,7 @@
     $solution = optional_param('solution', 0, PARAM_SAFEDIR); //in fact it is class name alhanumeric and _
 
     require_login();
-    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
+    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
 
     $site = get_site();
 

diff --git a/admin/index.php b/admin/index.php
index 3800408e82967c0c43a1f121bd2f9534fc0443f6..1ed262cb73e9302fd4d518f9db7ede8ef54d0fff 100644 (file)
--- a/admin/index.php
+++ b/admin/index.php
@@ -545,7 +545,7 @@
 /// Check for valid admin user - no guest autologin
     require_login(0, false);
 
-    $context = get_context_instance(CONTEXT_SYSTEM, SITEID);
+    $context = get_context_instance(CONTEXT_SYSTEM);
 
     require_capability('moodle/site:config', $context);
 

diff --git a/admin/innodb.php b/admin/innodb.php
index 77cbe205141c9a7e119d8da054b8f3d0606ad0f2..e7d82ac2b4462706d2b5b0fbe78a45936cfa22ad 100644 (file)
--- a/admin/innodb.php
+++ b/admin/innodb.php
@@ -9,7 +9,7 @@
 
    require_login();
 
-   require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
+   require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
 
    admin_externalpage_print_header();
    print_heading('Convert all MySQL tables from MYISAM to InnoDB');

diff --git a/admin/lang.php b/admin/lang.php
index 84930877dfcf3cbf35092f8384b15486eb7182c7..43157369cfca4ce7f415be88738030134992df65 100644 (file)
--- a/admin/lang.php
+++ b/admin/lang.php
@@ -14,7 +14,7 @@
 
     admin_externalpage_setup('langedit');
 
-    $context = get_context_instance(CONTEXT_SYSTEM, SITEID);
+    $context = get_context_instance(CONTEXT_SYSTEM);
 
     define('LANG_SUBMIT_REPEAT', 1);            // repeat displaying submit button?
     define('LANG_SUBMIT_REPEAT_EVERY', 20);     // if so, after how many lines?

diff --git a/admin/pagelib.php b/admin/pagelib.php
index 7870020e6f6358c4527c18c9eb96ac01f40a7cf5..971ae09d3d31bcc7f5c32c436430f01b5b8ffb2a 100644 (file)
--- a/admin/pagelib.php
+++ b/admin/pagelib.php
@@ -51,7 +51,7 @@ class page_admin extends page_base {
     // seems reasonable that the only people that can edit blocks on the admin pages
     // are the admins... but maybe we want a role for this?
     function user_allowed_editing() {
-        return has_capability('moodle/site:manageblocks', get_context_instance(CONTEXT_SYSTEM, SITEID));
+        return has_capability('moodle/site:manageblocks', get_context_instance(CONTEXT_SYSTEM));
     }
 
     // has to be fixed. i know there's a "proper" way to do this

diff --git a/admin/register.php b/admin/register.php
index bb0ce1726659524893c31537238e81e1669557c7..f213c6322ed7e0c25ab9265fe95c36089bd25ec9 100644 (file)
--- a/admin/register.php
+++ b/admin/register.php
@@ -5,7 +5,7 @@
 
     require_login();
 
-    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
+    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
 
     if (!$site = get_site()) {
         redirect("index.php");

diff --git a/admin/report/backups/index.php b/admin/report/backups/index.php
index 4591676982a78a1878d179dbc1cbf7d5a978c917..a332670fc0eee5166ce397a9da98eb891658c292 100644 (file)
--- a/admin/report/backups/index.php
+++ b/admin/report/backups/index.php
@@ -11,7 +11,7 @@
 
     $courseid = optional_param('courseid', 0, PARAM_INT);
 
-    require_capability('moodle/site:backup', get_context_instance(CONTEXT_SYSTEM, SITEID));
+    require_capability('moodle/site:backup', get_context_instance(CONTEXT_SYSTEM));
 
 /// Scheduled backups are disabled by the server admin
     if (!empty($CFG->disablescheduledbackups)) {

diff --git a/admin/report/courseoverview/index.php b/admin/report/courseoverview/index.php
index 7bbd95c4911119e65f343338ff8a39074b5b6c35..3977d3ab9692718796b0afb2c01bfb07dbbb41aa 100644 (file)
--- a/admin/report/courseoverview/index.php
+++ b/admin/report/courseoverview/index.php
@@ -12,7 +12,7 @@
     $time       = optional_param('time', 0, PARAM_INT);
     $numcourses = optional_param('numcourses', 20, PARAM_INT);
 
-    require_capability('moodle/site:viewreports', get_context_instance(CONTEXT_SYSTEM, SITEID));  // needed?
+    require_capability('moodle/site:viewreports', get_context_instance(CONTEXT_SYSTEM));  // needed?
 
     if (empty($CFG->enablestats)) {
         redirect("$CFG->wwwroot/$CFG->admin/settings.php?section=stats", get_string('mustenablestats', 'admin'), 3);

diff --git a/admin/report/simpletest/index.php b/admin/report/simpletest/index.php
index 974966e419605bd0398a7a5640b66431ac02ca42..635a7f66f14527dfed0fdae41ee6689eaad91ae3 100644 (file)
--- a/admin/report/simpletest/index.php
+++ b/admin/report/simpletest/index.php
@@ -17,7 +17,7 @@ require_once('ex_simple_test.php');
 require_once('ex_reporter.php');
 
 require_login();
-require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
+require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
 
 /* The UNITTEST constant can be checked elsewhere if you need to know
  * when your code is being run as part of a unit test. */

diff --git a/admin/roles/allowassign.php b/admin/roles/allowassign.php
index 0827a6a1b4c9ba8c59c6a94793177a1330aba30f..5657b0a230c33153645a62ca61eea36f642064f7 100755 (executable)
--- a/admin/roles/allowassign.php
+++ b/admin/roles/allowassign.php
@@ -13,7 +13,7 @@
     admin_externalpage_setup('defineroles');
 
 
-    $sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
+    $sitecontext = get_context_instance(CONTEXT_SYSTEM);
     require_capability('moodle/role:manage', $sitecontext);
 
 /// form processiong here

diff --git a/admin/roles/allowoverride.php b/admin/roles/allowoverride.php
index 17c28c68c6278a110fb1e3db2913bc638bfb2540..4bb41fe5997445cd39f22c1b8be9c1db9ed9fb0f 100755 (executable)
--- a/admin/roles/allowoverride.php
+++ b/admin/roles/allowoverride.php
@@ -11,7 +11,7 @@
     admin_externalpage_setup('defineroles');
 
 
-    $sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
+    $sitecontext = get_context_instance(CONTEXT_SYSTEM);
     require_capability('moodle/role:manage', $sitecontext);
 
 /// form processiong here

diff --git a/admin/stickyblocks.php b/admin/stickyblocks.php
index 9c6103e8bb67c44d570140a2d5765d12950c5146..c2aefae6e9a1cf8e9cf9c793ab7c5648a56632d8 100644 (file)
--- a/admin/stickyblocks.php
+++ b/admin/stickyblocks.php
@@ -24,7 +24,7 @@
 
     require_login();
 
-    require_capability('moodle/site:manageblocks', get_context_instance(CONTEXT_SYSTEM, SITEID));
+    require_capability('moodle/site:manageblocks', get_context_instance(CONTEXT_SYSTEM));
 
     // first thing to do is print the dropdown menu
 

diff --git a/admin/timezone.php b/admin/timezone.php
index 73a9d24e6cb87ea15a3fffd031535d8ea6182579..94993cc644ecc97b2f09bd07083958838851f370 100644 (file)
--- a/admin/timezone.php
+++ b/admin/timezone.php
@@ -6,7 +6,7 @@
 
     require_login();
 
-    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
+    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
 
     $strtimezone = get_string("timezone");
     $strsavechanges = get_string("savechanges");

diff --git a/admin/uploadpicture.php b/admin/uploadpicture.php
index e39111e1029b62a539efc6af0f284166cca42f28..54aace9d457257092f6db5ec9151b7f5fd446b96 100644 (file)
--- a/admin/uploadpicture.php
+++ b/admin/uploadpicture.php
@@ -32,7 +32,7 @@ admin_externalpage_setup('uploadpictures', $adminroot);
 
 require_login();
 
-require_capability('moodle/site:uploadusers', get_context_instance(CONTEXT_SYSTEM, SITEID));
+require_capability('moodle/site:uploadusers', get_context_instance(CONTEXT_SYSTEM));
 
 if (!$site = get_site()) {
     print_error('cannotfindsite', 'error');

diff --git a/admin/xmldb/index.php b/admin/xmldb/index.php
index 58964ccccf686a2d805fdad3335b9da9c8c9eec6..88ceae5a1d6b09dc609b93fb649a387325474f19 100644 (file)
--- a/admin/xmldb/index.php
+++ b/admin/xmldb/index.php
@@ -79,7 +79,7 @@
     }
 
     require_login();
-    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
+    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
 
 /// Body of the script, based on action, we delegate the work
     $action = optional_param ('action', 'main_view', PARAM_ALPHAEXT);

diff --git a/auth/mnet/auth.php b/auth/mnet/auth.php
index d9e89e167c4224f543510e0db938f45c1188584c..2381ca70fe8318af93b5c27ecd150ba1f2c788f8 100644 (file)
--- a/auth/mnet/auth.php
+++ b/auth/mnet/auth.php
@@ -171,7 +171,7 @@ class auth_plugin_mnet extends auth_plugin_base {
         require_once $CFG->dirroot . '/mnet/xmlrpc/client.php';
 
         // check remote login permissions
-        if (! has_capability('moodle/site:mnetlogintoremote', get_context_instance(CONTEXT_SYSTEM, SITEID))
+        if (! has_capability('moodle/site:mnetlogintoremote', get_context_instance(CONTEXT_SYSTEM))
                 or is_mnet_remote_user($USER)
                 or $USER->username == 'guest'
                 or empty($USER->id)) {

diff --git a/auth/shibboleth/index.php b/auth/shibboleth/index.php
index e01489458ccf0c886dcc4165eebb7d761bc6e12d..3cf39a78495c58e5fbd8b33b22aec6fdea9fd918 100644 (file)
--- a/auth/shibboleth/index.php
+++ b/auth/shibboleth/index.php
@@ -21,7 +21,7 @@
     
     // Check whether Shibboleth is configured properly
     if (empty($pluginconfig->user_attribute)) {
-        error(get_string( 'shib_not_set_up_error', 'auth'));
+        print_error('shib_not_set_up_error', 'auth');
      }
 
 /// If we can find the Shibboleth attribute, save it in session and return to main login page
@@ -66,7 +66,7 @@
             }
 
             /// Go to my-moodle page instead of homepage if mymoodleredirect enabled
-            if (!has_capability('moodle/site:config',get_context_instance(CONTEXT_SYSTEM, SITEID)) and !empty($CFG->mymoodleredirect) and !isguest()) {
+            if (!has_capability('moodle/site:config',get_context_instance(CONTEXT_SYSTEM)) and !empty($CFG->mymoodleredirect) and !isguest()) {
                 if ($urltogo == $CFG->wwwroot or $urltogo == $CFG->wwwroot.'/' or $urltogo == $CFG->wwwroot.'/index.php') {
                     $urltogo = $CFG->wwwroot.'/my/';
                 }
@@ -88,9 +88,9 @@
     // If we can find any (user independent) Shibboleth attributes but no user
     // attributes we probably didn't receive any user attributes
     elseif (!empty($_SERVER['HTTP_SHIB_APPLICATION_ID'])) {
-        error(get_string( 'shib_no_attributes_error', 'auth' , '\''.$pluginconfig->user_attribute.'\', \''.$pluginconfig->field_map_firstname.'\', \''.$pluginconfig->field_map_lastname.'\' and \''.$pluginconfig->field_map_email.'\''));
+        print_error('shib_no_attributes_error', 'auth' , '', '\''.$pluginconfig->user_attribute.'\', \''.$pluginconfig->field_map_firstname.'\', \''.$pluginconfig->field_map_lastname.'\' and \''.$pluginconfig->field_map_email.'\'');
     } else {
-         error(get_string( 'shib_not_set_up_error', 'auth'));
+        print_error('shib_not_set_up_error', 'auth');
     }
 
 ?>

diff --git a/backup/backup_check.html b/backup/backup_check.html
index 62469cc337250e25e176930f64463e1c206182dc..f17be59115a37dc341f94882e3eba48f5b7c55ec 100644 (file)
--- a/backup/backup_check.html
+++ b/backup/backup_check.html
@@ -15,7 +15,7 @@
             }
         }
     } else {
-        if (!has_capability('moodle/site:backup', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
+        if (!has_capability('moodle/site:backup', get_context_instance(CONTEXT_SYSTEM))) {
             print_error("You need to be an admin user to use this page.", '', "$CFG->wwwroot/login/index.php");
         }
     }

diff --git a/backup/backup_execute.html b/backup/backup_execute.html
index 65fada8ab7746a948db94e79587ca7113a65ff61..2e754d7ab67166bce9ec39c6f1281a63a54ec2d8 100644 (file)
--- a/backup/backup_execute.html
+++ b/backup/backup_execute.html
@@ -15,7 +15,7 @@
             }
         }
     } else {
-        if (!has_capability('moodle/site:backup', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
+        if (!has_capability('moodle/site:backup', get_context_instance(CONTEXT_SYSTEM))) {
             print_error("You need to be an admin user to use this page.", '', "$CFG->wwwroot/login/index.php");
         }
     }

diff --git a/backup/backuplib.php b/backup/backuplib.php
index c93c72732c98f64b4de5bcb97f3f418bbdbf12c7..ccdaaf92ceffa8637b7c311bf4157c1c5b9d07f5 100644 (file)
--- a/backup/backuplib.php
+++ b/backup/backuplib.php
@@ -641,7 +641,7 @@
         fwrite ($bf, start_tag('ROLES', 1, true));
         $roles = backup_fetch_roles($preferences);
 
-        $sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
+        $sitecontext = get_context_instance(CONTEXT_SYSTEM);
 
         foreach ($roles as $role) {
             fwrite ($bf,start_tag('ROLE',2,true));

diff --git a/backup/log.php b/backup/log.php
index 48e02509384dc1d49500c4e8089f7c7e7cdaaf09..7ef38b1591e922433e4aab98e16d11e74e525657 100644 (file)
--- a/backup/log.php
+++ b/backup/log.php
@@ -6,7 +6,7 @@
 
     require_login();
 
-    require_capability('moodle/site:backup', get_context_instance(CONTEXT_SYSTEM, SITEID));
+    require_capability('moodle/site:backup', get_context_instance(CONTEXT_SYSTEM));
 
     redirect("$CFG->wwwroot/$CFG->admin/report/backups/index.php", '', 'admin', 1);
 

diff --git a/backup/restore.php b/backup/restore.php
index 475054aba7d44809be0ef5d17eab8ec60fe036bf..37f1328fe2057071830d3f57fd69ce148ab89eb5 100644 (file)
--- a/backup/restore.php
+++ b/backup/restore.php
@@ -62,7 +62,7 @@
             }
         }
     } else {
-        if (!has_capability('moodle/site:restore', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
+        if (!has_capability('moodle/site:restore', get_context_instance(CONTEXT_SYSTEM))) {
             print_error("cannotuseadmin", '', "$CFG->wwwroot/login/index.php");
         }
     }
@@ -122,7 +122,7 @@
     }
 
     //Print header
-    if (has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
+    if (has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM))) {
         $navlinks[] = array('name' => basename($file), 'link' => null, 'type' => 'misc');
         $navigation = build_navigation($navlinks);
 

diff --git a/backup/restore_check.html b/backup/restore_check.html
index 746b846dfb3f4a1fa75b739438f82b043320bade..3210bd184d9962c48338af5c53a6ebae40c1a69a 100644 (file)
--- a/backup/restore_check.html
+++ b/backup/restore_check.html
@@ -192,7 +192,7 @@
             print_error("You need to be a teacher or admin user to use this page.", '', "$CFG->wwwroot/login/index.php");
         }
     } else {
-        if (!has_capability('moodle/site:restore', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
+        if (!has_capability('moodle/site:restore', get_context_instance(CONTEXT_SYSTEM))) {
             print_error("You need to be an admin user to use this page.", '', "$CFG->wwwroot/login/index.php");
         }
     }

diff --git a/backup/restore_execute.html b/backup/restore_execute.html
index d87a8fc9d987cbc886f15b7abd9e094b28f4bf48..58757595d377d089af81cd1b7cb1eb924a14896a 100644 (file)
--- a/backup/restore_execute.html
+++ b/backup/restore_execute.html
@@ -33,7 +33,7 @@
             }
         }
     } else {
-        if (!has_capability('moodle/site:restore', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
+        if (!has_capability('moodle/site:restore', get_context_instance(CONTEXT_SYSTEM))) {
             print_error("You need to be an admin user to use this page.", '', "$CFG->wwwroot/login/index.php");
         }
     }

diff --git a/backup/restore_precheck.html b/backup/restore_precheck.html
index a63ab16938031dbce3d3693ce3eca4d74222e558..b0e052de49d4a28c7f38aa433d0f1b6b24dd3833 100644 (file)
--- a/backup/restore_precheck.html
+++ b/backup/restore_precheck.html
@@ -25,7 +25,7 @@
             }
         }
     } else {
-        if (!has_capability('moodle/site:restore', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
+        if (!has_capability('moodle/site:restore', get_context_instance(CONTEXT_SYSTEM))) {
             print_error("You need to be an admin user to use this page.", '', "$CFG->wwwroot/login/index.php");   
         }
     }

diff --git a/backup/restorelib.php b/backup/restorelib.php
index f8b4919ff8f1af5712d4ab22b9044b13b0e50a72..0cac2801f69b773c6a5ac519b4196a94b7469d50 100644 (file)
--- a/backup/restorelib.php
+++ b/backup/restorelib.php
@@ -8127,7 +8127,7 @@ define('RESTORE_GROUPS_GROUPINGS', 3);
                 if ($CFG->creatornewroleid) {
                     role_assign($CFG->creatornewroleid, $USER->id, 0, $newcontext->id);
                 } else {
-                    if ($legacyteachers = get_roles_with_capability('moodle/legacy:editingteacher', CAP_ALLOW, get_context_instance(CONTEXT_SYSTEM, SITEID))) {
+                    if ($legacyteachers = get_roles_with_capability('moodle/legacy:editingteacher', CAP_ALLOW, get_context_instance(CONTEXT_SYSTEM))) {
                         if ($legacyteacher = array_shift($legacyteachers)) {
                             role_assign($legacyteacher->id, $USER->id, 0, $newcontext->id);
                         }
@@ -8273,7 +8273,7 @@ define('RESTORE_GROUPS_GROUPINGS', 3);
         }
         $info = restore_read_xml_roles($xmlfile);
 
-        $sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
+        $sitecontext = get_context_instance(CONTEXT_SYSTEM);
 
         // the following code creates new roles
         // but we could use more intelligent detection, and role mapping

diff --git a/backup/try.php b/backup/try.php
index a845a6c3c4deb81a663dd7c828ffb80113c0fcd6..ec4fc821d4c9a22ae8ec3dd4cf0d35df710b8fb8 100644 (file)
--- a/backup/try.php
+++ b/backup/try.php
@@ -7,7 +7,7 @@
 
     require_login();
 
-    require_capability('moodle/site:restore', get_context_instance(CONTEXT_SYSTEM, SITEID));
+    require_capability('moodle/site:restore', get_context_instance(CONTEXT_SYSTEM));
 
     //Check site
     if (!$site = get_site()) {

diff --git a/blocks/blog_menu/block_blog_menu.php b/blocks/blog_menu/block_blog_menu.php
index 6625303a02627da2ca6d00e8ad22df2296ec9080..04aed2e2e8e07704e2652c2db8d1a2a7ae93e1db 100755 (executable)
--- a/blocks/blog_menu/block_blog_menu.php
+++ b/blocks/blog_menu/block_blog_menu.php
@@ -51,7 +51,7 @@ class block_blog_menu extends block_base {
             $addentrylink = '';
             $coursearg = '';
 
-            $sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
+            $sitecontext = get_context_instance(CONTEXT_SYSTEM);
 
             if ($COURSE->id != SITEID) {
 

diff --git a/blocks/blog_tags/block_blog_tags.php b/blocks/blog_tags/block_blog_tags.php
index d3508888c3ecbf99b0e89e64e5fc392d4ba6edf6..b7c6a44a92f813fd69182a9721fb0a9e991b7e52 100644 (file)
--- a/blocks/blog_tags/block_blog_tags.php
+++ b/blocks/blog_tags/block_blog_tags.php
@@ -80,7 +80,7 @@ class block_blog_tags extends block_base {
         $sql .= 'AND p.id = ti.itemid ';
 
         // admins should be able to read all tags      
-        if (!has_capability('moodle/user:readuserblogs', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
+        if (!has_capability('moodle/user:readuserblogs', get_context_instance(CONTEXT_SYSTEM))) {
             $sql .= 'AND (p.publishstate = \'site\' or p.publishstate=\'public\') ';
         }
         $sql .= "AND ti.timemodified > {$timewithin} ";

diff --git a/blocks/rss_client/block_rss_client_action.php b/blocks/rss_client/block_rss_client_action.php
index 5339b7cb676e0df175cbd61884ddea3ae3697f32..bfe3aa5eef508ca018df468304cc1f06713eb8fe 100644 (file)
--- a/blocks/rss_client/block_rss_client_action.php
+++ b/blocks/rss_client/block_rss_client_action.php
@@ -63,7 +63,7 @@ if (!empty($id)) {
         $context = get_context_instance(CONTEXT_COURSE, $id);
     }
 } else {
-    $context = get_context_instance(CONTEXT_SYSTEM, SITEID);
+    $context = get_context_instance(CONTEXT_SYSTEM);
 }
 
 

diff --git a/enrol/database/config.html b/enrol/database/config.html
index 6d2bea35e92e5e4c1b641ad69f4842816defeb27..2387823db0ced444c9690563612f65107f69066a 100644 (file)
--- a/enrol/database/config.html
+++ b/enrol/database/config.html
@@ -156,7 +156,7 @@
     <td align="right">enrol_db_defaultcourseroleid:</td>
     <td>
     <?php
-        $sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
+        $sitecontext = get_context_instance(CONTEXT_SYSTEM);
         $assignableroles = get_assignable_roles($sitecontext);
         $assignableroles = array('' => get_string('default')) + $assignableroles;
     

diff --git a/enrol/imsenterprise/config.html b/enrol/imsenterprise/config.html
index 73215ec2467374b4cbcacb54057264d749ebf304..63b1179b56c86e90656c8bfc676bd6dd4befdf57 100644 (file)
--- a/enrol/imsenterprise/config.html
+++ b/enrol/imsenterprise/config.html
@@ -104,7 +104,7 @@ Photo processing is deactivated until we hear from Moodle dev forum about modifi
 
 <?php
 
-$sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
+$sitecontext = get_context_instance(CONTEXT_SYSTEM);
 $assignableroles = get_assignable_roles($sitecontext);
 $assignableroles = array('0' => get_string('ignore')) + $assignableroles;
 

diff --git a/message/discussion.php b/message/discussion.php
index 1ac476e9cc6d52ec4f388ba8c8cf04acf1d8c656..b4b66082672681847f1554efe6443289e56edc09 100644 (file)
--- a/message/discussion.php
+++ b/message/discussion.php
@@ -93,7 +93,7 @@
 
 /// Check that the user is not blocking us!!
     if ($contact = get_record('message_contacts', 'userid', $user->id, 'contactid', $USER->id)) {
-        if ($contact->blocked and !has_capability('moodle/site:readallmessages', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
+        if ($contact->blocked and !has_capability('moodle/site:readallmessages', get_context_instance(CONTEXT_SYSTEM))) {
             print_heading(get_string('userisblockingyou', 'message'));
             exit;
         }

diff --git a/message/history.php b/message/history.php
index 6b9f2b4df96947918b57ebcbee42fead2c68917a..0dc906c92fe926303bee6edf775504215dab5582 100644 (file)
--- a/message/history.php
+++ b/message/history.php
@@ -20,7 +20,7 @@
         print_error("User ID 1 was incorrect");
     }
 
-    if (has_capability('moodle/site:readallmessages', get_context_instance(CONTEXT_SYSTEM, SITEID))) {             // Able to see any discussion
+    if (has_capability('moodle/site:readallmessages', get_context_instance(CONTEXT_SYSTEM))) {             // Able to see any discussion
         $userid2 = optional_param('user2', $USER->id, PARAM_INT);
         if (! $user2 = get_record("user", "id", $userid2)) {  // Check
             print_error("User ID 2 was incorrect");

diff --git a/message/search.html b/message/search.html
index f37fd95fcbebb9b49f844d4d9a045234d85b5537..0d032a641e3d5ba6d56854aedd67ccd72509bbcb 100644 (file)
--- a/message/search.html
+++ b/message/search.html
@@ -41,7 +41,7 @@
     <tr><td>&nbsp;</td><td colspan="2"><input type="radio" name="keywordsoption" id="keywordsoption2" value="fromme" /><label for="keywordsoption2"><?php print_string('onlyfromme', 'message') ?></label></td></tr>
     <tr><td>&nbsp;</td><td colspan="2"><input type="radio" checked="checked" name="keywordsoption" id="keywordsoption3" value="allmine" /><label for="keywordsoption3"><?php print_string('allmine', 'message') ?></label></td></tr>
     
-    <?php if (has_capability('moodle/site:readallmessages', get_context_instance(CONTEXT_SYSTEM, SITEID))) { ?>
+    <?php if (has_capability('moodle/site:readallmessages', get_context_instance(CONTEXT_SYSTEM))) { ?>
     <tr><td>&nbsp;</td><td colspan="2"><input type="radio" name="keywordsoption" id="keywordsoption4" value="allusers" /><label for="keywordsoption4"><?php print_string('allusers', 'message') ?></label></td></tr>
     <?php } ?>
 

diff --git a/message/send.php b/message/send.php
index 573a59744e92c3a65c6e0de221a849b2265ed114..4c79804779baf83b0c6cd1c40c489c25334d6cd2 100644 (file)
--- a/message/send.php
+++ b/message/send.php
@@ -48,7 +48,7 @@ if (has_capability('moodle/site:sendmessage', get_context_instance(CONTEXT_SYSTE
 
 /// Check that the user is not blocking us!!
     if ($contact = get_record('message_contacts', 'userid', $user->id, 'contactid', $USER->id)) {
-        if ($contact->blocked and !has_capability('moodle/site:readallmessages', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
+        if ($contact->blocked and !has_capability('moodle/site:readallmessages', get_context_instance(CONTEXT_SYSTEM))) {
             print_heading(get_string('userisblockingyou', 'message'));
             exit;
         }

diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
index 07173dbee9d1cc53919f486725ab25b3764fd3f1..c583f2a5a4a7097817c5c732d5743c916e213b7e 100644 (file)
--- a/mod/glossary/lib.php
+++ b/mod/glossary/lib.php
@@ -39,7 +39,7 @@ function glossary_add_instance($glossary) {
         $glossary->globalglossary = 0;
     }
 
-    if (!has_capability('mod/glossary:manageentries', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
+    if (!has_capability('mod/glossary:manageentries', get_context_instance(CONTEXT_SYSTEM))) {
         $glossary->globalglossary = 0;
     }
 
@@ -72,7 +72,7 @@ function glossary_update_instance($glossary) {
         $glossary->globalglossary = 0;
     }
 
-    if (!has_capability('mod/glossary:manageentries', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
+    if (!has_capability('mod/glossary:manageentries', get_context_instance(CONTEXT_SYSTEM))) {
         // keep previous
         unset($glossary->globalglossary);
     }
@@ -558,7 +558,7 @@ function glossary_get_entries_search($concept, $courseid) {
 
     //Check if the user is an admin
     $bypassadmin = 1; //This means NO (by default)
-    if (has_capability('moodle/course:viewhiddenactivities', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
+    if (has_capability('moodle/course:viewhiddenactivities', get_context_instance(CONTEXT_SYSTEM))) {
         $bypassadmin = 0; //This means YES
     }
 

diff --git a/mod/glossary/mod_form.php b/mod/glossary/mod_form.php
index 134b49b34580d3d58a692ebb32b978055d1ff4dd..86f0f51c28d2fee87c6abea98f6dfb5354208294 100644 (file)
--- a/mod/glossary/mod_form.php
+++ b/mod/glossary/mod_form.php
@@ -25,7 +25,7 @@ class mod_glossary_mod_form extends moodleform_mod {
         $mform->addRule('entbypage', null, 'required', null, 'client');
         $mform->addRule('entbypage', null, 'numeric', null, 'client');
 
-        if (has_capability('mod/glossary:manageentries', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
+        if (has_capability('mod/glossary:manageentries', get_context_instance(CONTEXT_SYSTEM))) {
             $mform->addElement('checkbox', 'globalglossary', get_string('isglobal', 'glossary'));
             $mform->setHelpButton('globalglossary', array('globalglossary', get_string('globalglossary', 'glossary'), 'glossary'));
 

diff --git a/mod/hotpot/index.php b/mod/hotpot/index.php
index 88870004c4351ffb8e74a88d28091f562ffef6e9..f5722376872974da0c333d8a367e4cc02838560c 100644 (file)
--- a/mod/hotpot/index.php
+++ b/mod/hotpot/index.php
@@ -14,7 +14,7 @@
     require_login($course->id);
 
     $coursecontext = get_context_instance(CONTEXT_COURSE, $id);
-    $sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
+    $sitecontext = get_context_instance(CONTEXT_SYSTEM);
 
     add_to_log($course->id, "hotpot", "view all", "index.php?id=$course->id", "");
 
@@ -233,7 +233,7 @@
         $select .= " AND a.userid='$USER->id'";
     }
     $usejoin = 0;
-    if (has_capability('mod/hotpot:grade', get_context_instance(CONTEXT_SYSTEM, SITEID)) && $usejoin) {
+    if (has_capability('mod/hotpot:grade', get_context_instance(CONTEXT_SYSTEM)) && $usejoin) {
         // join attempts table and details table
         $tables .= ",{$CFG->prefix}hotpot_details d";
         $fields .= ',COUNT(DISTINCT d.id) AS detailcount';
@@ -244,7 +244,7 @@
     }
     $totals = get_records_sql("SELECT $fields FROM $tables WHERE $select GROUP BY a.hotpot");
 
-    if (has_capability('mod/hotpot:grade', get_context_instance(CONTEXT_SYSTEM, SITEID)) && empty($usejoin)) {
+    if (has_capability('mod/hotpot:grade', get_context_instance(CONTEXT_SYSTEM)) && empty($usejoin)) {
         foreach ($hotpots as $hotpot) {
             $totals[$hotpot->id]->detailcount = 0;
             if ($ids = get_records('hotpot_attempts', 'hotpot', $hotpot->id)) {

diff --git a/mod/hotpot/mod_form.php b/mod/hotpot/mod_form.php
index e6b612905a127ef23b56829199dc60595634aa56..2802c00ef491e3e5a546772f13573b13188e878a 100644 (file)
--- a/mod/hotpot/mod_form.php
+++ b/mod/hotpot/mod_form.php
@@ -61,7 +61,7 @@ class mod_hotpot_mod_form extends moodleform_mod {
         $mform->setType('name', PARAM_TEXT);
 
 // Location
-        $sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
+        $sitecontext = get_context_instance(CONTEXT_SYSTEM);
         if (has_capability('moodle/course:managefiles', $sitecontext)) {
             $site = get_site();
             if ($COURSE->id==$site->id) {
@@ -272,7 +272,7 @@ class mod_hotpot_mod_form extends moodleform_mod {
         } else {
             if ($data['location']==$COURSE->id) {
                 // this is normal
-            } else if ($data['location']==SITEID && has_capability('moodle/course:managefiles', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
+            } else if ($data['location']==SITEID && has_capability('moodle/course:managefiles', get_context_instance(CONTEXT_SYSTEM))) {
                 // admin can access site files
             } else {
                 // location is invalid or missing, so set to default

diff --git a/mod/hotpot/report.php b/mod/hotpot/report.php
index d7b2c2a1f4b06ab5d21c302b205cc650037e8df9..4e4296567343ead8d979833720a0568479b5c8f1 100644 (file)
--- a/mod/hotpot/report.php
+++ b/mod/hotpot/report.php
@@ -32,7 +32,7 @@
     }
 
     // get the roles context for this course
-    $sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
+    $sitecontext = get_context_instance(CONTEXT_SYSTEM);
     $modulecontext = get_context_instance(CONTEXT_MODULE, $cm->id);
 
     // set homeurl of couse (for error messages)

diff --git a/mod/hotpot/show.php b/mod/hotpot/show.php
index 23d7b1dca096343c9e644ada7c85ad402af90c5a..6b9761103e7e2355178f218d6d18693848598e98 100644 (file)
--- a/mod/hotpot/show.php
+++ b/mod/hotpot/show.php
@@ -13,7 +13,7 @@
     if (!has_capability('mod/hotpot:viewreport',get_context_instance(CONTEXT_COURSE, $params->course))) {
         print_error("You are not allowed to view this page!");
     }
-    if (has_capability('mod/hotpot:viewreport', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
+    if (has_capability('mod/hotpot:viewreport', get_context_instance(CONTEXT_SYSTEM))) {
         $params->location = optional_param('location', HOTPOT_LOCATION_COURSEFILES, PARAM_INT);
     } else {
         $params->location = HOTPOT_LOCATION_COURSEFILES;

diff --git a/mod/resource/type/ims/finder.php b/mod/resource/type/ims/finder.php
index ff52cdb0eca587a08c935cc7014d1ffb70a304e7..91ff27fa1654e7a5db2bc93835f1b952cc1e918b 100644 (file)
--- a/mod/resource/type/ims/finder.php
+++ b/mod/resource/type/ims/finder.php
@@ -64,7 +64,7 @@
     ims_print_crumbtrail($directory, $choose);
     
 /// If admin, add extra buttons - redeploy & help.
-    if (has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
+    if (has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM))) {
         echo " | (<a href=\"repository_deploy.php?file=$directory&amp;all=force\">$strdeployall</a>) ";
         helpbutton("deploy", get_string("deployall", "resource"), "resource", true);
     }
@@ -96,7 +96,7 @@
             }
             else if ($item->type == 'not deployed') {
             /// Only displays non-deployed IMS CP's if admin user.
-                if (has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
+                if (has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM))) {
                     echo "<li><img src=\"images/ims.gif\" alt=\"IMS CP Package\" /> <em>$item->path - $strnotdeployed</em> (<a href=\"repository_deploy.php?file=$item->path\">$strdeploy</a>)</li>\n";
                 }
             }

diff --git a/mod/resource/type/ims/repository_deploy.php b/mod/resource/type/ims/repository_deploy.php
index f3509958374e01ffb6cefa01e8a880c1c0578760..8c58ead3c1111e85566fdc83604fddfbeb3c8ef1 100644 (file)
--- a/mod/resource/type/ims/repository_deploy.php
+++ b/mod/resource/type/ims/repository_deploy.php
@@ -46,7 +46,7 @@
     require_once('repository_config.php');
     
     /// Security - Admin Only  
-    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
+    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
         
     $file       = required_param ('file', PARAM_PATH);
     $all        = optional_param ('all', '', PARAM_ALPHA);

diff --git a/theme/chameleon/ui/chameleon.php b/theme/chameleon/ui/chameleon.php
index 86b3d8c57a29e04d0d1ca2ac3c92959fbe73eddc..2e9b9c8b14644dd9b88829667a3c7102eae3d179 100644 (file)
--- a/theme/chameleon/ui/chameleon.php
+++ b/theme/chameleon/ui/chameleon.php
@@ -2,7 +2,7 @@
 
    
 if (!empty($THEME->chameleonenabled)) {
-    $chameleon_isadmin = has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
+    $chameleon_isadmin = has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
     $chameleon_isteacher = false;
     if ($COURSE->id == SITEID) {
         $chameleon_courseparam = '';

diff --git a/theme/chameleon/ui/css.php b/theme/chameleon/ui/css.php
index 63125fbc867c7caa55d876573b958d07214afaa9..258fab8e1058ec027ca547e94e535cd11c570d0c 100644 (file)
--- a/theme/chameleon/ui/css.php
+++ b/theme/chameleon/ui/css.php
@@ -19,7 +19,7 @@ if ($id != SITEID and !empty($CFG->allowcoursethemes) and !empty($course->theme)
     if (!has_capability('moodle/course:update', get_context_instance(CONTEXT_COURSE, $id))) {
         die('CHAMELEON_ERROR Either you are not logged in or you are not allowed to edit this theme');
     }
-} else if (!has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
+} else if (!has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM))) {
     die('CHAMELEON_ERROR Either you are not logged in or you are not allowed to edit this theme');
 }
 

diff --git a/theme/preview.php b/theme/preview.php
index 64995f370162642e78230cfe878c22813c260903..99b89e2c99309e1267c9780249fdc7c3067c873b 100644 (file)
--- a/theme/preview.php
+++ b/theme/preview.php
@@ -14,7 +14,7 @@
 
     require_login();
 
-    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID));
+    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
 
     $CFG->theme = $preview;