web service MDL-17135 add moodle/site:usewebservice capability - display only web...

diff --git a/lang/en_utf8/role.php b/lang/en_utf8/role.php
index d2cb28706a97bbe49fe0fd190f2937a7e6f2a92f..c778666282dfd2d652eb5c5314fdb8b4308ceb14 100644 (file)
--- a/lang/en_utf8/role.php
+++ b/lang/en_utf8/role.php
@@ -223,6 +223,7 @@ $string['site:uploadusers'] = 'Upload new users from file';
 $string['site:viewfullnames'] = 'Always see full names of users';
 $string['site:viewparticipants'] = 'View participants';
 $string['site:viewreports'] = 'View reports';
+$string['site:usewebservices'] = 'User can be served by Moodle web services';
 $string['tag:manage'] = 'Manage all tags';
 $string['tag:create'] = 'Create new tags';
 $string['tag:edit'] = 'Edit existing tags';

diff --git a/lib/adminlib.php b/lib/adminlib.php
index 200d282d21ff8dae8a7a3fbe8d1d5872ef46137d..8416b8b30cb7d73650caef840787be728ee48925 100644 (file)
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -4947,7 +4947,7 @@ class admin_setting_managewsusersettings extends admin_setting {
         $table->data = array();
 
         foreach ($users as $user) {
-            if ( true) { //test if the users has has_capability('use_webservice')
+            if (has_capability("moodle/site:usewebservice",get_system_context(), $user->id)) { //test if the users has has_capability('use_webservice')
                 $wsusersetting = ' <a href="' . $this->baseurl . '&amp;username=' . $user->username . '">'
                 . get_string("settings")
                           .'</a>' . "\n";

diff --git a/lib/db/access.php b/lib/db/access.php
index 42ad0d0d660bdee52d9c74d07c9ebd5baac7db40..341c49953742e2ba49573199a59ad6d53d753c3c 100644 (file)
--- a/lib/db/access.php
+++ b/lib/db/access.php
@@ -699,6 +699,13 @@ $moodle_capabilities = array(
         )
     ),
 
+    'moodle/site:usewebservices' => array(
+        'riskbitmask' => RISK_SPAM | RISK_PERSONAL | RISK_XSS | RISK_CONFIG | RISK_DATALOSS,
+        'captype' => 'write',
+        'contextlevel' => CONTEXT_SYSTEM,
+        'legacy' => array()
+    ),
+
     'moodle/course:viewscales' => array(
 
         'captype' => 'read',