commit 7922ef0e34dee70699cd38477242701ce4f96d7f Author: Tristan Roscoe Date: Thu Sep 20 09:43:03 2018 -0400 MDL-43056 Add the capability moodle/site:uploadcourses for tool_uploadcourse diff --git a/admin/tool/uploadcourse/index.php b/admin/tool/uploadcourse/index.php index 69f4410..efe2ae2 100644 --- a/admin/tool/uploadcourse/index.php +++ b/admin/tool/uploadcourse/index.php @@ -26,7 +26,9 @@ require(__DIR__ . '/../../../config.php'); require_once($CFG->libdir . '/adminlib.php'); require_once($CFG->libdir . '/csvlib.class.php'); +require_login(); admin_externalpage_setup('tooluploadcourse'); +require_capability('moodle/site:uploadcourses', context_system::instance()); $importid = optional_param('importid', '', PARAM_INT); $previewrows = optional_param('previewrows', 10, PARAM_INT); diff --git a/admin/tool/uploadcourse/settings.php b/admin/tool/uploadcourse/settings.php index 3914e01..294a465 100644 --- a/admin/tool/uploadcourse/settings.php +++ b/admin/tool/uploadcourse/settings.php @@ -24,7 +24,5 @@ defined('MOODLE_INTERNAL') || die(); -if ($hassiteconfig) { - $ADMIN->add('courses', new admin_externalpage('tooluploadcourse', - get_string('uploadcourses', 'tool_uploadcourse'), "$CFG->wwwroot/$CFG->admin/tool/uploadcourse/index.php")); -} +$ADMIN->add('courses', new admin_externalpage('tooluploadcourse', + get_string('uploadcourses', 'tool_uploadcourse'), "$CFG->wwwroot/$CFG->admin/tool/uploadcourse/index.php", 'moodle/site:uploadcourses')); diff --git a/admin/tool/uploadcourse/version.php b/admin/tool/uploadcourse/version.php index 8573143..4e0556e 100644 --- a/admin/tool/uploadcourse/version.php +++ b/admin/tool/uploadcourse/version.php @@ -24,6 +24,6 @@ defined('MOODLE_INTERNAL') || die(); -$plugin->version = 2018051400; // The current plugin version (Date: YYYYMMDDXX). +$plugin->version = 2018092000; // The current plugin version (Date: YYYYMMDDXX). $plugin->requires = 2018050800; // Requires this Moodle version. $plugin->component = 'tool_uploadcourse'; // Full name of the plugin (used for diagnostics). diff --git a/lib/db/access.php b/lib/db/access.php index 1652534..57aa434 100644 --- a/lib/db/access.php +++ b/lib/db/access.php @@ -480,6 +480,17 @@ $capabilities = array( ) ), + 'moodle/site:site:uploadcourses' => array( + + 'riskbitmask' => RISK_SPAM | RISK_PERSONAL, + + 'captype' => 'write', + 'contextlevel' => CONTEXT_SYSTEM, + 'archetypes' => array( + 'manager' => CAP_ALLOW + ) + ), + // Permission to manage filter setting overrides in subcontexts. 'moodle/filter:manage' => array(