user upload cap renamed to moodle/site:uploadusers

diff --git a/admin/settings/users.php b/admin/settings/users.php
index 2ad51bbaa6aa92ccbb64bbad619b6372cbb57756..a7b8539616a120614aeb78c03d4e285bb4726b48 100644 (file)
--- a/admin/settings/users.php
+++ b/admin/settings/users.php
@@ -10,7 +10,7 @@ $ADMIN->add('users', new admin_externalpage('userauthentication', get_string('au
 $ADMIN->add('users', new admin_category('accounts', get_string('accounts', 'admin')));
 $ADMIN->add('accounts', new admin_externalpage('editusers', get_string('userlist','admin'), "$CFG->wwwroot/$CFG->admin/user.php", array('moodle/user:update', 'moodle/user:delete')));
 $ADMIN->add('accounts', new admin_externalpage('addnewuser', get_string('addnewuser'), "$CFG->wwwroot/$CFG->admin/user.php?newuser=true", 'moodle/user:create'));
-$ADMIN->add('accounts', new admin_externalpage('uploadusers', get_string('uploadusers'), "$CFG->wwwroot/$CFG->admin/uploaduser.php", 'moodle/user:upload'));
+$ADMIN->add('accounts', new admin_externalpage('uploadusers', get_string('uploadusers'), "$CFG->wwwroot/$CFG->admin/uploaduser.php", 'moodle/site:uploadusers'));
 
 
 // stuff under the "roles" subcategory

diff --git a/admin/uploaduser.php b/admin/uploaduser.php
index 4fc53dcfbc3566fdb0f128b30f178c4be26a9141..d50b01be6a4b7bb5f9835f9510dd257c2b042a6d 100755 (executable)
--- a/admin/uploaduser.php
+++ b/admin/uploaduser.php
@@ -15,7 +15,7 @@ $allowrenames   = optional_param('allowrenames', 0, PARAM_BOOL);
 
 require_login();
 
-require_capability('moodle/user:upload', get_context_instance(CONTEXT_SYSTEM, SITEID));
+require_capability('moodle/site:uploadusers', get_context_instance(CONTEXT_SYSTEM, SITEID));
 
 if (! $site = get_site()) {
     error("Could not find site-level course");

diff --git a/lib/db/access.php b/lib/db/access.php
index 61d83738fd505f297445beaf3ad1f92069451c8e..bdd68b73474b66d87e444499683c75374a2f542b 100644 (file)
--- a/lib/db/access.php
+++ b/lib/db/access.php
@@ -262,7 +262,7 @@ $moodle_capabilities = array(
         )
     ),
 
-    'moodle/user:create' => array(
+    'moodle/site:uploadusers' => array(
 
         'riskbitmask' => RISK_SPAM | RISK_PERSONAL,
 
@@ -278,7 +278,10 @@ $moodle_capabilities = array(
         )
     ),
 
-    'moodle/user:delete' => array(
+
+    'moodle/user:create' => array(
+
+        'riskbitmask' => RISK_SPAM | RISK_PERSONAL,
 
         'captype' => 'write',
         'contextlevel' => CONTEXT_SYSTEM,
@@ -292,9 +295,7 @@ $moodle_capabilities = array(
         )
     ),
 
-    'moodle/user:update' => array(
-
-        'riskbitmask' => RISK_SPAM | RISK_PERSONAL,
+    'moodle/user:delete' => array(
 
         'captype' => 'write',
         'contextlevel' => CONTEXT_SYSTEM,
@@ -308,7 +309,7 @@ $moodle_capabilities = array(
         )
     ),
 
-    'moodle/user:upload' => array(
+    'moodle/user:update' => array(
 
         'riskbitmask' => RISK_SPAM | RISK_PERSONAL,
 

diff --git a/version.php b/version.php
index 7393efdc0b6dee0706700c4f7eb995adb9551991..1ce61e0db1136ae891ed8973dfe520236796de78 100644 (file)
--- a/version.php
+++ b/version.php
@@ -6,7 +6,7 @@
 // This is compared against the values stored in the database to determine
 // whether upgrades should be performed (see lib/db/*.php)
 
-   $version = 2006092403;  // YYYYMMDD = date
+   $version = 2006092404;  // YYYYMMDD = date
                            //       XY = increments within a single day
 
    $release = '1.7 dev';    // Human-friendly version name