MDL-23502 improved new instance function name

DavidSichau · Jul 31, 2010 · e25f246 · e25f246
1 parent 42761bc
commit e25f246
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 14 deletions.
diff --git a/enrol/category/lib.php b/enrol/category/lib.php
@@ -53,7 +53,7 @@ public function instance_deleteable($instance) {
      * @param int $courseid
      * @return moodle_url page url
      */
-    public function get_candidate_link($courseid) {
+    public function get_newinstance_link($courseid) {
         // instances are added automatically as necessary
         return NULL;
     }

diff --git a/enrol/cohort/addinstance.php b/enrol/cohort/addinstance.php
@@ -46,7 +46,7 @@
 
 
 $enrol = enrol_get_plugin('cohort');
-if (!$enrol->get_candidate_link($course->id)) {
+if (!$enrol->get_newinstance_link($course->id)) {
     redirect(new moodle_url('/enrol/instances.php', array('id'=>$course->id)));
 }
 

diff --git a/enrol/cohort/lib.php b/enrol/cohort/lib.php
@@ -62,7 +62,7 @@ public function get_instance_name($instance) {
      * @param int $courseid
      * @return moodle_url page url
      */
-    public function get_candidate_link($courseid) {
+    public function get_newinstance_link($courseid) {
         global $DB;
 
         $coursecontext = get_context_instance(CONTEXT_COURSE, $courseid);

diff --git a/enrol/guest/addinstance.php b/enrol/guest/addinstance.php
@@ -36,7 +36,7 @@
 
 $enrol = enrol_get_plugin('guest');
 
-if ($enrol->get_candidate_link($course->id)) {
+if ($enrol->get_newinstance_link($course->id)) {
     $enrol->add_default_instance($course);
 }
 

diff --git a/enrol/guest/lib.php b/enrol/guest/lib.php
@@ -66,7 +66,7 @@ public function try_guestaccess(stdClass $instance) {
      * @param int $courseid
      * @return moodle_url page url
      */
-    public function get_candidate_link($courseid) {
+    public function get_newinstance_link($courseid) {
         global $DB;
 
         if (!has_capability('moodle/course:enrolconfig', get_context_instance(CONTEXT_COURSE, $courseid, MUST_EXIST))) {

diff --git a/enrol/instances.php b/enrol/instances.php
@@ -222,7 +222,7 @@
 // access security is in each plugin
 $candidates = array();
 foreach (enrol_get_plugins(true) as $name=>$plugin) {
-    if (!$link = $plugin->get_candidate_link($course->id)) {
+    if (!$link = $plugin->get_newinstance_link($course->id)) {
         continue;
     }
     $candidates[$link->out(false)] = get_string('pluginname', 'enrol_'.$name);

diff --git a/enrol/manual/lib.php b/enrol/manual/lib.php
@@ -126,7 +126,7 @@ public function get_action_icons(stdClass $instance) {
      * @param int $courseid
      * @return moodle_url page url
      */
-    public function get_candidate_link($courseid) {
+    public function get_newinstance_link($courseid) {
         global $DB;
 
         $context = get_context_instance(CONTEXT_COURSE, $courseid, MUST_EXIST);

diff --git a/enrol/meta/addinstance.php b/enrol/meta/addinstance.php
@@ -36,7 +36,7 @@
 require_capability('moodle/course:enrolconfig', $context);
 
 $enrol = enrol_get_plugin('meta');
-if (!$enrol->get_candidate_link($course->id)) {
+if (!$enrol->get_newinstance_link($course->id)) {
     redirect(new moodle_url('/enrol/instances.php', array('id'=>$course->id)));
 }
 

diff --git a/enrol/meta/lib.php b/enrol/meta/lib.php
@@ -57,7 +57,7 @@ public function get_instance_name($instance) {
      * @param int $courseid
      * @return moodle_url page url
      */
-    public function get_candidate_link($courseid) {
+    public function get_newinstance_link($courseid) {
         if (!has_capability('moodle/course:enrolconfig', get_context_instance(CONTEXT_COURSE, $courseid, MUST_EXIST))) {
             return NULL;
         }

diff --git a/enrol/mnet/addinstance.php b/enrol/mnet/addinstance.php
@@ -47,7 +47,7 @@
 
 $enrol = enrol_get_plugin('mnet');
 // make sure we were allowed to get here form the Enrolment methods page
-if (!$enrol->get_candidate_link($course->id)) {
+if (!$enrol->get_newinstance_link($course->id)) {
     redirect(new moodle_url('/enrol/instances.php', array('id'=>$course->id)));
 }
 $service = mnetservice_enrol::get_instance();

diff --git a/enrol/mnet/lib.php b/enrol/mnet/lib.php
@@ -71,7 +71,7 @@ public function get_instance_name($instance) {
      * @param int $courseid id of the course to add the instance to
      * @return moodle_url|null page url or null if instance can not be created
      */
-    public function get_candidate_link($courseid) {
+    public function get_newinstance_link($courseid) {
         global $CFG, $DB;
         require_once($CFG->dirroot.'/mnet/service/enrol/locallib.php');
 

diff --git a/enrol/paypal/lib.php b/enrol/paypal/lib.php
@@ -100,7 +100,7 @@ public function get_action_icons(stdClass $instance) {
      * @param int $courseid
      * @return moodle_url page url
      */
-    public function get_candidate_link($courseid) {
+    public function get_newinstance_link($courseid) {
         $context = get_context_instance(CONTEXT_COURSE, $courseid, MUST_EXIST);
 
         if (!has_capability('moodle/course:enrolconfig', $context) or !has_capability('enrol/paypal:config', $context)) {

diff --git a/enrol/self/lib.php b/enrol/self/lib.php
@@ -118,7 +118,7 @@ public function get_action_icons(stdClass $instance) {
      * @param int $courseid
      * @return moodle_url page url
      */
-    public function get_candidate_link($courseid) {
+    public function get_newinstance_link($courseid) {
         $context = get_context_instance(CONTEXT_COURSE, $courseid, MUST_EXIST);
 
         if (!has_capability('moodle/course:enrolconfig', $context) or !has_capability('enrol/manual:config', $context)) {

diff --git a/lib/enrollib.php b/lib/enrollib.php
@@ -1055,7 +1055,7 @@ public function sync_user_enrolments($user) {
      * @param int $courseid
      * @return moodle_url page url
      */
-    public function get_candidate_link($courseid) {
+    public function get_newinstance_link($courseid) {
         // override for most plugins, check if instance already exists in cases only one instance is supported
         return NULL;
     }