From 0ac940b3bf7606d292433dfbf9792672290a1583 Mon Sep 17 00:00:00 2001 From: Petr Skoda Date: Wed, 4 Nov 2009 19:24:12 +0000 Subject: [PATCH] MDL-20712 using just $capablities for capability definition array, all other files in db/* do not use component names in definition array; old capability array names are of course supported --- admin/report/courseoverview/db/access.php | 2 +- admin/report/questioninstances/db/access.php | 2 +- admin/report/security/db/access.php | 2 +- admin/report/unittest/db/access.php | 2 +- blocks/online_users/db/access.php | 2 +- blocks/rss_client/db/access.php | 9 +++------ course/report/log/db/access.php | 2 +- course/report/outline/db/access.php | 2 +- course/report/participation/db/access.php | 2 +- course/report/progress/db/access.php | 2 +- course/report/stats/db/access.php | 2 +- enrol/authorize/db/access.php | 2 +- grade/export/ods/db/access.php | 2 +- grade/export/txt/db/access.php | 2 +- grade/export/xls/db/access.php | 2 +- grade/export/xml/db/access.php | 2 +- grade/import/csv/db/access.php | 2 +- grade/import/xml/db/access.php | 2 +- grade/report/grader/db/access.php | 2 +- grade/report/outcomes/db/access.php | 2 +- grade/report/overview/db/access.php | 2 +- grade/report/user/db/access.php | 2 +- lib/accesslib.php | 6 +++++- lib/db/access.php | 9 +++------ mod/assignment/db/access.php | 9 +++------ mod/chat/db/access.php | 9 +++------ mod/choice/db/access.php | 9 +++------ mod/data/db/access.php | 9 +++------ mod/feedback/db/access.php | 9 +++------ mod/folder/db/access.php | 2 +- mod/forum/db/access.php | 9 +++------ mod/glossary/db/access.php | 9 +++------ mod/hotpot/db/access.php | 9 +++------ mod/imscp/db/access.php | 2 +- mod/lesson/db/access.php | 2 +- mod/page/db/access.php | 2 +- mod/quiz/db/access.php | 2 +- mod/quiz/report/statistics/db/access.php | 2 +- mod/resource/db/access.php | 2 +- mod/scorm/db/access.php | 9 +++------ mod/survey/db/access.php | 9 +++------ mod/url/db/access.php | 2 +- mod/wiki/db/access.php | 2 +- repository/alfresco/db/access.php | 2 +- repository/boxnet/db/access.php | 2 +- repository/draft/db/access.php | 2 +- repository/filesystem/db/access.php | 2 +- repository/flickr/db/access.php | 2 +- repository/flickr_public/db/access.php | 2 +- repository/googledocs/db/access.php | 2 +- repository/local/db/access.php | 2 +- repository/mahara/db/access.php | 2 +- repository/picasa/db/access.php | 2 +- repository/remotemoodle/db/access.php | 2 +- repository/s3/db/access.php | 2 +- repository/upload/db/access.php | 2 +- repository/url/db/access.php | 2 +- repository/webdav/db/access.php | 2 +- repository/wikimedia/db/access.php | 2 +- repository/youtube/db/access.php | 2 +- webservice/amf/db/access.php | 2 +- webservice/rest/db/access.php | 2 +- webservice/soap/db/access.php | 2 +- webservice/xmlrpc/db/access.php | 2 +- 64 files changed, 92 insertions(+), 124 deletions(-) diff --git a/admin/report/courseoverview/db/access.php b/admin/report/courseoverview/db/access.php index 2c67744f40de4..c2145dc07efe0 100644 --- 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 695453ad3ab6b..7afd65a3cc016 100644 --- 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 aab6184f427e0..479e71b2d6dc5 100644 --- 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 0aa23361553c0..73d906b344af4 100644 --- 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 54b16e9023bfd..3cddaad042f1f 100644 --- 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 c68ed49b0d6bb..616ac49b86ce4 100644 --- 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]/: +// [mod/block]/: // // 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 -// $__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 43e741acd85ec..18f079a0fcf64 100644 --- 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 81a752302b00c..328d0c70c4c54 100644 --- 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 d90bc72023609..5edafb640d41e 100644 --- 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 dbb4390dd77fc..0e89482b70c37 100644 --- 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 29dbd7914b918..f99352889f15f 100644 --- 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 954bf74f066d3..26973c2dba1a4 100644 --- a/enrol/authorize/db/access.php +++ b/enrol/authorize/db/access.php @@ -1,6 +1,6 @@ array( 'riskbitmask' => RISK_PERSONAL, diff --git a/grade/export/ods/db/access.php b/grade/export/ods/db/access.php index 1528af655b70c..e160cd32e1845 100644 --- 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 . -$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 090ec71dade76..3a9ba9e92b306 100644 --- 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 . -$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 d3dc43b4db90b..cacc0b147669c 100644 --- 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 . -$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 d54cee6d44f77..1c0aa5162482d 100644 --- 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 . -$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 17fe2912eeac7..fc70ede19a8ad 100644 --- 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 . -$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 2d3bd0c923583..12124fb76dd4a 100644 --- 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 . -$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 fa0e7ddb59752..98b75a71bc519 100644 --- 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 . -$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 38b8389e55e88..bc8df5740bf69 100644 --- 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 . -$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 21a4d4971cbe5..3e3d97880f537 100644 --- 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 . -$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 3917c28183e4e..a8b0e79fd6265 100644 --- 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 . -$gradereport_user_capabilities = array( +$capabilities = array( 'gradereport/user:view' => array( 'riskbitmask' => RISK_PERSONAL, diff --git a/lib/accesslib.php b/lib/accesslib.php index 27cef15ecc8c2..d4a03108b8367 100755 --- 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 eddbdd51f7ccf..05f014001a8fe 100644 --- 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]/: +// [mod/block]/: // // 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 -// $__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 83df79296cf99..ab37c0b0c1c71 100644 --- 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]/: +// [mod/block]/: // // 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 -// $__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 e68ca6a5287c9..935589877f9c5 100644 --- 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]/: +// [mod/block]/: // // 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 -// $__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 d6471ca4b9027..2e7cc0e71d981 100644 --- 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]/: +// [mod/block]/: // // 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 -// $__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 24510b5c407fa..3c54db970aac0 100644 --- 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]/: +// [mod/block]/: // // 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 -// $__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 40be7788078fa..18e0d2ef94226 100644 --- 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]/: +// [mod/block]/: // // 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 -// $__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 5fdd8eaa704b3..6916626b918fa 100644 --- 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 42b4742e9796d..fd144f1e35cdc 100644 --- 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]/: +// [mod/block]/: // // 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 -// $__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 51b72925d9446..7e47f5850619c 100644 --- 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]/: +// [mod/block]/: // // 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 -// $__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 5807d58736d1f..57c847d8dbc8b 100644 --- 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]/: +// [mod/block]/: // // 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 -// $__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 d2e6d95b84e90..3b3c62659ca60 100644 --- 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 2c3a10c410d0b..60adf6ae3b9a1 100644 --- 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 d3700a662eb8a..233416a64fc06 100644 --- 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 4403c67f6be92..ff9fb90f120a7 100644 --- 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 8bd229a8b0d69..a9266e72ed46c 100644 --- 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 7a849104895e7..6adf28582e186 100644 --- 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 20676a31fae5b..8d90384a3815a 100644 --- 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]/: +// [mod/block]/: // // 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 -// $__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 201a0a292249d..0401b8a175d68 100644 --- 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]/: +// [mod/block]/: // // 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 -// $__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 a14e4f1555ebb..53d9d1fc90538 100644 --- 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 c05b08f71f53e..25e84fd84039b 100644 --- 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 a3dc399ab002c..8b6755fa759d0 100644 --- a/repository/alfresco/db/access.php +++ b/repository/alfresco/db/access.php @@ -1,6 +1,6 @@ array( 'captype' => 'read', diff --git a/repository/boxnet/db/access.php b/repository/boxnet/db/access.php index 234c112283e3c..0398a7e769a8c 100644 --- a/repository/boxnet/db/access.php +++ b/repository/boxnet/db/access.php @@ -1,6 +1,6 @@ array( 'captype' => 'read', diff --git a/repository/draft/db/access.php b/repository/draft/db/access.php index ca26bc1c897b3..f0096d73961f0 100644 --- a/repository/draft/db/access.php +++ b/repository/draft/db/access.php @@ -1,6 +1,6 @@ array( 'captype' => 'read', diff --git a/repository/filesystem/db/access.php b/repository/filesystem/db/access.php index 05009b4ef9486..8c06bae9b25c1 100644 --- a/repository/filesystem/db/access.php +++ b/repository/filesystem/db/access.php @@ -1,6 +1,6 @@ array( 'captype' => 'read', diff --git a/repository/flickr/db/access.php b/repository/flickr/db/access.php index 3d4e30cbb2e14..c96752ee004b7 100644 --- a/repository/flickr/db/access.php +++ b/repository/flickr/db/access.php @@ -1,6 +1,6 @@ array( 'captype' => 'read', diff --git a/repository/flickr_public/db/access.php b/repository/flickr_public/db/access.php index 4c1305ab2c6a1..9210c9e7b5b9a 100644 --- a/repository/flickr_public/db/access.php +++ b/repository/flickr_public/db/access.php @@ -1,6 +1,6 @@ array( 'captype' => 'read', diff --git a/repository/googledocs/db/access.php b/repository/googledocs/db/access.php index eb17fc02de94f..d4b10c58c308f 100644 --- a/repository/googledocs/db/access.php +++ b/repository/googledocs/db/access.php @@ -1,6 +1,6 @@ array( 'captype' => 'read', diff --git a/repository/local/db/access.php b/repository/local/db/access.php index c64bac4419c8b..89a3a5418ffff 100644 --- a/repository/local/db/access.php +++ b/repository/local/db/access.php @@ -1,6 +1,6 @@ array( 'captype' => 'read', diff --git a/repository/mahara/db/access.php b/repository/mahara/db/access.php index 28606145536b9..6e60e781657cf 100644 --- a/repository/mahara/db/access.php +++ b/repository/mahara/db/access.php @@ -1,6 +1,6 @@ array( 'captype' => 'read', diff --git a/repository/picasa/db/access.php b/repository/picasa/db/access.php index 7251244800368..3da28c0ae3da1 100644 --- a/repository/picasa/db/access.php +++ b/repository/picasa/db/access.php @@ -1,6 +1,6 @@ array( 'captype' => 'read', diff --git a/repository/remotemoodle/db/access.php b/repository/remotemoodle/db/access.php index 72cf42c5ced69..9ea2e4b963f2e 100644 --- a/repository/remotemoodle/db/access.php +++ b/repository/remotemoodle/db/access.php @@ -1,6 +1,6 @@ array( 'captype' => 'read', diff --git a/repository/s3/db/access.php b/repository/s3/db/access.php index 8b816b06d3159..7ef73a08fd6ac 100644 --- a/repository/s3/db/access.php +++ b/repository/s3/db/access.php @@ -1,6 +1,6 @@ array( 'captype' => 'read', diff --git a/repository/upload/db/access.php b/repository/upload/db/access.php index e14d8aeb301e1..eac552b362908 100644 --- a/repository/upload/db/access.php +++ b/repository/upload/db/access.php @@ -1,6 +1,6 @@ array( 'captype' => 'read', diff --git a/repository/url/db/access.php b/repository/url/db/access.php index ef2f4e94977aa..31cb3d9cd4188 100644 --- a/repository/url/db/access.php +++ b/repository/url/db/access.php @@ -1,6 +1,6 @@ array( 'captype' => 'read', diff --git a/repository/webdav/db/access.php b/repository/webdav/db/access.php index 56ec3be3e7e6d..0e9d3d04c99c5 100644 --- a/repository/webdav/db/access.php +++ b/repository/webdav/db/access.php @@ -1,6 +1,6 @@ array( 'captype' => 'read', diff --git a/repository/wikimedia/db/access.php b/repository/wikimedia/db/access.php index 901b138fe0272..25534fc070d24 100644 --- a/repository/wikimedia/db/access.php +++ b/repository/wikimedia/db/access.php @@ -1,6 +1,6 @@ array( 'captype' => 'read', diff --git a/repository/youtube/db/access.php b/repository/youtube/db/access.php index 8fca2211e1709..94c394494f3d5 100644 --- a/repository/youtube/db/access.php +++ b/repository/youtube/db/access.php @@ -1,6 +1,6 @@ array( 'captype' => 'read', diff --git a/webservice/amf/db/access.php b/webservice/amf/db/access.php index c2397fc1582b2..101f33ffc4c45 100644 --- a/webservice/amf/db/access.php +++ b/webservice/amf/db/access.php @@ -1,6 +1,6 @@ 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 e5de8842a47fc..f836e630b0c6c 100644 --- a/webservice/rest/db/access.php +++ b/webservice/rest/db/access.php @@ -1,6 +1,6 @@ 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 fb2d705a6c4ed..275e8471c2bc2 100644 --- a/webservice/soap/db/access.php +++ b/webservice/soap/db/access.php @@ -1,6 +1,6 @@ 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 1c58213e31e6b..8aaf944ef22bc 100644 --- a/webservice/xmlrpc/db/access.php +++ b/webservice/xmlrpc/db/access.php @@ -1,6 +1,6 @@ array( 'captype' => 'read', // in fact this may be considered read and write at the same time