MDL-20712 using just $capablities for capability definition array, all other files...

diff --git a/admin/report/courseoverview/db/access.php b/admin/report/courseoverview/db/access.php
index 2c67744f40de41bfe8e921fd2614000fecdc575b..c2145dc07efe00890205324e8de41e149efcbeee 100644 (file)
--- a/admin/report/courseoverview/db/access.php
+++ b/admin/report/courseoverview/db/access.php
@@ -23,7 +23,7 @@
 //                                                                       //
 ///////////////////////////////////////////////////////////////////////////
 
-$report_courseoverview_capabilities = array(
+$capabilities = array(
 
     'report/courseoverview:view' => array(
         'riskbitmask' => RISK_PERSONAL,

diff --git a/admin/report/questioninstances/db/access.php b/admin/report/questioninstances/db/access.php
index 695453ad3ab6b265039d186a3b69339a56ce7682..7afd65a3cc0168f01b01460236609a4a1828b4ea 100644 (file)
--- a/admin/report/questioninstances/db/access.php
+++ b/admin/report/questioninstances/db/access.php
@@ -23,7 +23,7 @@
 //                                                                       //
 ///////////////////////////////////////////////////////////////////////////
 
-$report_questioninstances_capabilities = array(
+$capabilities = array(
 
     'report/questioninstances:view' => array(
         'captype' => 'read',

diff --git a/admin/report/security/db/access.php b/admin/report/security/db/access.php
index aab6184f427e08a7c3ed32629149141e93a232e7..479e71b2d6dc54ee8509fe71ece84e0deda81a4b 100644 (file)
--- a/admin/report/security/db/access.php
+++ b/admin/report/security/db/access.php
@@ -23,7 +23,7 @@
 //                                                                       //
 ///////////////////////////////////////////////////////////////////////////
 
-$report_security_capabilities = array(
+$capabilities = array(
 
     'report/security:view' => array(
         'riskbitmask' => RISK_CONFIG,

diff --git a/admin/report/unittest/db/access.php b/admin/report/unittest/db/access.php
index 0aa23361553c0386e32a04120fa831c8ebbd04a2..73d906b344af4c325644065d6852ee112a7699e8 100644 (file)
--- a/admin/report/unittest/db/access.php
+++ b/admin/report/unittest/db/access.php
@@ -23,7 +23,7 @@
 //                                                                       //
 ///////////////////////////////////////////////////////////////////////////
 
-$report_unittest_capabilities = array(
+$capabilities = array(
 
     'report/unittest:view' => array(
         'riskbitmask' => RISK_DATALOSS,

diff --git a/blocks/online_users/db/access.php b/blocks/online_users/db/access.php
index 54b16e9023bfde811fd4412c646b87d1e2d0f76a..3cddaad042f1ff80e7c91750a9c5fcb96279c861 100644 (file)
--- a/blocks/online_users/db/access.php
+++ b/blocks/online_users/db/access.php
@@ -23,7 +23,7 @@
 //                                                                       //
 ///////////////////////////////////////////////////////////////////////////
 
-$block_online_users_capabilities = array(
+$capabilities = array(
 
     'block/online_users:viewlist' => array(
 

diff --git a/blocks/rss_client/db/access.php b/blocks/rss_client/db/access.php
index c68ed49b0d6bbcf063d46a7db543be06de83f294..616ac49b86ce49bfcbdb3b5efdab1ddafb517ca9 100644 (file)
--- a/blocks/rss_client/db/access.php
+++ b/blocks/rss_client/db/access.php
@@ -14,7 +14,7 @@
 //
 // It is important that capability names are unique. The naming convention
 // for capabilities that are specific to modules and blocks is as follows:
-//   [mod/block]/<component_name>:<capabilityname>
+//   [mod/block]/<plugin_name>:<capabilityname>
 //
 // component_name should be the same as the directory name of the mod or block.
 //
@@ -25,13 +25,10 @@
 //           block/recent_activity:view
 //           moodle/site:deleteuser
 //
-// The variable name for the capability definitions array follows the format
-//   $<componenttype>_<component_name>_capabilities
-//
-// For the core capabilities, the variable is $moodle_capabilities.
+// The variable name for the capability definitions array is $capabilities
 
 
-$block_rss_client_capabilities = array(
+$capabilities = array(
 
     'block/rss_client:manageownfeeds' => array(
 

diff --git a/course/report/log/db/access.php b/course/report/log/db/access.php
index 43e741acd85ec9a0dda1bf7629bae7602e55b5c4..18f079a0fcf646ba1030583edef57d095462a61f 100644 (file)
--- a/course/report/log/db/access.php
+++ b/course/report/log/db/access.php
@@ -23,7 +23,7 @@
 //                                                                       //
 ///////////////////////////////////////////////////////////////////////////
 
-$coursereport_log_capabilities = array(
+$capabilities = array(
 
     'coursereport/log:view' => array(
         'riskbitmask' => RISK_PERSONAL,

diff --git a/course/report/outline/db/access.php b/course/report/outline/db/access.php
index 81a752302b00c0624b9972d56a9777d3a0ab3ebd..328d0c70c4c5404678bfc839f6d03c0316131046 100644 (file)
--- a/course/report/outline/db/access.php
+++ b/course/report/outline/db/access.php
@@ -23,7 +23,7 @@
 //                                                                       //
 ///////////////////////////////////////////////////////////////////////////
 
-$coursereport_outline_capabilities = array(
+$capabilities = array(
 
     'coursereport/outline:view' => array(
         'riskbitmask' => RISK_PERSONAL,

diff --git a/course/report/participation/db/access.php b/course/report/participation/db/access.php
index d90bc72023609086a017667daa4f73e3c729d48b..5edafb640d41e5bbff3de2d18ef823733382cd64 100644 (file)
--- a/course/report/participation/db/access.php
+++ b/course/report/participation/db/access.php
@@ -23,7 +23,7 @@
 //                                                                       //
 ///////////////////////////////////////////////////////////////////////////
 
-$coursereport_participation_capabilities = array(
+$capabilities = array(
 
     'coursereport/participation:view' => array(
         'riskbitmask' => RISK_PERSONAL,

diff --git a/course/report/progress/db/access.php b/course/report/progress/db/access.php
index dbb4390dd77fc2fae860df01b4f1db7a8c557cb9..0e89482b70c372ac8b11dadb8f5854a7f57e03eb 100644 (file)
--- a/course/report/progress/db/access.php
+++ b/course/report/progress/db/access.php
@@ -23,7 +23,7 @@
 //                                                                       //
 ///////////////////////////////////////////////////////////////////////////
 
-$coursereport_progress_capabilities = array(
+$capabilities = array(
 
     'coursereport/progress:view' => array(
         'riskbitmask' => RISK_PERSONAL,

diff --git a/course/report/stats/db/access.php b/course/report/stats/db/access.php
index 29dbd7914b9188e9e1d0edbe0e93ea7918d0575c..f99352889f15f7e57312c42db081270ba85ab620 100644 (file)
--- a/course/report/stats/db/access.php
+++ b/course/report/stats/db/access.php
@@ -23,7 +23,7 @@
 //                                                                       //
 ///////////////////////////////////////////////////////////////////////////
 
-$coursereport_stats_capabilities = array(
+$capabilities = array(
 
     'coursereport/stats:view' => array(
         'riskbitmask' => RISK_PERSONAL,

diff --git a/enrol/authorize/db/access.php b/enrol/authorize/db/access.php
index 954bf74f066d3a9ebe305d66428d790c38cfb38b..26973c2dba1a42005fe65d824458e4dc8c665477 100644 (file)
--- a/enrol/authorize/db/access.php
+++ b/enrol/authorize/db/access.php
@@ -1,6 +1,6 @@
 <?php
 
-$enrol_authorize_capabilities = array(
+$capabilities = array(
 
     'enrol/authorize:managepayments' => array(
         'riskbitmask' => RISK_PERSONAL,

diff --git a/grade/export/ods/db/access.php b/grade/export/ods/db/access.php
index 1528af655b70c1add3dbede3f2fce1c89c1c5802..e160cd32e1845b762fa2ad107ee386dacd2950e8 100644 (file)
--- a/grade/export/ods/db/access.php
+++ b/grade/export/ods/db/access.php
@@ -15,7 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-$gradeexport_ods_capabilities = array(
+$capabilities = array(
 
     'gradeexport/ods:view' => array(
         'riskbitmask' => RISK_PERSONAL,

diff --git a/grade/export/txt/db/access.php b/grade/export/txt/db/access.php
index 090ec71dade76f1525987e9ac38c11829260629e..3a9ba9e92b30699b292db530cee8e99f9bef3a89 100644 (file)
--- a/grade/export/txt/db/access.php
+++ b/grade/export/txt/db/access.php
@@ -15,7 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-$gradeexport_txt_capabilities = array(
+$capabilities = array(
 
     'gradeexport/txt:view' => array(
         'riskbitmask' => RISK_PERSONAL,

diff --git a/grade/export/xls/db/access.php b/grade/export/xls/db/access.php
index d3dc43b4db90bcfb36585ac4d9b544a1540f521d..cacc0b147669c8b35ef0cc654ccfdf26f560fb55 100644 (file)
--- a/grade/export/xls/db/access.php
+++ b/grade/export/xls/db/access.php
@@ -15,7 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-$gradeexport_xls_capabilities = array(
+$capabilities = array(
 
     'gradeexport/xls:view' => array(
         'riskbitmask' => RISK_PERSONAL,

diff --git a/grade/export/xml/db/access.php b/grade/export/xml/db/access.php
index d54cee6d44f77f07a32a51236fc5cb6e35bcf376..1c0aa5162482d2f8689439e6b15d118a567c0125 100644 (file)
--- a/grade/export/xml/db/access.php
+++ b/grade/export/xml/db/access.php
@@ -15,7 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-$gradeexport_xml_capabilities = array(
+$capabilities = array(
 
     'gradeexport/xml:view' => array(
         'riskbitmask' => RISK_PERSONAL,

diff --git a/grade/import/csv/db/access.php b/grade/import/csv/db/access.php
index 17fe2912eeac746ea04ed5b283673e37acf9c000..fc70ede19a8ade2a0ae3a2d686cb5e2b3e771e36 100644 (file)
--- a/grade/import/csv/db/access.php
+++ b/grade/import/csv/db/access.php
@@ -15,7 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-$gradeimport_csv_capabilities = array(
+$capabilities = array(
 
     'gradeimport/csv:view' => array(
         'captype' => 'write',

diff --git a/grade/import/xml/db/access.php b/grade/import/xml/db/access.php
index 2d3bd0c923583d355874f99773a9d2b84e112e6e..12124fb76dd4a3202f8494c69ccea8334a06e0b3 100644 (file)
--- a/grade/import/xml/db/access.php
+++ b/grade/import/xml/db/access.php
@@ -15,7 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-$gradeimport_xml_capabilities = array(
+$capabilities = array(
 
     'gradeimport/xml:view' => array(
         'captype' => 'write',

diff --git a/grade/report/grader/db/access.php b/grade/report/grader/db/access.php
index fa0e7ddb5975240f244b387277008eb4dd4aeb15..98b75a71bc519184eee9b42842bd5a66cdd9e489 100644 (file)
--- a/grade/report/grader/db/access.php
+++ b/grade/report/grader/db/access.php
@@ -15,7 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-$gradereport_grader_capabilities = array(
+$capabilities = array(
 
     'gradereport/grader:view' => array(
         'riskbitmask' => RISK_PERSONAL,

diff --git a/grade/report/outcomes/db/access.php b/grade/report/outcomes/db/access.php
index 38b8389e55e88459a5849af3237a42ed44e8c40d..bc8df5740bf6996f1c895dc585d61d078f9fc344 100644 (file)
--- a/grade/report/outcomes/db/access.php
+++ b/grade/report/outcomes/db/access.php
@@ -15,7 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-$gradereport_outcomes_capabilities = array(
+$capabilities = array(
 
     'gradereport/outcomes:view' => array(
         'riskbitmask' => RISK_PERSONAL,

diff --git a/grade/report/overview/db/access.php b/grade/report/overview/db/access.php
index 21a4d4971cbe519a4051cff5e643224f746acca1..3e3d97880f537731014dfe7b479a503ff021fd54 100644 (file)
--- a/grade/report/overview/db/access.php
+++ b/grade/report/overview/db/access.php
@@ -15,7 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-$gradereport_overview_capabilities = array(
+$capabilities = array(
 
     'gradereport/overview:view' => array(
         'riskbitmask' => RISK_PERSONAL,

diff --git a/grade/report/user/db/access.php b/grade/report/user/db/access.php
index 3917c28183e4e40e8d54d45f4f7505e4ab98d14d..a8b0e79fd6265dd2059ececf170b3eed03ae170b 100644 (file)
--- a/grade/report/user/db/access.php
+++ b/grade/report/user/db/access.php
@@ -15,7 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-$gradereport_user_capabilities = array(
+$capabilities = array(
 
     'gradereport/user:view' => array(
         'riskbitmask' => RISK_PERSONAL,

diff --git a/lib/accesslib.php b/lib/accesslib.php
index 27cef15ecc8c294fdc8ea56d3da6149ead11089a..d4a03108b8367595a1ad83fbe3fafb9d92636a4d 100755 (executable)
--- a/lib/accesslib.php
+++ b/lib/accesslib.php
@@ -3177,7 +3177,11 @@ function load_capability_def($component) {
     $capabilities = array();
     if (file_exists($defpath)) {
         require($defpath);
-        $capabilities = ${$component.'_capabilities'};
+        if (!empty(${$component.'_capabilities'})) {
+            // legacy capability array name
+            // since 2.0 we prefer $capabilities instead - it is easier to use and matches db/* files
+            $capabilities = ${$component.'_capabilities'};
+        }
     }
 
     return $capabilities;

diff --git a/lib/db/access.php b/lib/db/access.php
index eddbdd51f7ccf701f2754a0d49f160e660f1da9d..05f014001a8feead4a33a650435a8ac4bc20daaf 100644 (file)
--- a/lib/db/access.php
+++ b/lib/db/access.php
@@ -14,7 +14,7 @@
 //
 // It is important that capability names are unique. The naming convention
 // for capabilities that are specific to modules and blocks is as follows:
-//   [mod/block]/<component_name>:<capabilityname>
+//   [mod/block]/<plugin_name>:<capabilityname>
 //
 // component_name should be the same as the directory name of the mod or block.
 //
@@ -25,13 +25,10 @@
 //           block/recent_activity:view
 //           moodle/site:deleteuser
 //
-// The variable name for the capability definitions array follows the format
-//   $<componenttype>_<component_name>_capabilities
-//
-// For the core capabilities, the variable is $moodle_capabilities.
+// The variable name for the capability definitions array is $capabilities
 
 
-$moodle_capabilities = array(
+$capabilities = array(
 
     'moodle/site:doanything' => array(
 

diff --git a/mod/assignment/db/access.php b/mod/assignment/db/access.php
index 83df79296cf9972a619c93711c47e857191ba1ec..ab37c0b0c1c71d3904e0a5b0d2da4cc8057b0e82 100644 (file)
--- a/mod/assignment/db/access.php
+++ b/mod/assignment/db/access.php
@@ -14,7 +14,7 @@
 //
 // It is important that capability names are unique. The naming convention
 // for capabilities that are specific to modules and blocks is as follows:
-//   [mod/block]/<component_name>:<capabilityname>
+//   [mod/block]/<plugin_name>:<capabilityname>
 //
 // component_name should be the same as the directory name of the mod or block.
 //
@@ -25,13 +25,10 @@
 //           block/recent_activity:view
 //           moodle/site:deleteuser
 //
-// The variable name for the capability definitions array follows the format
-//   $<componenttype>_<component_name>_capabilities
-//
-// For the core capabilities, the variable is $moodle_capabilities.
+// The variable name for the capability definitions array is $capabilities
 
 
-$mod_assignment_capabilities = array(
+$capabilities = array(
 
     'mod/assignment:view' => array(
 

diff --git a/mod/chat/db/access.php b/mod/chat/db/access.php
index e68ca6a5287c91d9e7c34bd4898cebc708303572..935589877f9c531d806714c8d10fae5f587e11ee 100644 (file)
--- a/mod/chat/db/access.php
+++ b/mod/chat/db/access.php
@@ -14,7 +14,7 @@
 //
 // It is important that capability names are unique. The naming convention
 // for capabilities that are specific to modules and blocks is as follows:
-//   [mod/block]/<component_name>:<capabilityname>
+//   [mod/block]/<plugin_name>:<capabilityname>
 //
 // component_name should be the same as the directory name of the mod or block.
 //
@@ -25,13 +25,10 @@
 //           block/recent_activity:view
 //           moodle/site:deleteuser
 //
-// The variable name for the capability definitions array follows the format
-//   $<componenttype>_<component_name>_capabilities
-//
-// For the core capabilities, the variable is $moodle_capabilities.
+// The variable name for the capability definitions array is $capabilities
 
 
-$mod_chat_capabilities = array(
+$capabilities = array(
 
     'mod/chat:chat' => array(
 

diff --git a/mod/choice/db/access.php b/mod/choice/db/access.php
index d6471ca4b90277bfb5d5a8fb9c0ca5afb85da447..2e7cc0e71d9816ab2286c7c9aad56e94f784f15b 100644 (file)
--- a/mod/choice/db/access.php
+++ b/mod/choice/db/access.php
@@ -14,7 +14,7 @@
 //
 // It is important that capability names are unique. The naming convention
 // for capabilities that are specific to modules and blocks is as follows:
-//   [mod/block]/<component_name>:<capabilityname>
+//   [mod/block]/<plugin_name>:<capabilityname>
 //
 // component_name should be the same as the directory name of the mod or block.
 //
@@ -25,13 +25,10 @@
 //           block/recent_activity:view
 //           moodle/site:deleteuser
 //
-// The variable name for the capability definitions array follows the format
-//   $<componenttype>_<component_name>_capabilities
-//
-// For the core capabilities, the variable is $moodle_capabilities.
+// The variable name for the capability definitions array is $capabilities
 
 
-$mod_choice_capabilities = array(
+$capabilities = array(
 
     'mod/choice:choose' => array(
 

diff --git a/mod/data/db/access.php b/mod/data/db/access.php
index 24510b5c407fa2931db1b379ba44d0dffe5e28ff..3c54db970aac09f04894d921148af8814a5b36ba 100644 (file)
--- a/mod/data/db/access.php
+++ b/mod/data/db/access.php
@@ -14,7 +14,7 @@
 //
 // It is important that capability names are unique. The naming convention
 // for capabilities that are specific to modules and blocks is as follows:
-//   [mod/block]/<component_name>:<capabilityname>
+//   [mod/block]/<plugin_name>:<capabilityname>
 //
 // component_name should be the same as the directory name of the mod or block.
 //
@@ -25,13 +25,10 @@
 //           block/recent_activity:view
 //           moodle/site:deleteuser
 //
-// The variable name for the capability definitions array follows the format
-//   $<componenttype>_<component_name>_capabilities
-//
-// For the core capabilities, the variable is $moodle_capabilities.
+// The variable name for the capability definitions array is $capabilities
 
 
-$mod_data_capabilities = array(
+$capabilities = array(
 
     'mod/data:viewentry' => array(
 

diff --git a/mod/feedback/db/access.php b/mod/feedback/db/access.php
index 40be7788078faade2a9c1959c4991c019b528bd3..18e0d2ef94226ede94ef36f125d4b7643b86810f 100644 (file)
--- a/mod/feedback/db/access.php
+++ b/mod/feedback/db/access.php
@@ -14,7 +14,7 @@
 //
 // It is important that capability names are unique. The naming convention
 // for capabilities that are specific to modules and blocks is as follows:
-//   [mod/block]/<component_name>:<capabilityname>
+//   [mod/block]/<plugin_name>:<capabilityname>
 //
 // component_name should be the same as the directory name of the mod or block.
 //
@@ -25,13 +25,10 @@
 //           block/recent_activity:view
 //           moodle/site:deleteuser
 //
-// The variable name for the capability definitions array follows the format
-//   $<componenttype>_<component_name>_capabilities
-//
-// For the core capabilities, the variable is $moodle_capabilities.
+// The variable name for the capability definitions array is $capabilities
 
 
-$mod_feedback_capabilities = array(
+$capabilities = array(
 
     'mod/feedback:view' => array(
 

diff --git a/mod/folder/db/access.php b/mod/folder/db/access.php
index 5fdd8eaa704b36a16fe5b767ea7e1e0f00782382..6916626b918fa36ba89537a60ca1f220da90e7dd 100644 (file)
--- a/mod/folder/db/access.php
+++ b/mod/folder/db/access.php
@@ -23,7 +23,7 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$mod_folder_capabilities = array(
+$capabilities = array(
 /* TODO: review public portfolio API first!
     'mod/folder:portfolioexport' => array(
 

diff --git a/mod/forum/db/access.php b/mod/forum/db/access.php
index 42b4742e9796dd83669e8ea9d1712f66123edb25..fd144f1e35cdc7b9068e37aba73ad10bf3e8fbd6 100644 (file)
--- a/mod/forum/db/access.php
+++ b/mod/forum/db/access.php
@@ -14,7 +14,7 @@
 //
 // It is important that capability names are unique. The naming convention
 // for capabilities that are specific to modules and blocks is as follows:
-//   [mod/block]/<component_name>:<capabilityname>
+//   [mod/block]/<plugin_name>:<capabilityname>
 //
 // component_name should be the same as the directory name of the mod or block.
 //
@@ -25,13 +25,10 @@
 //           block/recent_activity:view
 //           moodle/site:deleteuser
 //
-// The variable name for the capability definitions array follows the format
-//   $<componenttype>_<component_name>_capabilities
-//
-// For the core capabilities, the variable is $moodle_capabilities.
+// The variable name for the capability definitions array is $capabilities
 
 
-$mod_forum_capabilities = array(
+$capabilities = array(
 
     'mod/forum:viewdiscussion' => array(
 

diff --git a/mod/glossary/db/access.php b/mod/glossary/db/access.php
index 51b72925d9446d9c8b024b766562fad5f6ec55c8..7e47f5850619cc97f59231109f9a667903472639 100644 (file)
--- a/mod/glossary/db/access.php
+++ b/mod/glossary/db/access.php
@@ -14,7 +14,7 @@
 //
 // It is important that capability names are unique. The naming convention
 // for capabilities that are specific to modules and blocks is as follows:
-//   [mod/block]/<component_name>:<capabilityname>
+//   [mod/block]/<plugin_name>:<capabilityname>
 //
 // component_name should be the same as the directory name of the mod or block.
 //
@@ -25,13 +25,10 @@
 //           block/recent_activity:view
 //           moodle/site:deleteuser
 //
-// The variable name for the capability definitions array follows the format
-//   $<componenttype>_<component_name>_capabilities
-//
-// For the core capabilities, the variable is $moodle_capabilities.
+// The variable name for the capability definitions array is $capabilities
 
 
-$mod_glossary_capabilities = array(
+$capabilities = array(
 
     'mod/glossary:write' => array(
 

diff --git a/mod/hotpot/db/access.php b/mod/hotpot/db/access.php
index 5807d58736d1f6a7db8e9688baad5d1e2e1528d7..57c847d8dbc8b2b8b68b12581145de72543845c1 100644 (file)
--- a/mod/hotpot/db/access.php
+++ b/mod/hotpot/db/access.php
@@ -14,7 +14,7 @@
 //
 // It is important that capability names are unique. The naming convention
 // for capabilities that are specific to modules and blocks is as follows:
-//   [mod/block]/<component_name>:<capabilityname>
+//   [mod/block]/<plugin_name>:<capabilityname>
 //
 // component_name should be the same as the directory name of the mod or block.
 //
@@ -25,13 +25,10 @@
 //           block/recent_activity:view
 //           moodle/site:deleteuser
 //
-// The variable name for the capability definitions array follows the format
-//   $<componenttype>_<component_name>_capabilities
-//
-// For the core capabilities, the variable is $moodle_capabilities.
+// The variable name for the capability definitions array is $capabilities
 
 
-$mod_hotpot_capabilities = array(
+$capabilities = array(
 
     'mod/hotpot:attempt' => array(
 

diff --git a/mod/imscp/db/access.php b/mod/imscp/db/access.php
index d2e6d95b84e90cb56d98f18a474ba8606884977c..3b3c62659ca607b7c3f725d10528e4580c2e358a 100644 (file)
--- a/mod/imscp/db/access.php
+++ b/mod/imscp/db/access.php
@@ -23,7 +23,7 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$mod_imscp_capabilities = array(
+$capabilities = array(
 
 /* TODO: review public portfolio API first!
     'mod/imscp:portfolioexport' => array(

diff --git a/mod/lesson/db/access.php b/mod/lesson/db/access.php
index 2c3a10c410d0b7ec4bf332418dacf0d9c6d78e73..60adf6ae3b9a1c1d448f162f0c6c8f64d9c51929 100644 (file)
--- a/mod/lesson/db/access.php
+++ b/mod/lesson/db/access.php
@@ -4,7 +4,7 @@
  *
  * For naming conventions, see lib/db/access.php.
  */
-$mod_lesson_capabilities = array(
+$capabilities = array(
 
     'mod/lesson:edit' => array(
 

diff --git a/mod/page/db/access.php b/mod/page/db/access.php
index d3700a662eb8ad3bfbc6db7b69c7f757766cf2a5..233416a64fc062cc216983d5a6cb34d86e97aea4 100644 (file)
--- a/mod/page/db/access.php
+++ b/mod/page/db/access.php
@@ -23,7 +23,7 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$mod_page_capabilities = array(
+$capabilities = array(
 /* TODO: review public portfolio API first!
     'mod/page:portfolioexport' => array(
 

diff --git a/mod/quiz/db/access.php b/mod/quiz/db/access.php
index 4403c67f6be929a53dc0974580c7ca349d7741f8..ff9fb90f120a7355c4f89649567f7baa43e2808f 100644 (file)
--- a/mod/quiz/db/access.php
+++ b/mod/quiz/db/access.php
@@ -4,7 +4,7 @@
  *
  * For naming conventions, see lib/db/access.php.
  */
-$mod_quiz_capabilities = array(
+$capabilities = array(
 
     // Ability to see that the quiz exists, and the basic information
     // about it, for example the start date and time limit.

diff --git a/mod/quiz/report/statistics/db/access.php b/mod/quiz/report/statistics/db/access.php
index 8bd229a8b0d69b401fdaf84fb0beff9dfe25c888..a9266e72ed46cba5b77b70a1ea451563835d0783 100644 (file)
--- a/mod/quiz/report/statistics/db/access.php
+++ b/mod/quiz/report/statistics/db/access.php
@@ -4,7 +4,7 @@
  *
  * For naming conventions, see lib/db/access.php.
  */
-$quiz_statistics_capabilities = array(
+$capabilities = array(
     'quizreport/statistics:view' => array(
         'captype' => 'read',
         'contextlevel' => CONTEXT_MODULE,

diff --git a/mod/resource/db/access.php b/mod/resource/db/access.php
index 7a849104895e74ebc3632c23443c438328da0c0f..6adf28582e186b8b64c661670fca228d00acf5a7 100644 (file)
--- a/mod/resource/db/access.php
+++ b/mod/resource/db/access.php
@@ -23,7 +23,7 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$mod_resource_capabilities = array(
+$capabilities = array(
 /* TODO: review public portfolio API first!
     'mod/resource:portfolioexport' => array(
 

diff --git a/mod/scorm/db/access.php b/mod/scorm/db/access.php
index 20676a31fae5bdeedbbb465ca4e2dafdb3ea7788..8d90384a3815a5fd2ab25e6da26e0ed03253d78f 100644 (file)
--- a/mod/scorm/db/access.php
+++ b/mod/scorm/db/access.php
@@ -14,7 +14,7 @@
 //
 // It is important that capability names are unique. The naming convention
 // for capabilities that are specific to modules and blocks is as follows:
-//   [mod/block]/<component_name>:<capabilityname>
+//   [mod/block]/<plugin_name>:<capabilityname>
 //
 // component_name should be the same as the directory name of the mod or block.
 //
@@ -25,13 +25,10 @@
 //           block/recent_activity:view
 //           moodle/site:deleteuser
 //
-// The variable name for the capability definitions array follows the format
-//   $<componenttype>_<component_name>_capabilities
-//
-// For the core capabilities, the variable is $moodle_capabilities.
+// The variable name for the capability definitions array is $capabilities
 
 
-$mod_scorm_capabilities = array(
+$capabilities = array(
 
     'mod/scorm:viewreport' => array(
 

diff --git a/mod/survey/db/access.php b/mod/survey/db/access.php
index 201a0a292249d44ddb4045ff38295354b25645ba..0401b8a175d68c47077f357d5e3fd72a900dc8a4 100644 (file)
--- a/mod/survey/db/access.php
+++ b/mod/survey/db/access.php
@@ -14,7 +14,7 @@
 //
 // It is important that capability names are unique. The naming convention
 // for capabilities that are specific to modules and blocks is as follows:
-//   [mod/block]/<component_name>:<capabilityname>
+//   [mod/block]/<plugin_name>:<capabilityname>
 //
 // component_name should be the same as the directory name of the mod or block.
 //
@@ -25,13 +25,10 @@
 //           block/recent_activity:view
 //           moodle/site:deleteuser
 //
-// The variable name for the capability definitions array follows the format
-//   $<componenttype>_<component_name>_capabilities
-//
-// For the core capabilities, the variable is $moodle_capabilities.
+// The variable name for the capability definitions array is $capabilities
 
 
-$mod_survey_capabilities = array(
+$capabilities = array(
 
     'mod/survey:participate' => array(
 

diff --git a/mod/url/db/access.php b/mod/url/db/access.php
index a14e4f1555ebbd61bb283345ae950986aa213a05..53d9d1fc90538b27c631667903d205b6649e11bb 100644 (file)
--- a/mod/url/db/access.php
+++ b/mod/url/db/access.php
@@ -23,7 +23,7 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$mod_url_capabilities = array(
+$capabilities = array(
 /* TODO: review public portfolio API first!
     'mod/url:portfolioexport' => array(
 

diff --git a/mod/wiki/db/access.php b/mod/wiki/db/access.php
index c05b08f71f53e584c117a06093d3b2334c667b86..25e84fd84039bb7773cc625d58d7c900b76a9c9f 100644 (file)
--- a/mod/wiki/db/access.php
+++ b/mod/wiki/db/access.php
@@ -4,7 +4,7 @@
  *
  * For naming conventions, see lib/db/access.php.
  */
-$mod_wiki_capabilities = array(
+$capabilities = array(
 
     'mod/wiki:participate' => array(
 

diff --git a/repository/alfresco/db/access.php b/repository/alfresco/db/access.php
index a3dc399ab002cd92366160543a5c755c1817ac3e..8b6755fa759d0d58bb7de5ee9b5855e30b60babd 100644 (file)
--- a/repository/alfresco/db/access.php
+++ b/repository/alfresco/db/access.php
@@ -1,6 +1,6 @@
 <?php
 
-$repository_alfresco_capabilities = array(
+$capabilities = array(
 
     'repository/alfresco:view' => array(
         'captype' => 'read',

diff --git a/repository/boxnet/db/access.php b/repository/boxnet/db/access.php
index 234c112283e3c4846700b83302c01c136bc14604..0398a7e769a8c21029b6ebf82e950663c65479a6 100644 (file)
--- a/repository/boxnet/db/access.php
+++ b/repository/boxnet/db/access.php
@@ -1,6 +1,6 @@
 <?php
 
-$repository_boxnet_capabilities = array(
+$capabilities = array(
 
     'repository/boxnet:view' => array(
         'captype' => 'read',

diff --git a/repository/draft/db/access.php b/repository/draft/db/access.php
index ca26bc1c897b3cdfea946877e53aea5b690ed5c4..f0096d73961f013deb24683749bf78fde31380cd 100644 (file)
--- a/repository/draft/db/access.php
+++ b/repository/draft/db/access.php
@@ -1,6 +1,6 @@
 <?php
 
-$repository_draft_capabilities = array(
+$capabilities = array(
 
     'repository/draft:view' => array(
         'captype' => 'read',

diff --git a/repository/filesystem/db/access.php b/repository/filesystem/db/access.php
index 05009b4ef9486f69884257babe1438fe2fbac109..8c06bae9b25c149e3580bb04d488ef2df15c8675 100644 (file)
--- a/repository/filesystem/db/access.php
+++ b/repository/filesystem/db/access.php
@@ -1,6 +1,6 @@
 <?php
 
-$repository_filesystem_capabilities = array(
+$capabilities = array(
 
     'repository/filesystem:view' => array(
         'captype' => 'read',

diff --git a/repository/flickr/db/access.php b/repository/flickr/db/access.php
index 3d4e30cbb2e1459b4c6aed9815513c92bbf90434..c96752ee004b792d7eca755671889460efae83f1 100644 (file)
--- a/repository/flickr/db/access.php
+++ b/repository/flickr/db/access.php
@@ -1,6 +1,6 @@
 <?php
 
-$repository_flickr_capabilities = array(
+$capabilities = array(
 
     'repository/flickr:view' => array(
         'captype' => 'read',

diff --git a/repository/flickr_public/db/access.php b/repository/flickr_public/db/access.php
index 4c1305ab2c6a138a666d4f644fbb4180987ce904..9210c9e7b5b9acdf8cbd3bc8db5e3fcb01235392 100644 (file)
--- a/repository/flickr_public/db/access.php
+++ b/repository/flickr_public/db/access.php
@@ -1,6 +1,6 @@
 <?php
 
-$repository_flickr_public_capabilities = array(
+$capabilities = array(
 
     'repository/flickr_public:view' => array(
         'captype' => 'read',

diff --git a/repository/googledocs/db/access.php b/repository/googledocs/db/access.php
index eb17fc02de94fdeacd27dcc94dad5d9bdaa93874..d4b10c58c308f1f949421d974ad371440266e576 100644 (file)
--- a/repository/googledocs/db/access.php
+++ b/repository/googledocs/db/access.php
@@ -1,6 +1,6 @@
 <?php
 
-$repository_googledocs_capabilities = array(
+$capabilities = array(
 
     'repository/googledocs:view' => array(
         'captype' => 'read',

diff --git a/repository/local/db/access.php b/repository/local/db/access.php
index c64bac4419c8b166bb4f34a1458145f1dea076a7..89a3a5418ffff2a91c8d3285a82071c1af042734 100644 (file)
--- a/repository/local/db/access.php
+++ b/repository/local/db/access.php
@@ -1,6 +1,6 @@
 <?php
 
-$repository_local_capabilities = array(
+$capabilities = array(
 
     'repository/local:view' => array(
         'captype' => 'read',

diff --git a/repository/mahara/db/access.php b/repository/mahara/db/access.php
index 28606145536b94c4cff4723f6d8e7399e9f917c2..6e60e781657cfc52975592da237d0dc254e13090 100644 (file)
--- a/repository/mahara/db/access.php
+++ b/repository/mahara/db/access.php
@@ -1,6 +1,6 @@
 <?php
 
-$repository_mahara_capabilities = array(
+$capabilities = array(
 
     'repository/mahara:view' => array(
         'captype' => 'read',

diff --git a/repository/picasa/db/access.php b/repository/picasa/db/access.php
index 72512448003685ba6e0bd84ee788f64924626e91..3da28c0ae3da1c736b431ad505a893bc53fa29ff 100644 (file)
--- a/repository/picasa/db/access.php
+++ b/repository/picasa/db/access.php
@@ -1,6 +1,6 @@
 <?php
 
-$repository_picasa_capabilities = array(
+$capabilities = array(
 
     'repository/picasa:view' => array(
         'captype' => 'read',

diff --git a/repository/remotemoodle/db/access.php b/repository/remotemoodle/db/access.php
index 72cf42c5ced69f317d88e7abaf71a03974ca50a4..9ea2e4b963f2e973266ab6dfbaf1b5f15a6de4a8 100644 (file)
--- a/repository/remotemoodle/db/access.php
+++ b/repository/remotemoodle/db/access.php
@@ -1,6 +1,6 @@
 <?php
 
-$repository_remotemoodle_capabilities = array(
+$capabilities = array(
 
     'repository/remotemoodle:view' => array(
         'captype' => 'read',

diff --git a/repository/s3/db/access.php b/repository/s3/db/access.php
index 8b816b06d31592d67fef57ecd01e79c89fc70d42..7ef73a08fd6acd371be3ee98e3d115ec2c14b640 100644 (file)
--- a/repository/s3/db/access.php
+++ b/repository/s3/db/access.php
@@ -1,6 +1,6 @@
 <?php
 
-$repository_s3_capabilities = array(
+$capabilities = array(
 
     'repository/s3:view' => array(
         'captype' => 'read',

diff --git a/repository/upload/db/access.php b/repository/upload/db/access.php
index e14d8aeb301e1db576a53f3bcb9fa161efda24f4..eac552b3629080e7ebdf4ab74aa814c59212b380 100644 (file)
--- a/repository/upload/db/access.php
+++ b/repository/upload/db/access.php
@@ -1,6 +1,6 @@
 <?php
 
-$repository_upload_capabilities = array(
+$capabilities = array(
 
     'repository/upload:view' => array(
         'captype' => 'read',

diff --git a/repository/url/db/access.php b/repository/url/db/access.php
index ef2f4e94977aa07f39c82ceccaf9be7f7b326c5b..31cb3d9cd41886d2fbf9ad40d65b1c2eb4050b7b 100644 (file)
--- a/repository/url/db/access.php
+++ b/repository/url/db/access.php
@@ -1,6 +1,6 @@
 <?php
 
-$repository_url_capabilities = array(
+$capabilities = array(
 
     'repository/url:view' => array(
         'captype' => 'read',

diff --git a/repository/webdav/db/access.php b/repository/webdav/db/access.php
index 56ec3be3e7e6dbd6605d803944dd19bea79a7036..0e9d3d04c99c564e1a5f65fbe4bab81b8aa65cba 100644 (file)
--- a/repository/webdav/db/access.php
+++ b/repository/webdav/db/access.php
@@ -1,6 +1,6 @@
 <?php
 
-$repository_webdav_capabilities = array(
+$capabilities = array(
 
     'repository/webdav:view' => array(
         'captype' => 'read',

diff --git a/repository/wikimedia/db/access.php b/repository/wikimedia/db/access.php
index 901b138fe027259f028e20372f1b10a4595ab3c8..25534fc070d24266f68d978314c98d88ef70b74e 100644 (file)
--- a/repository/wikimedia/db/access.php
+++ b/repository/wikimedia/db/access.php
@@ -1,6 +1,6 @@
 <?php
 
-$repository_wikimedia_capabilities = array(
+$capabilities = array(
 
     'repository/wikimedia:view' => array(
         'captype' => 'read',

diff --git a/repository/youtube/db/access.php b/repository/youtube/db/access.php
index 8fca2211e17096b0bd822a29f4066e9ce6e2ce54..94c394494f3d5d8034a230d76fc5286348429b0d 100644 (file)
--- a/repository/youtube/db/access.php
+++ b/repository/youtube/db/access.php
@@ -1,6 +1,6 @@
 <?php
 
-$repository_youtube_capabilities = array(
+$capabilities = array(
 
     'repository/youtube:view' => array(
         'captype' => 'read',

diff --git a/webservice/amf/db/access.php b/webservice/amf/db/access.php
index c2397fc1582b20e4304862bed3c6f8d58f0f5f6a..101f33ffc4c451821326a8de07a54915d708922f 100644 (file)
--- a/webservice/amf/db/access.php
+++ b/webservice/amf/db/access.php
@@ -1,6 +1,6 @@
 <?php
 
-$webservice_amf_capabilities = array(
+$capabilities = array(
 
     'webservice/amf:use' => array(
         'captype' => 'read', // in fact this may be considered read and write at the same time

diff --git a/webservice/rest/db/access.php b/webservice/rest/db/access.php
index e5de8842a47fc097dc16c7f8b2e9338b077c92e8..f836e630b0c6c870791f7dea47113bb445fbbf22 100644 (file)
--- a/webservice/rest/db/access.php
+++ b/webservice/rest/db/access.php
@@ -1,6 +1,6 @@
 <?php
 
-$webservice_rest_capabilities = array(
+$capabilities = array(
 
     'webservice/rest:use' => array(
         'captype' => 'read', // in fact this may be considered read and write at the same time

diff --git a/webservice/soap/db/access.php b/webservice/soap/db/access.php
index fb2d705a6c4edf5cd0f609b4a6be4b2d2e72ec92..275e8471c2bc28bffeab9d4aaa113ea8a20eede7 100644 (file)
--- a/webservice/soap/db/access.php
+++ b/webservice/soap/db/access.php
@@ -1,6 +1,6 @@
 <?php
 
-$webservice_soap_capabilities = array(
+$capabilities = array(
 
     'webservice/soap:use' => array(
         'captype' => 'read', // in fact this may be considered read and write at the same time

diff --git a/webservice/xmlrpc/db/access.php b/webservice/xmlrpc/db/access.php
index 1c58213e31e6b5496a7d405ef41c40a52ba8fcae..8aaf944ef22bce74a1343fbe2e4836d4fbf0aa3f 100644 (file)
--- a/webservice/xmlrpc/db/access.php
+++ b/webservice/xmlrpc/db/access.php
@@ -1,6 +1,6 @@
 <?php
 
-$webservice_xmlrpc_capabilities = array(
+$capabilities = array(
 
     'webservice/xmlrpc:use' => array(
         'captype' => 'read', // in fact this may be considered read and write at the same time