MDL-23502 fixed php docs in enrol/cohort + readding config capability…

… for more fine grained access control
moodle · Jul 31, 2010 · 465f508 · 465f508
1 parent fe44193
commit 465f508
Show file tree

Hide file tree

Showing 9 changed files with 61 additions and 29 deletions.
diff --git a/enrol/cohort/addinstance.php b/enrol/cohort/addinstance.php
@@ -18,9 +18,10 @@
 /**
  * Adds new instance of enrol_cohort to specified course.
  *
- * @package   enrol_cohort
- * @copyright 2010 Petr Skoda  {@link http://skodak.org}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    enrol
+ * @subpackage cohort
+ * @copyright  2010 Petr Skoda {@link http://skodak.org}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 require('../../config.php');

diff --git a/enrol/cohort/addinstance_form.php b/enrol/cohort/addinstance_form.php
@@ -18,9 +18,10 @@
 /**
  * Adds instance form
  *
- * @package   enrol_cohort
- * @copyright 2010 Petr Skoda  {@link http://skodak.org}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    enrol
+ * @subpackage cohort
+ * @copyright  2010 Petr Skoda {@link http://skodak.org}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 defined('MOODLE_INTERNAL') || die;

diff --git a/enrol/cohort/db/access.php b/enrol/cohort/db/access.php
@@ -18,10 +18,29 @@
 /**
  * Capabilities for cohort access plugin.
  *
- * @package   enrol_cohort
- * @copyright 2010 Petr Skoda {@link http://skodak.org}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    enrol
+ * @subpackage cohort
+ * @copyright  2010 Petr Skoda {@link http://skodak.org}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+defined('MOODLE_INTERNAL') || die;
+
+$capabilities = array(
+
+    'enrol/cohort:config' => array(
+
+        'captype' => 'write',
+        'contextlevel' => CONTEXT_COURSE,
+        'legacy' => array(
+            'editingteacher' => CAP_ALLOW,
+            'manager' => CAP_ALLOW,
+        )
+    ),
+
+);
+
+
+
 
 
diff --git a/enrol/cohort/db/events.php b/enrol/cohort/db/events.php
@@ -18,11 +18,14 @@
 /**
  * Cohort enrolment plugin event handler definition.
  *
- * @package   enrol_cohort
- * @copyright 2010 Petr Skoda {@link http://skodak.org}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    enrol
+ * @subpackage cohort
+ * @copyright  2010 Petr Skoda {@link http://skodak.org}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+defined('MOODLE_INTERNAL') || die;
+
 /* List of handlers */
 $handlers = array (
     'cohort_member_added' => array (

diff --git a/enrol/cohort/lang/en/enrol_cohort.php b/enrol/cohort/lang/en/enrol_cohort.php
@@ -18,10 +18,12 @@
 /**
  * Strings for component 'enrol_cohort', language 'en', branch 'MOODLE_20_STABLE'
  *
- * @package   enrol_cohort
- * @copyright 2010 Petr Skoda  {@link http://skodak.org}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    enrol
+ * @subpackage cohort
+ * @copyright  2010 Petr Skoda  {@link http://skodak.org}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+$string['cohort:config'] = 'Configure cohort instances';
 $string['pluginname'] = 'Cohort sync';
 $string['pluginname_desc'] = 'Cohort enrolment plugin synchronises cohort members with course participants.';
diff --git a/enrol/cohort/lib.php b/enrol/cohort/lib.php
@@ -18,9 +18,10 @@
 /**
  * Cohort enrolment plugin.
  *
- * @package   enrol_cohort
- * @copyright 2010 Petr Skoda {@link http://skodak.org}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    enrol
+ * @subpackage cohort
+ * @copyright  2010 Petr Skoda {@link http://skodak.org}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 defined('MOODLE_INTERNAL') || die;
@@ -66,7 +67,7 @@ public function get_newinstance_link($courseid) {
         global $DB;
 
         $coursecontext = get_context_instance(CONTEXT_COURSE, $courseid);
-        if (!has_capability('moodle/course:enrolconfig', $coursecontext)) {
+        if (!has_capability('moodle/course:enrolconfig', $coursecontext) or !has_capability('enrol/cohort:config', $coursecontext)) {
             return NULL;
         }
 

diff --git a/enrol/cohort/locallib.php b/enrol/cohort/locallib.php
@@ -18,9 +18,10 @@
 /**
  * Local stuff for cohort enrolment plugin.
  *
- * @package   enrol_cohort
- * @copyright 2010 Petr Skoda  {@link http://skodak.org}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    enrol
+ * @subpackage cohort
+ * @copyright  2010 Petr Skoda {@link http://skodak.org}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 defined('MOODLE_INTERNAL') || die;

diff --git a/enrol/cohort/settings.php b/enrol/cohort/settings.php
@@ -18,9 +18,10 @@
 /**
  * Cohort enrolment plugin settings and presets.
  *
- * @package   enrol_cohort
- * @copyright 2010 Petr Skoda {@link http://skodak.org}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    enrol
+ * @subpackage cohort
+ * @copyright  2010 Petr Skoda {@link http://skodak.org}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 defined('MOODLE_INTERNAL') || die;

diff --git a/enrol/cohort/version.php b/enrol/cohort/version.php
@@ -18,10 +18,13 @@
 /**
  * Cohort enrolment plugin version specification.
  *
- * @package   enrol_cohort
- * @copyright 2010 Petr Skoda {@link http://skodak.org}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    enrol
+ * @subpackage cohort
+ * @copyright  2010 Petr Skoda {@link http://skodak.org}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$plugin->version = 2010071800;
+defined('MOODLE_INTERNAL') || die;
+
+$plugin->version = 2010073100;
 $plugin->cron    = 60;