From e25f24669b7c94877890bbe8bcaac52a698e09c1 Mon Sep 17 00:00:00 2001 From: Petr Skoda Date: Sat, 31 Jul 2010 20:02:56 +0000 Subject: [PATCH] MDL-23502 improved new instance function name --- enrol/category/lib.php | 2 +- enrol/cohort/addinstance.php | 2 +- enrol/cohort/lib.php | 2 +- enrol/guest/addinstance.php | 2 +- enrol/guest/lib.php | 2 +- enrol/instances.php | 2 +- enrol/manual/lib.php | 2 +- enrol/meta/addinstance.php | 2 +- enrol/meta/lib.php | 2 +- enrol/mnet/addinstance.php | 2 +- enrol/mnet/lib.php | 2 +- enrol/paypal/lib.php | 2 +- enrol/self/lib.php | 2 +- lib/enrollib.php | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/enrol/category/lib.php b/enrol/category/lib.php index 01f3466b919..01ddf968cf5 100644 --- a/enrol/category/lib.php +++ b/enrol/category/lib.php @@ -53,7 +53,7 @@ class enrol_category_plugin extends enrol_plugin { * @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 index 3d66e0463e1..bef472fb507 100644 --- a/enrol/cohort/addinstance.php +++ b/enrol/cohort/addinstance.php @@ -46,7 +46,7 @@ if ($courseadmin && $courseadmin->get('users') && $courseadmin->get('users')->ge $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 index f6fcb384e5d..ca7af375b1e 100644 --- a/enrol/cohort/lib.php +++ b/enrol/cohort/lib.php @@ -62,7 +62,7 @@ class enrol_cohort_plugin extends enrol_plugin { * @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 index 92f77c2726e..fda26d976c0 100644 --- a/enrol/guest/addinstance.php +++ b/enrol/guest/addinstance.php @@ -36,7 +36,7 @@ require_sesskey(); $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 index ea37f24cc6b..2271d1925ba 100644 --- a/enrol/guest/lib.php +++ b/enrol/guest/lib.php @@ -66,7 +66,7 @@ class enrol_guest_plugin extends enrol_plugin { * @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 index e7cd09db72d..1a28b822992 100644 --- a/enrol/instances.php +++ b/enrol/instances.php @@ -222,7 +222,7 @@ echo html_writer::table($table); // 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 index 46f20e5cbca..62bf8b70643 100644 --- a/enrol/manual/lib.php +++ b/enrol/manual/lib.php @@ -126,7 +126,7 @@ class enrol_manual_plugin extends enrol_plugin { * @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 index 6fa2f1e099a..a800313018f 100644 --- a/enrol/meta/addinstance.php +++ b/enrol/meta/addinstance.php @@ -36,7 +36,7 @@ require_login($course); 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 index 7323ead6a31..ecbddea50c9 100644 --- a/enrol/meta/lib.php +++ b/enrol/meta/lib.php @@ -57,7 +57,7 @@ class enrol_meta_plugin extends enrol_plugin { * @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 index a112430d123..227bf823c5c 100644 --- a/enrol/mnet/addinstance.php +++ b/enrol/mnet/addinstance.php @@ -47,7 +47,7 @@ if ($courseadmin && $courseadmin->get('users') && $courseadmin->get('users')->ge $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 index 9e618564637..8c678ba55ba 100644 --- a/enrol/mnet/lib.php +++ b/enrol/mnet/lib.php @@ -71,7 +71,7 @@ class enrol_mnet_plugin extends enrol_plugin { * @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 index f132f40bc39..7932f689bd0 100644 --- a/enrol/paypal/lib.php +++ b/enrol/paypal/lib.php @@ -100,7 +100,7 @@ class enrol_paypal_plugin extends enrol_plugin { * @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 index a1064253307..b17b6ffcbc8 100644 --- a/enrol/self/lib.php +++ b/enrol/self/lib.php @@ -118,7 +118,7 @@ class enrol_self_plugin extends enrol_plugin { * @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 index 1e2caf72435..d46d36949fd 100644 --- a/lib/enrollib.php +++ b/lib/enrollib.php @@ -1055,7 +1055,7 @@ abstract class enrol_plugin { * @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; }