+ */
+
defined('MOODLE_INTERNAL') || die();
require_once($CFG->libdir.'/formslib.php');
-class enrol_self_edit_form extends moodleform {
+class enrol_apply_edit_form extends moodleform {
- function definition() {
+ protected function definition() {
$mform = $this->_form;
list($instance, $plugin, $context) = $this->_customdata;
@@ -26,10 +38,10 @@ class enrol_self_edit_form extends moodleform {
$mform->addElement('text', 'name', get_string('custominstancename', 'enrol'));
$mform->setType('name', PARAM_TEXT);
- $options = array(ENROL_INSTANCE_ENABLED => get_string('yes'),
- ENROL_INSTANCE_DISABLED => get_string('no'));
+ $options = array(1 => get_string('yes'),
+ 0 => get_string('no'));
$mform->addElement('select', 'status', get_string('status', 'enrol_apply'), $options);
- //$mform->addHelpButton('status', 'status', 'enrol_apply');
+ // $mform->addHelpButton('status', 'status', 'enrol_apply');
$mform->setDefault('status', $plugin->get_config('status'));
if ($instance->id) {
@@ -40,7 +52,7 @@ class enrol_self_edit_form extends moodleform {
$mform->addElement('select', 'roleid', get_string('defaultrole', 'role'), $roles);
$mform->setDefault('roleid', $plugin->get_config('roleid'));
- $mform->addElement('textarea', 'customtext1', get_string('editdescription', 'enrol_apply'));
+ $mform->addElement('textarea', 'customtext1', get_string('editdescription', 'enrol_apply'));
$mform->addElement('select', 'customint1', get_string('show_standard_user_profile', 'enrol_apply'), $options);
$mform->setDefault('customint1', $plugin->get_config('customint1'));
diff --git a/enroluser.php b/enroluser.php
deleted file mode 100644
index a7e9c7a..0000000
--- a/enroluser.php
+++ /dev/null
@@ -1,187 +0,0 @@
-dirroot.'/enrol/apply/selectlib.php');
-
-$enrolid = required_param('enrolid', PARAM_INT);
-$roleid = optional_param('roleid', -1, PARAM_INT);
-$extendperiod = optional_param('extendperiod', 0, PARAM_INT);
-$extendbase = optional_param('extendbase', 3, PARAM_INT);
-
-$instance = $DB->get_record('enrol', array('id'=>$enrolid, 'enrol'=>'apply'), '*', MUST_EXIST);
-$course = $DB->get_record('course', array('id'=>$instance->courseid), '*', MUST_EXIST);
-$context = context_course::instance($course->id, MUST_EXIST);
-
-require_login($course);
-//require_capability('enrol/manual:enrol', $context);
-//require_capability('enrol/manual:manage', $context);
-//require_capability('enrol/manual:unenrol', $context);
-
-if ($roleid < 0) {
- $roleid = $instance->roleid;
-}
-$roles = get_assignable_roles($context);
-$roles = array('0'=>get_string('none')) + $roles;
-
-if (!isset($roles[$roleid])) {
- // weird - security always first!
- $roleid = 0;
-}
-
-if (!$enrol_manual = enrol_get_plugin('apply')) {
- throw new coding_exception('Can not instantiate enrol_manual');
-}
-
-$instancename = $enrol_manual->get_instance_name($instance);
-
-$PAGE->set_url('/enrol/apply/enroluser.php', array('enrolid'=>$instance->id));
-$PAGE->set_pagelayout('admin');
-$PAGE->set_title($enrol_manual->get_instance_name($instance));
-$PAGE->set_heading($course->fullname);
-navigation_node::override_active_url(new moodle_url('/enrol/users.php', array('id'=>$course->id)));
-
-// Create the user selector objects.
-$options = array('enrolid' => $enrolid);
-
-$potentialuserselector = new enrol_apply_potential_participant('addselect', $options);
-$currentuserselector = new enrol_apply_current_participant('removeselect', $options);
-
-// Build the list of options for the enrolment period dropdown.
-$unlimitedperiod = get_string('unlimited');
-$periodmenu = array();
-for ($i=1; $i<=365; $i++) {
- $seconds = $i * 86400;
- $periodmenu[$seconds] = get_string('numdays', '', $i);
-}
-// Work out the apropriate default setting.
-if ($extendperiod) {
- $defaultperiod = $extendperiod;
-} else {
- $defaultperiod = $instance->enrolperiod;
-}
-
-// Build the list of options for the starting from dropdown.
-$timeformat = get_string('strftimedatefullshort');
-$today = time();
-$today = make_timestamp(date('Y', $today), date('m', $today), date('d', $today), 0, 0, 0);
-
-// enrolment start
-$basemenu = array();
-if ($course->startdate > 0) {
- $basemenu[2] = get_string('coursestart') . ' (' . userdate($course->startdate, $timeformat) . ')';
-}
-$basemenu[3] = get_string('today') . ' (' . userdate($today, $timeformat) . ')' ;
-
-// process add and removes
-if (optional_param('add', false, PARAM_BOOL) && confirm_sesskey()) {
- $userstoassign = $potentialuserselector->get_selected_users();
- if (!empty($userstoassign)) {
- foreach($userstoassign as $adduser) {
- switch($extendbase) {
- case 2:
- $timestart = $course->startdate;
- break;
- case 3:
- default:
- $timestart = $today;
- break;
- }
-
- if ($extendperiod <= 0) {
- $timeend = 0;
- } else {
- $timeend = $timestart + $extendperiod;
- }
- //echo "";print_r($instance);exit();
- $enrol_manual->enrol_user($instance, $adduser->id, $roleid, $timestart, $timeend);
-
- // Deprecated fixed by Shiro
- //add_to_log($course->id, 'course', 'enrol', '../enrol/users.php?id='.$course->id, $course->id); //there should be userid somewhere!
- $context = context_course::instance($course->id);
- \core\event\user_enrolment_created::create(array('context' => $context))->trigger();
- }
-
- $potentialuserselector->invalidate_selected_users();
- $currentuserselector->invalidate_selected_users();
-
- //TODO: log
- }
-}
-
-// Process incoming role unassignments
-if (optional_param('remove', false, PARAM_BOOL) && confirm_sesskey()) {
- $userstounassign = $currentuserselector->get_selected_users();
- if (!empty($userstounassign)) {
- foreach($userstounassign as $removeuser) {
- $enrol_manual->unenrol_user($instance, $removeuser->id);
-
- // Deprecated fixed by Shiro
- //add_to_log($course->id, 'course', 'unenrol', '../enrol/users.php?id='.$course->id, $course->id); //there should be userid somewhere!
- $context = context_course::instance($course->id);
- \core\event\user_enrolment_deleted::delete(array('context' => $context))->trigger();
- }
-
- $potentialuserselector->invalidate_selected_users();
- $currentuserselector->invalidate_selected_users();
-
- //TODO: log
- }
-}
-
-
-echo $OUTPUT->header();
-echo $OUTPUT->heading($instancename);
-
-?>
-
-footer();
diff --git a/lang/ca/enrol_apply.php b/lang/ca/enrol_apply.php
index 89a972b..88151dd 100644
--- a/lang/ca/enrol_apply.php
+++ b/lang/ca/enrol_apply.php
@@ -1,14 +1,25 @@
.
+
+/**
+ * @package enrol_apply
+ * @copyright emeneo.com (http://emeneo.com/)
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
// The name of your plugin. Displayed on admin menus.
$string['enrolname'] = 'Inscripció prèvia aprovació';
$string['pluginname'] = 'Inscripció prèvia aprovació';
@@ -26,7 +37,7 @@ $string['confirmusers'] = 'Confirmar inscripcions';
$string['coursename'] = 'Curs';
$string['applyuser'] = 'Nom / Cognom';
$string['applyusermail'] = 'Correu electrònic';
-$string['applydate'] = 'Data d\'inscripció';
+$string['applydate'] = 'Data d\'inscripció';
$string['btnconfirm'] = 'Confirmar';
$string['btncancel'] = 'Cancel·lar';
$string['enrolusers'] = 'Inscriure usuaris';
@@ -34,11 +45,10 @@ $string['enrolusers'] = 'Inscriure usuaris';
$string['status'] = 'Permet inscripció prèvia aprovació';
$string['confirmenrol'] = 'Gestionar sol·licituds';
-$string['apply:config'] = 'Configurar instàncies d\'Inscripció prèvia aprovació'; // Needs more insight
-$string['apply:manage'] = 'Gestionar la Inscripció prèvia aprovació'; // Needs more insight
-$string['apply:unenrol'] = 'Cancel·lar usuaris del curs'; // Needs more insight
-$string['apply:unenrolapply'] = 'Cancel·lar-se a si mateix del curs'; // Needs more insight. Very ugly translation!
-
+$string['apply:config'] = 'Configurar instàncies d\'Inscripció prèvia aprovació'; // Needs more insight.
+$string['apply:manageapplications'] = 'Gestionar la Inscripció prèvia aprovació'; // Needs more insight.
+$string['apply:unenrol'] = 'Cancel·lar usuaris del curs'; // Needs more insight.
+
$string['notification'] = 'Sol·licitud d\'inscripció enviada correctament.
Rebràs una notificació per correu electrònic un cop estigui confirmada la inscripció.';
$string['sendmailtoteacher'] = 'Enviar notificacions per correu als professors';
@@ -49,5 +59,3 @@ $string['comment'] = 'Comentari';
$string['applymanage'] = 'Gestionar inscripcions';
$string['status_desc'] = 'Allow course access of internally enrolled users.';
-
-?>
\ No newline at end of file
diff --git a/lang/de/enrol_apply.php b/lang/de/enrol_apply.php
index e2c331c..ba59bdb 100644
--- a/lang/de/enrol_apply.php
+++ b/lang/de/enrol_apply.php
@@ -1,14 +1,25 @@
.
+
/**
- * *************************************************************************
- * * Apply Enrol **
- * *************************************************************************
- * @copyright emeneo.com **
- * @link emeneo.com **
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later **
- * *************************************************************************
- * ************************************************************************
-*/
+ * @package enrol_apply
+ * @copyright emeneo.com (http://emeneo.com/)
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
// The name of your plugin. Displayed on admin menus.
$string['enrolname'] = 'Bestätigung der Kurseinschreibung';
$string['pluginname'] = 'Bestätigung der Kurseinschreibung';
@@ -40,10 +51,9 @@ $string['status'] = 'Bestätigung der Kurseinschreibung erlauben';
$string['confirmenrol'] = 'Einschreibeanfragen bearbeiten';
$string['apply:config'] = 'Einschreibungsbelegstellen anlegen';
-$string['apply:manage'] = 'Einschreibungsanfragen verwalten';
+$string['apply:manageapplications'] = 'Einschreibungsanfragen verwalten';
$string['apply:unenrol'] = 'Benutzer aus dem Kurs entfernen';
-$string['apply:unenrolapply'] = 'Sich selbst aus dem Kurs entfernen';
-
+
$string['notification'] = 'Einschreibungsantrag wurde erfolgreich gesendet..
Sie werden via Mail informiert, sobald Ihre Einschreibung bestätigt wurde.';
$string['sendmailtoteacher'] = 'Sende eine Hinweis-E-Mail an den Trainer';
@@ -52,4 +62,3 @@ $string['editdescription'] = 'Beschreibung anpassen';
$string['applymanage'] = 'Manage enrolment applications';
$string['status_desc'] = 'Kurszugriff für intern eingeschriebene Nutzer/innen erlauben.';
-?>
\ No newline at end of file
diff --git a/lang/en/enrol_apply.php b/lang/en/enrol_apply.php
index 371e691..9eb56d3 100644
--- a/lang/en/enrol_apply.php
+++ b/lang/en/enrol_apply.php
@@ -1,29 +1,58 @@
.
+
/**
- * *************************************************************************
- * * Apply Enrol **
- * *************************************************************************
- * @copyright emeneo.com **
- * @link emeneo.com **
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later **
- * *************************************************************************
- * ************************************************************************
-*/
+ * @package enrol_apply
+ * @copyright emeneo.com (http://emeneo.com/)
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @author emeneo.com (http://emeneo.com/)
+ * @author Johannes Burk
+ */
+
// The name of your plug-in. Displayed on admin menus.
$string['enrolname'] = 'Course enrol confirmation';
$string['pluginname'] = 'Course enrol confirmation';
$string['pluginname_desc'] = 'With this plug-in users can apply to be enrolled in a course. A teacher or site manager will then have to approve the enrolment before the user gets enroled.';
+$string['confirmmail_heading'] = 'Confirmation email';
+$string['confirmmail_desc'] = '';
$string['confirmmailsubject'] = 'Confirmation email subject';
+$string['confirmmailsubject_desc'] = '';
$string['confirmmailcontent'] = 'Confirmation email content';
+$string['confirmmailcontent_desc'] = 'Please use the following special marks to replace email content with data from Moodle.
{firstname}:The first name of the user; {content}:The course name;{lastname}:The last name of the user;{username}:The users registration username';
+
+$string['waitmail_heading'] = 'Waiting list email';
+$string['waitmail_desc'] = '';
$string['waitmailsubject'] = 'Waiting list mail subject';
+$string['waitmailsubject_desc'] = '';
$string['waitmailcontent'] = 'Waiting list mail content';
+$string['waitmailcontent_desc'] = 'Please use the following special marks to replace email content with data from Moodle.
{firstname}:The first name of the user; {content}:The course name;{lastname}:The last name of the user;{username}:The users registration username';
+
+$string['cancelmail_heading'] = 'Cancelation email';
+$string['cancelmail_desc'] = '';
$string['cancelmailsubject'] = 'Cancelation email subject';
+$string['cancelmailsubject_desc'] = '';
$string['cancelmailcontent'] = 'Cancelation email content';
-$string['confirmmailcontent_desc'] = 'Please use the following special marks to replace email content with data from Moodle.
{firstname}:The first name of the user; {content}:The course name;{lastname}:The last name of the user;{username}:The users registration username';
-$string['waitmailcontent_desc'] = 'Please use the following special marks to replace email content with data from Moodle.
{firstname}:The first name of the user; {content}:The course name;{lastname}:The last name of the user;{username}:The users registration username';
$string['cancelmailcontent_desc'] = 'Please use the following special marks to replace email content with data from Moodle.
{firstname}:The first name of the user; {content}:The course name;{lastname}:The last name of the user;{username}:The users registration username';
+$string['notify_heading'] = 'Notification settings';
+$string['notify_desc'] = 'Define who gets notified about new enrolment applications.';
+$string['sendmailtoteacher'] = 'Send email notification to teachers';
+$string['sendmailtomanager'] = 'Send email notification to managers';
+
$string['confirmusers'] = 'Enrol Confirm';
$string['confirmusers_desc'] = 'Users in gray colored rows are on the waiting list.';
@@ -40,17 +69,12 @@ $string['status'] = 'Allow Course enrol confirmation';
$string['confirmenrol'] = 'Manage application';
$string['apply:config'] = 'Configure apply enrol instances';
-$string['apply:enrol'] = 'Enrol users';
-$string['apply:manage'] = 'Manage apply enrolment';
+$string['apply:manageapplications'] = 'Manage apply enrolment';
$string['apply:unenrol'] = 'Cancel users from the course';
-$string['apply:unenrolapply'] = 'Cancel self from the course'; // is this necessary now?
$string['apply:unenrolself'] = 'Cancel self from the course';
-
$string['notification'] = 'Enrolment application successfully sent.
You will be informed by email when your enrolment has been confirmed.';
-$string['sendmailtoteacher'] = 'Send email notification to teachers';
-$string['sendmailtomanager'] = 'Send email notification to managers';
$string['mailtoteacher_suject'] = 'New Enrolment request!';
$string['editdescription'] = 'Textarea description';
$string['comment'] = 'Comment';
@@ -61,4 +85,3 @@ $string['user_profile'] = 'User Profile';
$string['show_standard_user_profile'] = 'Show standard user profile fields on enrolment screen';
$string['show_extra_user_profile'] = 'Show extra user profile fields on enrolment screen';
-?>
diff --git a/lang/en_us/en_us_enrol_apply.php b/lang/en_us/en_us_enrol_apply.php
index b720c6c..e4ac997 100644
--- a/lang/en_us/en_us_enrol_apply.php
+++ b/lang/en_us/en_us_enrol_apply.php
@@ -1,14 +1,25 @@
.
+
/**
- * *************************************************************************
- * * Apply enrol **
- * *************************************************************************
- * @copyright emeneo.com **
- * @link emeneo.com **
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later **
- * *************************************************************************
- * ************************************************************************
-*/
+ * @package enrol_apply
+ * @copyright emeneo.com (http://emeneo.com/)
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
// The name of your plug-in. Displayed on admin menus.
$string['enrollname'] = 'Course enrollment confirmation';
$string['pluginname'] = 'Course enrollment confirmation';
@@ -35,10 +46,10 @@ $string['status'] = 'Allow course enroll confirmation';
$string['confirmenroll'] = 'Manage application';
$string['apply:config'] = 'Configure apply enroll instances';
-$string['apply:manage'] = 'Manage apply enrollment';
+$string['apply:manageapplications'] = 'Manage apply enrollment';
$string['apply:unenroll'] = 'Cancel users from the course';
$string['apply:unenrollapply'] = 'Cancel self from the course';
-
+
$string['notification'] = 'Enrolllment application successfully sent.
You will be informed by email when your enrollment has been confirmed.';
$string['sendmailtoteacher'] = 'Send email notification to teachers';
@@ -49,4 +60,3 @@ $string['comment'] = 'Comment';
$string['applymanage'] = 'Manage enrollment applications';
$string['status_desc'] = 'Allow course access of internally enrolled users.';
-?>
\ No newline at end of file
diff --git a/lang/es/enrol_apply.php b/lang/es/enrol_apply.php
index bec4033..b183828 100644
--- a/lang/es/enrol_apply.php
+++ b/lang/es/enrol_apply.php
@@ -1,18 +1,29 @@
.
+
+/**
+ * @package enrol_apply
+ * @copyright emeneo.com (http://emeneo.com/)
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
// The name of your plugin. Displayed on admin menus.
$string['enrolname'] = 'Matrículas solicitadas';
$string['pluginname'] = 'Matrículas solicitadas';
-$string['pluginname_desc'] = 'With this plugin users can apply to a course and a teacher have to comfirm before the user gets enroled.'; // needs to be translated
+$string['pluginname_desc'] = 'With this plugin users can apply to a course and a teacher have to comfirm before the user gets enroled.'; // Needs to be translated.
$string['confirmmailsubject'] = 'Asunto del correo de confirmación';
$string['confirmmailcontent'] = 'Contenido del correo de confirmación';
@@ -26,7 +37,7 @@ $string['confirmusers'] = 'Confirmar matrículas';
$string['coursename'] = 'Curso';
$string['applyuser'] = 'Nombre / Apellido';
$string['applyusermail'] = 'Correo electrónico';
-$string['applydate'] = 'Fecha de solicitud'; // Enrol date -> Fecha de matriculación
+$string['applydate'] = 'Fecha de solicitud'; // Enrol date -> Fecha de matriculación.
$string['btnconfirm'] = 'Confirmar';
$string['btncancel'] = 'Cancelar';
$string['enrolusers'] = 'Matricular usuarios';
@@ -34,11 +45,10 @@ $string['enrolusers'] = 'Matricular usuarios';
$string['status'] = 'Aceptar matriculación tras aprobación';
$string['confirmenrol'] = 'Gestionar solicitudes';
-$string['apply:config'] = 'Configurar instancias de matrículas solicitadas'; // Needs more insight
-$string['apply:manage'] = 'Gestionar matrículas solicitadas'; // Needs more insight
-$string['apply:unenrol'] = 'Cancelar usuarios del curso'; // Needs more insight
-$string['apply:unenrolapply'] = 'Cancelarse a si mismo del curso'; // Needs more insight. Very ugly translation!
-
+$string['apply:config'] = 'Configurar instancias de matrículas solicitadas'; // Needs more insight.
+$string['apply:manageapplications'] = 'Gestionar matrículas solicitadas'; // Needs more insight.
+$string['apply:unenrol'] = 'Cancelar usuarios del curso'; // Needs more insight.
+
$string['notification'] = 'Solicitud de matriculación enviada correctamente.
Será notificado por correo electrónico en cuanto se confirme su matriculación.';
$string['sendmailtoteacher'] = 'Enviar notificaciones por correo a los profesores';
@@ -48,6 +58,4 @@ $string['editdescription'] = 'Descripción del área de texto';
$string['comment'] = 'Comentario';
$string['applymanage'] = 'Gestionar matrículas';
-$string['status_desc'] = 'Allow course access of internally enrolled users.'; // needs to be translated
-
-?>
+$string['status_desc'] = 'Allow course access of internally enrolled users.'; // Needs to be translated.
diff --git a/lang/it/enrol_apply.php b/lang/it/enrol_apply.php
index 055dd51..64f69b0 100644
--- a/lang/it/enrol_apply.php
+++ b/lang/it/enrol_apply.php
@@ -1,14 +1,25 @@
.
+
/**
- * *************************************************************************
- * * Apply Enrol **
- * *************************************************************************
- * @copyright emeneo.com **
- * @link emeneo.com **
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later **
- * *************************************************************************
- * ************************************************************************
-*/
+ * @package enrol_apply
+ * @copyright emeneo.com (http://emeneo.com/)
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
// The name of your plugin. Displayed on admin menus.
$string['enrolname'] = 'Conferma di iscrizione al corso';
$string['pluginname'] = 'Conferma di iscrizione al corso';
@@ -35,11 +46,10 @@ $string['status'] = 'Permetti la conferma di iscrizione al corso';
$string['confirmenrol'] = 'Gestisci l\'applicazione';
$string['apply:config'] = 'Configura le istanze del plugin';
-$string['apply:manage'] = 'Gestisci le richieste di iscrizione';
+$string['apply:manageapplications'] = 'Gestisci le richieste di iscrizione';
$string['apply:unenrol'] = 'Cancella gli utenti dal corso';
-$string['apply:unenrolapply'] = 'Permetti all\'utente di disiscriversi dal corso'; // is this necessary now?
$string['apply:unenrolself'] = 'Permetti all\'utente di disiscriversi dal corso';
-
+
$string['notification'] = 'Richiesta di iscrizione al corso correttamente inviata.
Verrai informato via email appena la tua richiesta di iscrizione viene confermata. Se vuoi iscriverti ad altri corsi, premi sul "catalogo dei corsi" sul top menu.';
$string['sendmailtoteacher'] = 'Manda email di notifica agli insegnanti';
@@ -50,5 +60,3 @@ $string['comment'] = 'Commento';
$string['applymanage'] = 'Gestisci richieste di iscrizione';
$string['status_desc'] = 'Permette l\'accesso al corso agli utenti iscritti internamente.';
-
-?>
\ No newline at end of file
diff --git a/lang/pt_br/enrol_apply.php b/lang/pt_br/enrol_apply.php
index 145394c..7e5a65c 100644
--- a/lang/pt_br/enrol_apply.php
+++ b/lang/pt_br/enrol_apply.php
@@ -1,18 +1,29 @@
.
+
+/**
+ * @package enrol_apply
+ * @copyright emeneo.com (http://emeneo.com/)
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
// The name of your plugin. Displayed on admin menus.
$string['enrolname'] = 'Matrículas solicitadas';
$string['pluginname'] = 'Matrículas solicitadas';
-$string['pluginname_desc'] = 'With this plugin users can apply to a course and a teacher have to comfirm before the user gets enroled.'; // needs to be translated
+$string['pluginname_desc'] = 'With this plugin users can apply to a course and a teacher have to comfirm before the user gets enroled.'; // Needs to be translated.
$string['confirmmailsubject'] = 'Assunto do e-mail de confirmação';
$string['confirmmailcontent'] = 'Conteúdo do e-mail de confirmação';
@@ -26,7 +37,7 @@ $string['confirmusers'] = 'Confirmar matrículas';
$string['coursename'] = 'Curso';
$string['applyuser'] = 'Nome / Sobrenome';
$string['applyusermail'] = 'E-mail';
-$string['applydate'] = 'Data de solicitação'; // Enrol date -> Fecha de matriculación
+$string['applydate'] = 'Data de solicitação'; // Enrol date -> Fecha de matriculación.
$string['btnconfirm'] = 'Confirmar';
$string['btncancel'] = 'Cancelar';
$string['enrolusers'] = 'Matricular usuários';
@@ -34,18 +45,15 @@ $string['enrolusers'] = 'Matricular usuários';
$string['status'] = 'Aceitar matrícula após aprovação';
$string['confirmenrol'] = 'Gerenciar solicitações';
-$string['apply:config'] = 'Configurar instâncias de matrículas solicitadas'; // Needs more insight
-$string['apply:manage'] = 'Gerenciar matrículas solicitadas'; // Needs more insight
-$string['apply:unenrol'] = 'Cancelar usuários do curso'; // Needs more insight
-$string['apply:unenrolapply'] = 'Cancelar minha matrícula do curso'; // Needs more insight. Very ugly translation!
-
+$string['apply:config'] = 'Configurar instâncias de matrículas solicitadas'; // Needs more insight.
+$string['apply:manageapplications'] = 'Gerenciar matrículas solicitadas'; // Needs more insight.
+$string['apply:unenrol'] = 'Cancelar usuários do curso'; // Needs more insight.
+
$string['notification'] = 'Solicitação de matrícula enviada com sucesso.
Você será notificado por e-mail quando a sua matrícula for confirmada.';
$string['sendmailtoteacher'] = 'Enviar e-mail de notificação para professores';
$string['mailtoteacher_suject'] = 'Nova solicitação de inscrição!';
-$string['editdescription'] = 'Descrição';
-$string['applymanage'] = 'Manage enrolment applications'; // needs to be translated
-
-$string['status_desc'] = 'Allow course access of internally enrolled users.'; // needs to be translated
+$string['editdescription'] = 'Descrição';
+$string['applymanage'] = 'Manage enrolment applications'; // Needs to be translated.
-?>
\ No newline at end of file
+$string['status_desc'] = 'Allow course access of internally enrolled users.'; // Needs to be translated.
diff --git a/lang/zh_cn/enrol_apply.php b/lang/zh_cn/enrol_apply.php
index 47cd24d..b5c26dd 100644
--- a/lang/zh_cn/enrol_apply.php
+++ b/lang/zh_cn/enrol_apply.php
@@ -1,14 +1,25 @@
.
+
/**
- * *************************************************************************
- * * Apply Enrol **
- * *************************************************************************
- * @copyright emeneo.com **
- * @link emeneo.com **
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later **
- * *************************************************************************
- * ************************************************************************
-*/
+ * @package enrol_apply
+ * @copyright emeneo.com (http://emeneo.com/)
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
// The name of your plug-in. Displayed on admin menus.
$string['enrolname'] = '选课确认';
$string['pluginname'] = '选课确认';
@@ -35,12 +46,10 @@ $string['status'] = '允许选课确认';
$string['confirmenrol'] = '管理申请';
$string['apply:config'] = '配置选课确认的实例';
-$string['apply:manage'] = '管理选课申请';
+$string['apply:manageapplications'] = '管理选课申请';
$string['apply:unenrol'] = '从课程中取消用户的选课';
-$string['apply:unenrolapply'] = '从课程中取消自身的选课'; // is this necessary now?
$string['apply:unenrolself'] = '从课程中取消自身的选课';
-
$string['notification'] = '选课申请已发送成功。
申请通过后您会收到邮件通知。';
$string['sendmailtoteacher'] = '向教师发送邮件通知';
@@ -51,4 +60,3 @@ $string['comment'] = '评论';
$string['applymanage'] = '管理选课申请';
$string['status_desc'] = '允许内部选课的用户进入课程';
-?>
diff --git a/lib.php b/lib.php
index 5a370a9..5cf85ab 100644
--- a/lib.php
+++ b/lib.php
@@ -1,526 +1,383 @@
.
+
/**
- * *************************************************************************
- * * Apply Enrol **
- * *************************************************************************
- * @copyright emeneo.com **
- * @link emeneo.com **
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later **
- * *************************************************************************
- * ************************************************************************
-*/
+ * @package enrol_apply
+ * @copyright emeneo.com (http://emeneo.com/)
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @author emeneo.com (http://emeneo.com/)
+ * @author Johannes Burk
+ */
+
+/** The user is put onto a waiting list and therefore the enrolment not active (used in user_enrolments->status) */
+define('ENROL_APPLY_USER_WAIT', 2);
+
class enrol_apply_plugin extends enrol_plugin {
- /**
- * Add new instance of enrol plugin with default settings.
- * @param object $course
- * @return int id of new instance
- */
- public function add_default_instance($course) {
- $fields = $this->get_instance_defaults();
- return $this->add_instance($course, $fields);
- }
-
- public function allow_unenrol(stdClass $instance) {
- // users with unenrol cap may unenrol other users manually manually
- return true;
- }
-
- public function get_newinstance_link($courseid) {
- $context = context_course::instance($courseid, MUST_EXIST);
-
- if (!has_capability('moodle/course:enrolconfig', $context) or !has_capability('enrol/apply:config', $context)) {
- return NULL;
- }
- // multiple instances supported - different roles with different password
- return new moodle_url('/enrol/apply/edit.php', array('courseid'=>$courseid));
- }
-
- public function enrol_page_hook(stdClass $instance) {
- global $CFG, $OUTPUT, $SESSION, $USER, $DB;
-
- if (isguestuser()) {
- // can not enrol guest!!
- return null;
- }
- if ($DB->record_exists('user_enrolments', array('userid'=>$USER->id, 'enrolid'=>$instance->id))) {
- //TODO: maybe we should tell them they are already enrolled, but can not access the course
- //return null;
- return $OUTPUT->notification(get_string('notification', 'enrol_apply'), 'notifysuccess');
- }
-
- require_once("$CFG->dirroot/enrol/apply/locallib.php");
-
- $form = new enrol_apply_enrol_form(NULL, $instance);
-
- $instanceid = optional_param('instance', 0, PARAM_INT);
- if ($instance->id == $instanceid) {
- if ($data = $form->get_data()) {
- $userInfo = $data;
- $applydescription = $userInfo->applydescription;
- unset($userInfo->applydescription);
- $userInfo->id = $USER->id;
-
- $apply_setting = $DB->get_records_sql("select name,value from ".$CFG->prefix."config_plugins where plugin='enrol_apply'");
-
- $show_standard_user_profile = $show_extra_user_profile = false;
- if($instance->customint1 != ''){
- ($instance->customint1 == 0)?$show_standard_user_profile = true:$show_standard_user_profile = false;
- }else{
- ($apply_setting['show_standard_user_profile']->value == 0)?$show_standard_user_profile = true:$show_standard_user_profile = false;
- }
-
- if($instance->customint2 != ''){
- ($instance->customint2 == 0)?$show_extra_user_profile = true:$show_extra_user_profile = false;
- }else{
- ($apply_setting['show_extra_user_profile']->value == 0)?$show_extra_user_profile = true:$show_extra_user_profile = false;
- }
-
- if(!$show_standard_user_profile && $show_extra_user_profile){
- profile_save_data($userInfo);
- $res = $DB->update_record('user',$userInfoProfile);
- //$res = $DB->update_record('user',$userInfo);
- }
- /*elseif($show_standard_user_profile && $show_extra_user_profile){
- profile_save_data($userInfo);
- $res = $DB->update_record('user',$userInfo);
- }*/
-
- $enrol = enrol_get_plugin('self');
- $timestart = time();
- if ($instance->enrolperiod) {
- $timeend = $timestart + $instance->enrolperiod;
- } else {
- $timeend = 0;
- }
-
- $roleid = $instance->roleid;
- if(!$roleid){
- $role = $DB->get_record_sql("select * from ".$CFG->prefix."role where archetype='student' limit 1");
- $roleid = $role->id;
- }
-
- $this->enrol_user($instance, $USER->id, $roleid, $timestart, $timeend,1);
- $userenrolment = $DB->get_record('user_enrolments', array('userid' => $USER->id, 'enrolid' => $instance->id), 'id', MUST_EXIST);
- $applicationinfo = new stdClass();
- $applicationinfo->userenrolmentid = $userenrolment->id;
- $applicationinfo->comment = $applydescription;
- $DB->insert_record('enrol_apply_applicationinfo', $applicationinfo, false);
- sendConfirmMailToTeachers($instance, $data, $applydescription);
- sendConfirmMailToManagers($instance, $data, $applydescription);
-
- // Deprecated fixed by Shiro
- //add_to_log($instance->courseid, 'course', 'enrol', '../enrol/users.php?id='.$instance->courseid, $instance->courseid); //there should be userid somewhere!
- $context = context_course::instance($instance->courseid);
- \core\event\user_enrolment_created::create(
- array(
- 'objectid' => $instance->id,
- 'courseid' => $instance->courseid,
- 'context' => $context,
- 'relateduserid' => $USER->id,
- 'other' => array('enrol' => 'apply')
- ))->trigger();
-
- redirect("$CFG->wwwroot/course/view.php?id=$instance->courseid");
- }
- }
- //exit;
- ob_start();
- $form->display();
- $output = ob_get_clean();
-
- return $OUTPUT->box($output);
-
- }
-
- public function get_action_icons(stdClass $instance) {
- global $OUTPUT;
-
- if ($instance->enrol !== 'apply') {
- throw new coding_exception('invalid enrol instance!');
- }
- $context = context_course::instance($instance->courseid);
-
- $icons = array();
-
- if (has_capability('enrol/apply:config', $context)) {
- $editlink = new moodle_url("/enrol/apply/edit.php", array('courseid'=>$instance->courseid, 'id'=>$instance->id));
- $icons[] = $OUTPUT->action_icon($editlink, new pix_icon('t/edit', get_string('edit'), 'core', array('class' => 'iconsmall')));
+ /**
+ * Add new instance of enrol plugin with default settings.
+ * @param object $course
+ * @return int id of new instance
+ */
+ public function add_default_instance($course) {
+ $fields = $this->get_instance_defaults();
+ return $this->add_instance($course, $fields);
+ }
+
+ public function allow_unenrol(stdClass $instance) {
+ // Users with unenrol cap may unenrol other users manually.
+ return true;
+ }
+
+ /**
+ * Returns link to page which may be used to add new instance of enrolment plugin in course.
+ * Multiple instances supported.
+ * @param int $courseid
+ * @return moodle_url page url
+ */
+ public function get_newinstance_link($courseid) {
+ $context = context_course::instance($courseid, MUST_EXIST);
+
+ if (!has_capability('moodle/course:enrolconfig', $context) or !has_capability('enrol/apply:config', $context)) {
+ return null;
+ }
+ return new moodle_url('/enrol/apply/edit.php', array('courseid' => $courseid));
+ }
+
+ public function enrol_page_hook(stdClass $instance) {
+ global $CFG, $OUTPUT, $SESSION, $USER, $DB;
+
+ if (isguestuser()) {
+ // Can not enrol guest!
+ return null;
+ }
+ if ($DB->record_exists('user_enrolments', array('userid' => $USER->id, 'enrolid' => $instance->id))) {
+ return $OUTPUT->notification(get_string('notification', 'enrol_apply'), 'notifysuccess');
+ }
+
+ require_once("$CFG->dirroot/enrol/apply/apply_form.php");
+
+ $form = new enrol_apply_apply_form(null, $instance);
+
+ if ($data = $form->get_data()) {
+ // Only process when form submission is for this instance (multi instance support).
+ if ($data->instance == $instance->id) {
+ $timestart = 0;
+ $timeend = 0;
+ $roleid = $instance->roleid;
+
+ $this->enrol_user($instance, $USER->id, $roleid, $timestart, $timeend, ENROL_USER_SUSPENDED);
+ $userenrolment = $DB->get_record(
+ 'user_enrolments',
+ array(
+ 'userid' => $USER->id,
+ 'enrolid' => $instance->id),
+ 'id', MUST_EXIST);
+ $applicationinfo = new stdClass();
+ $applicationinfo->userenrolmentid = $userenrolment->id;
+ $applicationinfo->comment = $data->applydescription;
+ $DB->insert_record('enrol_apply_applicationinfo', $applicationinfo, false);
+
+ $this->send_application_notification($instance, $USER->id, $data);
+
+ redirect("$CFG->wwwroot/course/view.php?id=$instance->courseid");
+ }
+ }
+
+ $output = $form->render();
+
+ return $OUTPUT->box($output);
+ }
+
+ public function get_action_icons(stdClass $instance) {
+ global $OUTPUT;
+
+ if ($instance->enrol !== 'apply') {
+ throw new coding_exception('invalid enrol instance!');
+ }
+ $context = context_course::instance($instance->courseid);
+
+ $icons = array();
+
+ if (has_capability('enrol/apply:config', $context)) {
+ $editlink = new moodle_url("/enrol/apply/edit.php", array('courseid' => $instance->courseid, 'id' => $instance->id));
+ $icons[] = $OUTPUT->action_icon($editlink, new pix_icon(
+ 't/edit',
+ get_string('edit'),
+ 'core',
+ array('class' => 'iconsmall')));
+ }
+
+ if (has_capability('enrol/apply:manageapplications', $context)) {
+ $managelink = new moodle_url("/enrol/apply/manage.php", array('id' => $instance->id));
+ $icons[] = $OUTPUT->action_icon($managelink, new pix_icon(
+ 'i/users',
+ get_string('confirmenrol', 'enrol_apply'),
+ 'core',
+ array('class' => 'iconsmall')));
}
- if (has_capability('enrol/apply:manage', $context)) {
- $managelink = new moodle_url("/enrol/apply/apply.php", array('id'=>$_GET['id'],'enrolid'=>$instance->id));
- $icons[] = $OUTPUT->action_icon($managelink, new pix_icon('i/users', get_string('confirmenrol', 'enrol_apply'), 'core', array('class'=>'iconsmall')));
- }
-
- if (has_capability("enrol/apply:enrol", $context)) {
- $enrollink = new moodle_url("/enrol/apply/enroluser.php", array('enrolid'=>$instance->id));
- $icons[] = $OUTPUT->action_icon($enrollink, new pix_icon('t/enrolusers', get_string('enrolusers', 'enrol_apply'), 'core', array('class'=>'iconsmall')));
- }
-
- return $icons;
- }
-
- /**
- * Is it possible to hide/show enrol instance via standard UI?
- *
- * @param stdClass $instance
- * @return bool
- */
- public function can_hide_show_instance($instance) {
- $context = context_course::instance($instance->courseid);
- return has_capability('enrol/apply:config', $context);
- }
-
- /**
- * Is it possible to delete enrol instance via standard UI?
- *
- * @param stdClass $instance
- * @return bool
- */
-
- public function can_delete_instance($instance) {
- $context = context_course::instance($instance->courseid);
- return has_capability('enrol/apply:config', $context);
- }
-
-
- /**
- * Sets up navigation entries.
- *
- * @param stdClass $instancesnode
- * @param stdClass $instance
- * @return void
- */
- public function add_course_navigation($instancesnode, stdClass $instance) {
+ return $icons;
+ }
+
+ /**
+ * Is it possible to hide/show enrol instance via standard UI?
+ * @param stdClass $instance
+ * @return bool
+ */
+ public function can_hide_show_instance($instance) {
+ $context = context_course::instance($instance->courseid);
+ return has_capability('enrol/apply:config', $context);
+ }
+
+ /**
+ * Is it possible to delete enrol instance via standard UI?
+ *
+ * @param stdClass $instance
+ * @return bool
+ */
+ public function can_delete_instance($instance) {
+ $context = context_course::instance($instance->courseid);
+ return has_capability('enrol/apply:config', $context);
+ }
+
+ /**
+ * Sets up navigation entries.
+ *
+ * @param stdClass $instancesnode
+ * @param stdClass $instance
+ * @return void
+ */
+ public function add_course_navigation($instancesnode, stdClass $instance) {
if ($instance->enrol !== 'apply') {
throw new coding_exception('Invalid enrol instance type!');
}
$context = context_course::instance($instance->courseid);
if (has_capability('enrol/apply:config', $context)) {
- $managelink = new moodle_url('/enrol/apply/edit.php', array('courseid'=>$instance->courseid, 'id'=>$instance->id));
+ $managelink = new moodle_url('/enrol/apply/edit.php', array('courseid' => $instance->courseid, 'id' => $instance->id));
$instancesnode->add($this->get_instance_name($instance), $managelink, navigation_node::TYPE_SETTING);
}
}
- public function get_user_enrolment_actions(course_enrolment_manager $manager, $ue) {
- $actions = array();
- $context = $manager->get_context();
- $instance = $ue->enrolmentinstance;
- $params = $manager->get_moodlepage()->url->params();
- $params['ue'] = $ue->id;
- if ($this->allow_unenrol($instance) && has_capability("enrol/apply:unenrol", $context)) {
- $url = new moodle_url('/enrol/apply/unenroluser.php', $params);
- $actions[] = new user_enrolment_action(new pix_icon('t/delete', ''), get_string('unenrol', 'enrol'), $url, array('class'=>'unenrollink', 'rel'=>$ue->id));
- }
- if ($this->allow_manage($instance) && has_capability("enrol/apply:manage", $context)) {
- $url = new moodle_url('/enrol/apply/editenrolment.php', $params);
- $actions[] = new user_enrolment_action(new pix_icon('t/edit', ''), get_string('edit'), $url, array('class'=>'editenrollink', 'rel'=>$ue->id));
- }
- return $actions;
- }
-
- /**
- * Returns defaults for new instances.
- * @return array
- */
- public function get_instance_defaults() {
- $fields = array();
- $fields['status'] = $this->get_config('status');
- $fields['roleid'] = $this->get_config('roleid', 0);
- $fields['customint1'] = $this->get_config('show_standard_user_profile');
- $fields['customint2'] = $this->get_config('show_extra_user_profile');
- $fields['customint3'] = $this->get_config('sendmailtoteacher');
- $fields['customint4'] = $this->get_config('sendmailtomanager');
-
- return $fields;
- }
-}
+ public function get_user_enrolment_actions(course_enrolment_manager $manager, $ue) {
+ $actions = array();
+ $context = $manager->get_context();
+ $instance = $ue->enrolmentinstance;
+ $params = $manager->get_moodlepage()->url->params();
+ $params['ue'] = $ue->id;
+ if ($this->allow_unenrol_user($instance, $ue) && has_capability("enrol/apply:unenrol", $context)) {
+ $url = new moodle_url('/enrol/unenroluser.php', $params);
+ $actions[] = new user_enrolment_action(
+ new pix_icon('t/delete', ''),
+ get_string('unenrol', 'enrol'),
+ $url,
+ array('class' => 'unenrollink', 'rel' => $ue->id));
+ }
+ return $actions;
+ }
-function getAllEnrolment($id = null) {
- global $DB;
- if ($id) {
- $sql = 'SELECT ue.userid,ue.id,u.firstname,u.lastname,u.email,u.picture,c.fullname as course,ue.timecreated,ue.status
- FROM {course} c
- JOIN {enrol} e
- ON e.courseid = c.id
- JOIN {user_enrolments} ue
- ON ue.enrolid = e.id
- JOIN {user} u
- ON ue.userid = u.id
- WHERE ue.status != 0
- AND e.id = ?';
- $userenrolments = $DB->get_records_sql($sql, array($id));
- } else {
- $sql = 'SELECT ue.id,ue.userid,u.firstname,u.lastname,u.email,u.picture,c.fullname as course,ue.timecreated
- FROM {user_enrolments} ue
- LEFT JOIN {user} u
- ON ue.userid = u.id
- LEFT JOIN {enrol} e
- ON ue.enrolid = e.id
- LEFT JOIN {course} c
- ON e.courseid = c.id
- WHERE ue.status != 0
- AND e.enrol = ?';
- $userenrolments = $DB->get_records_sql($sql, array('apply'));
- }
- return $userenrolments;
-}
+ /**
+ * Returns defaults for new instances.
+ * @return array
+ */
+ public function get_instance_defaults() {
+ $fields = array();
+ $fields['status'] = $this->get_config('status');
+ $fields['roleid'] = $this->get_config('roleid', 0);
+ $fields['customint1'] = $this->get_config('show_standard_user_profile');
+ $fields['customint2'] = $this->get_config('show_extra_user_profile');
+ $fields['customint3'] = $this->get_config('sendmailtoteacher');
+ $fields['customint4'] = $this->get_config('sendmailtomanager');
+
+ return $fields;
+ }
-function confirmEnrolment($enrols){
- global $DB;
- global $CFG;
- foreach ($enrols as $enrol){
- @$enroluser->id = $enrol;
- @$enroluser->status = 0;
-
- if($DB->update_record('user_enrolments',$enroluser)){
- $userenrolments = $DB->get_record_sql('select * from '.$CFG->prefix.'user_enrolments where id='.$enrol);
- $role = $DB->get_record_sql("select * from ".$CFG->prefix."role where archetype='student' limit 1");
- @$roleAssignments->userid = $userenrolments->userid;
- @$roleAssignments->roleid = $role->id;
- @$roleAssignments->contextid = 3;
- @$roleAssignments->timemodified = time();
- @$roleAssignments->modifierid = 2;
- $DB->insert_record('role_assignments',$roleAssignments);
- $info = getRelatedInfo($enrol);
- $DB->delete_records('enrol_apply_applicationinfo', array('userenrolmentid' => $enrol));
- sendConfirmMail($info);
- }
- }
-}
+ public function confirm_enrolment($enrols) {
+ global $DB;
+ foreach ($enrols as $enrol) {
+ $userenrolment = $DB->get_record_select(
+ 'user_enrolments',
+ 'id = :id AND (status = :enrolusersuspended OR status = :enrolapplyuserwait)',
+ array(
+ 'id' => $enrol,
+ 'enrolusersuspended' => ENROL_USER_SUSPENDED,
+ 'enrolapplyuserwait' => ENROL_APPLY_USER_WAIT),
+ '*',
+ MUST_EXIST);
+
+ $instance = $DB->get_record('enrol', array('id' => $userenrolment->enrolid, 'enrol' => 'apply'), '*', MUST_EXIST);
+
+ // Check privileges.
+ $context = context_course::instance($instance->courseid, MUST_EXIST);
+ if (!has_capability('enrol/apply:manageapplications', $context)) {
+ continue;
+ }
+
+ $this->update_user_enrol($instance, $userenrolment->userid, ENROL_USER_ACTIVE);
+ $DB->delete_records('enrol_apply_applicationinfo', array('userenrolmentid' => $enrol));
+
+ $subject = get_config('enrol_apply', 'confirmmailsubject');
+ $body = get_config('enrol_apply', 'confirmmailcontent');
+ $this->send_mail_to_applicant($instance, $userenrolment->userid, $subject, $body);
+ }
+ }
-function waitEnrolment($enrols){
- global $DB;
- global $CFG;
- foreach ($enrols as $enrol){
- @$enroluser->id = $enrol;
- @$enroluser->status = 2;
-
- if($DB->update_record('user_enrolments',$enroluser)){
- $info = getRelatedInfo($enrol);
- sendWaitMail($info);
- }
- }
-}
+ public function wait_enrolment($enrols) {
+ global $DB;
+ foreach ($enrols as $enrol) {
+ $userenrolment = $DB->get_record(
+ 'user_enrolments',
+ array('id' => $enrol, 'status' => ENROL_USER_SUSPENDED),
+ '*', IGNORE_MISSING);
+
+ if ($userenrolment != null) {
+ $instance = $DB->get_record('enrol', array('id' => $userenrolment->enrolid, 'enrol' => 'apply'), '*', MUST_EXIST);
+
+ // Check privileges.
+ $context = context_course::instance($instance->courseid, MUST_EXIST);
+ if (!has_capability('enrol/apply:manageapplications', $context)) {
+ continue;
+ }
+
+ $this->update_user_enrol($instance, $userenrolment->userid, ENROL_APPLY_USER_WAIT);
+
+ $subject = get_config('enrol_apply', 'waitmailsubject');
+ $body = get_config('enrol_apply', 'waitmailcontent');
+ $this->send_mail_to_applicant($instance, $userenrolment->userid, $subject, $body);
+ }
+ }
+ }
-function cancelEnrolment($enrols){
- global $DB;
- foreach ($enrols as $enrol){
- $info = getRelatedInfo($enrol);
- if($DB->delete_records('user_enrolments',array('id'=>$enrol))){
- $DB->delete_records('enrol_apply_applicationinfo', array('userenrolmentid' => $enrol));
- sendCancelMail($info);
- }
- }
-}
+ public function cancel_enrolment($enrols) {
+ global $DB;
+ foreach ($enrols as $enrol) {
+ $userenrolment = $DB->get_record_select(
+ 'user_enrolments',
+ 'id = :id AND (status = :enrolusersuspended OR status = :enrolapplyuserwait)',
+ array(
+ 'id' => $enrol,
+ 'enrolusersuspended' => ENROL_USER_SUSPENDED,
+ 'enrolapplyuserwait' => ENROL_APPLY_USER_WAIT),
+ '*',
+ MUST_EXIST);
+
+ $instance = $DB->get_record('enrol', array('id' => $userenrolment->enrolid, 'enrol' => 'apply'), '*', MUST_EXIST);
+
+ // Check privileges.
+ $context = context_course::instance($instance->courseid, MUST_EXIST);
+ if (!has_capability('enrol/apply:manageapplications', $context)) {
+ continue;
+ }
+
+ $this->unenrol_user($instance, $userenrolment->userid);
+ $DB->delete_records('enrol_apply_applicationinfo', array('userenrolmentid' => $enrol));
+
+ $subject = get_config('enrol_apply', 'cancelmailsubject');
+ $body = get_config('enrol_apply', 'cancelmailcontent');
+ $this->send_mail_to_applicant($instance, $userenrolment->userid, $subject, $body);
+ }
+ }
-function sendCancelMail($info){
- global $DB;
- global $CFG;
- $apply_setting = $DB->get_records_sql("select name,value from ".$CFG->prefix."config_plugins where plugin='enrol_apply'");
+ private function send_mail_to_applicant($instance, $userid, $subject, $body) {
+ global $DB;
+ global $CFG;
- $replace = array('firstname'=>$info->firstname,'content'=>format_string($info->coursename),'lastname'=>$info->lastname,'username'=>$info->username);
- $body = $apply_setting['cancelmailcontent']->value;
- $body = updateMailContent($body,$replace);
- $contact = core_user::get_support_user();
- email_to_user($info, $contact, $apply_setting['cancelmailsubject']->value, html_to_text($body), $body);
-}
+ $course = get_course($instance->courseid);
+ $user = core_user::get_user($userid);
-function sendConfirmMail($info){
- global $DB;
- global $CFG;
- $apply_setting = $DB->get_records_sql("select name,value from ".$CFG->prefix."config_plugins where plugin='enrol_apply'");
+ $body = $this->update_mail_content($body, $course, $user);
+ $contact = core_user::get_support_user();
+ email_to_user($user, $contact, $subject, html_to_text($body), $body);
+ }
- $replace = array('firstname'=>$info->firstname,'content'=>format_string($info->coursename),'lastname'=>$info->lastname,'username'=>$info->username);
- $body = $apply_setting['confirmmailcontent']->value;
- $body = updateMailContent($body,$replace);
- $contact = core_user::get_support_user();
- email_to_user($info, $contact, $apply_setting['confirmmailsubject']->value, html_to_text($body), $body);
-}
+ private function send_application_notification($instance, $userid, $data) {
+ global $CFG, $PAGE;
-function sendWaitMail($info){
- global $DB;
- global $CFG;
- //global $USER;
- $apply_setting = $DB->get_records_sql("select name,value from ".$CFG->prefix."config_plugins where plugin='enrol_apply'");
-
- $replace = array('firstname'=>$info->firstname,'content'=>format_string($info->coursename),'lastname'=>$info->lastname,'username'=>$info->username);
- $body = get_config('enrol_apply', 'waitmailcontent');
- $body = updateMailContent($body,$replace);
- $contact = get_admin();
- //confirm mail will sent by the admin
- //$contact = $USER;
- email_to_user($info, $contact, get_config('enrol_apply', 'waitmailsubject'), html_to_text($body), $body);
-}
+ $renderer = $PAGE->get_renderer('enrol_apply');
-function sendConfirmMailToTeachers($instance,$info,$applydescription){
- global $DB;
- global $CFG;
- global $USER;
-
- $courseid = $instance->courseid;
- $instanceid = $instance->id;
- $apply_setting = $DB->get_records_sql("select name,value from ".$CFG->prefix."config_plugins where plugin='enrol_apply'");
-
- $show_standard_user_profile = $show_extra_user_profile = false;
- if($instance->customint1 != ''){
- ($instance->customint1 == 0)?$show_standard_user_profile = true:$show_standard_user_profile = false;
- }else{
- ($apply_setting['show_standard_user_profile']->value == 0)?$show_standard_user_profile = true:$show_standard_user_profile = false;
- }
-
- if($instance->customint2 != ''){
- ($instance->customint2 == 0)?$show_extra_user_profile = true:$show_extra_user_profile = false;
- }else{
- ($apply_setting['show_extra_user_profile']->value == 0)?$show_extra_user_profile = true:$show_extra_user_profile = false;
- }
-
- if($instance->customint3 == 1){
- $course = get_course($courseid);
- $context = context_course::instance($courseid, MUST_EXIST);
- $teacherType = $DB->get_record('role',array("shortname"=>"editingteacher"));
- $teachers = $DB->get_records('role_assignments', array('contextid'=>$context->id,'roleid'=>$teacherType->id));
- foreach($teachers as $teacher){
- $editTeacher = $DB->get_record('user',array('id'=>$teacher->userid));
- $body = ''. get_string('coursename', 'enrol_apply') .': '.format_string($course->fullname).'
';
- $body .= ''. get_string('applyuser', 'enrol_apply') .': '.$USER->firstname.' '.$USER->lastname.'
';
- $body .= ''. get_string('comment', 'enrol_apply') .': '.$applydescription.'
';
-
- if($show_standard_user_profile){
- $body .= ''. get_string('user_profile', 'enrol_apply').'
';
- $body .= ''. get_string('firstname') .': '.$info->firstname.'
';
- $body .= ''. get_string('lastname') .': '.$info->lastname.'
';
- $body .= ''. get_string('email') .': '.$info->email.'
';
- $body .= ''. get_string('city') .': '.$info->city.'
';
- $body .= ''. get_string('country') .': '.$info->country.'
';
- $body .= ''. get_string('preferredlanguage') .': '.$info->lang.'
';
- $body .= ''. get_string('description') .': '.$info->description_editor['text'].'
';
-
- $body .= ''. get_string('firstnamephonetic') .': '.$info->firstnamephonetic.'
';
- $body .= ''. get_string('lastnamephonetic') .': '.$info->lastnamephonetic.'
';
- $body .= ''. get_string('middlename') .': '.$info->middlename.'
';
- $body .= ''. get_string('alternatename') .': '.$info->alternatename.'
';
- $body .= ''. get_string('url') .': '.$info->url.'
';
- $body .= ''. get_string('icqnumber') .': '.$info->icq.'
';
- $body .= ''. get_string('skypeid') .': '.$info->skype.'
';
- $body .= ''. get_string('aimid') .': '.$info->aim.'
';
- $body .= ''. get_string('yahooid') .': '.$info->yahoo.'
';
- $body .= ''. get_string('msnid') .': '.$info->msn.'
';
- $body .= ''. get_string('idnumber') .': '.$info->idnumber.'
';
- $body .= ''. get_string('institution') .': '.$info->institution.'
';
- $body .= ''. get_string('department') .': '.$info->department.'
';
- $body .= ''. get_string('phone') .': '.$info->phone1.'
';
- $body .= ''. get_string('phone2') .': '.$info->phone2.'
';
- $body .= ''. get_string('address') .': '.$info->address.'
';
- }
-
- if($show_extra_user_profile){
- require_once($CFG->dirroot.'/user/profile/lib.php');
- $user = $DB->get_record('user',array('id'=>$USER->id));
- profile_load_custom_fields($user);
- foreach ($user->profile as $key => $value) {
- $body .= ''. $key .': '.$value.'
';
- }
- }
-
- $body .= ''. html_writer::link(new moodle_url("/enrol/apply/apply.php", array('id'=>$courseid,'enrolid'=>$instanceid)), get_string('applymanage', 'enrol_apply')).'
';
- $contact = core_user::get_support_user();
- $info = $editTeacher;
- $info->coursename = $course->fullname;
- email_to_user($info, $contact, get_string('mailtoteacher_suject', 'enrol_apply'), html_to_text($body), $body);
- }
- }
-}
+ $course = get_course($instance->courseid);
+ $user = core_user::get_user($userid);
+ $contact = core_user::get_support_user();
-function sendConfirmMailToManagers($instance,$info,$applydescription){
- global $DB;
- global $CFG;
- global $USER;
-
- $courseid = $instance->courseid;
- $apply_setting = $DB->get_records_sql("select name,value from ".$CFG->prefix."config_plugins where plugin='enrol_apply'");
-
- $show_standard_user_profile = $show_extra_user_profile = false;
- if($instance->customint1 != ''){
- ($instance->customint1 == 0)?$show_standard_user_profile = true:$show_standard_user_profile = false;
- }else{
- ($apply_setting['show_standard_user_profile']->value == 0)?$show_standard_user_profile = true:$show_standard_user_profile = false;
- }
-
- if($instance->customint2 != ''){
- ($instance->customint2 == 0)?$show_extra_user_profile = true:$show_extra_user_profile = false;
- }else{
- ($apply_setting['show_extra_user_profile']->value == 0)?$show_extra_user_profile = true:$show_extra_user_profile = false;
- }
-
- if($apply_setting['sendmailtomanager']->value == 1){
- $course = get_course($courseid);
- $context = context_system::instance();
- $managerType = $DB->get_record('role',array("shortname"=>"manager"));
- $managers = $DB->get_records('role_assignments', array('contextid'=>$context->id,'roleid'=>$managerType->id));
- foreach($managers as $manager){
- $userWithManagerRole = $DB->get_record('user',array('id'=>$manager->userid));
- $body = ''. get_string('coursename', 'enrol_apply') .': '.format_string($course->fullname).'
';
- $body .= ''. get_string('applyuser', 'enrol_apply') .': '.$USER->firstname.' '.$USER->lastname.'
';
- $body .= ''. get_string('comment', 'enrol_apply') .': '.$applydescription.'
';
- if($show_standard_user_profile){
- $body .= ''. get_string('user_profile', 'enrol_apply').'
';
- $body .= ''. get_string('firstname') .': '.$info->firstname.'
';
- $body .= ''. get_string('lastname') .': '.$info->lastname.'
';
- $body .= ''. get_string('email') .': '.$info->email.'
';
- $body .= ''. get_string('city') .': '.$info->city.'
';
- $body .= ''. get_string('country') .': '.$info->country.'
';
- $body .= ''. get_string('preferredlanguage') .': '.$info->lang.'
';
- $body .= ''. get_string('description') .': '.$info->description_editor['text'].'
';
-
- $body .= ''. get_string('firstnamephonetic') .': '.$info->firstnamephonetic.'
';
- $body .= ''. get_string('lastnamephonetic') .': '.$info->lastnamephonetic.'
';
- $body .= ''. get_string('middlename') .': '.$info->middlename.'
';
- $body .= ''. get_string('alternatename') .': '.$info->alternatename.'
';
- $body .= ''. get_string('url') .': '.$info->url.'
';
- $body .= ''. get_string('icqnumber') .': '.$info->icq.'
';
- $body .= ''. get_string('skypeid') .': '.$info->skype.'
';
- $body .= ''. get_string('aimid') .': '.$info->aim.'
';
- $body .= ''. get_string('yahooid') .': '.$info->yahoo.'
';
- $body .= ''. get_string('msnid') .': '.$info->msn.'
';
- $body .= ''. get_string('idnumber') .': '.$info->idnumber.'
';
- $body .= ''. get_string('institution') .': '.$info->institution.'
';
- $body .= ''. get_string('department') .': '.$info->department.'
';
- $body .= ''. get_string('phone') .': '.$info->phone1.'
';
- $body .= ''. get_string('phone2') .': '.$info->phone2.'
';
- $body .= ''. get_string('address') .': '.$info->address.'
';
- }
-
- if($show_extra_user_profile){
- require_once($CFG->dirroot.'/user/profile/lib.php');
- $user = $DB->get_record('user',array('id'=>$USER->id));
- profile_load_custom_fields($user);
- foreach ($user->profile as $key => $value) {
- $body .= ''. $key .': '.$value.'
';
- }
- }
-
- $body .= ''. html_writer::link(new moodle_url('/enrol/apply/manage.php'), get_string('applymanage', 'enrol_apply')).'
';
- $contact = core_user::get_support_user();
- $info = $userWithManagerRole;
- $info->coursename = $course->fullname;
- email_to_user($info, $contact, get_string('mailtoteacher_suject', 'enrol_apply'), html_to_text($body), $body);
- }
- }
-}
+ // Include standard user profile fields?
+ $standarduserfields = null;
+ if ($instance->customint1) {
+ $standarduserfields = clone $data;
+ unset($standarduserfields->applydescription);
+ }
-function getRelatedInfo($enrolid){
- global $DB;
- global $CFG;
- return $DB->get_record_sql('select u.*,c.fullname as coursename from '.$CFG->prefix.'user_enrolments as ue left join '.$CFG->prefix.'user as u on ue.userid=u.id left join '.$CFG->prefix.'enrol as e on ue.enrolid=e.id left
- join '.$CFG->prefix.'course as c on e.courseid=c.id where ue.id='.$enrolid);
-}
+ // Include extra user profile fields?
+ $extrauserfields = null;
+ if ($instance->customint2) {
+ require_once($CFG->dirroot.'/user/profile/lib.php');
+ profile_load_custom_fields($user);
+ $extrauserfields = $user->profile;
+ }
+
+ // Send notification to Teachers? Instance depending.
+ if ($instance->customint3 == 1) {
+ $context = context_course::instance($instance->courseid);
+ $editingteacherroles = get_archetype_roles('editingteacher');
+ $editingteacherrole = reset($editingteacherroles);
+ $teachers = get_role_users($editingteacherrole->id, $context);
+
+ $manageurl = new moodle_url("/enrol/apply/manage.php", array('id' => $instance->id));
+ $body = $renderer->application_notification_mail_body(
+ $course,
+ $user,
+ $manageurl,
+ $data->applydescription,
+ $standarduserfields,
+ $extrauserfields);
+ foreach ($teachers as $teacher) {
+ email_to_user($teacher, $contact, get_string('mailtoteacher_suject', 'enrol_apply'), html_to_text($body), $body);
+ }
+ }
+
+ // Send notification to managers in system context?
+ if (get_config('enrol_apply', 'sendmailtomanager') == 1) {
+ $context = context_system::instance();
+ $managerroles = get_archetype_roles('manager');
+ $managerrole = reset($editingteacherroles);
+ $managers = get_role_users($managerrole->id, $context);
+
+ $manageurl = new moodle_url('/enrol/apply/manage.php');
+ $body = $renderer->application_notification_mail_body(
+ $course,
+ $user,
+ $manageurl,
+ $data->applydescription,
+ $standarduserfields,
+ $extrauserfields);
+ foreach ($managers as $manager) {
+ email_to_user($manager, $contact, get_string('mailtoteacher_suject', 'enrol_apply'), html_to_text($body), $body);
+ }
+ }
+ }
-function updateMailContent($content,$replace){
- foreach ($replace as $key=>$val) {
- $content = str_replace("{".$key."}",$val,$content);
- }
- return $content;
+ private function update_mail_content($content, $course, $user) {
+ $replace = array(
+ 'firstname' => $user->firstname,
+ 'content' => format_string($course->fullname),
+ 'lastname' => $user->lastname,
+ 'username' => $user->username);
+ foreach ($replace as $key => $val) {
+ $content = str_replace('{' . $key . '}', $val, $content);
+ }
+ return $content;
+ }
}
diff --git a/locallib.php b/locallib.php
deleted file mode 100644
index b84fda8..0000000
--- a/locallib.php
+++ /dev/null
@@ -1,157 +0,0 @@
-libdir/formslib.php");
-
-class enrol_apply_enrol_form extends moodleform {
- protected $instance;
-
- /**
- * Overriding this function to get unique form id for multiple self enrolments
- *
- * @return string form identifier
- */
- protected function get_form_identifier() {
- $formid = $this->_customdata->id.'_'.get_class($this);
- return $formid;
- }
-
- public function definition() {
- global $DB;
- $mform = $this->_form;
- $instance = $this->_customdata;
- $this->instance = $instance;
- $plugin = enrol_get_plugin('apply');
-
- $heading = $plugin->get_instance_name($instance);
- $mform->addElement('header', 'selfheader', $heading);
-
- if ($instance->password) {
- $heading = $plugin->get_instance_name($instance);
- $mform->addElement('header', 'selfheader', $heading);
- //change the id of self enrolment key input as there can be multiple self enrolment methods
- $mform->addElement('passwordunmask', 'enrolpassword', get_string('password', 'enrol_self'),
- array('id' => $instance->id."_enrolpassword"));
- } else {
- // nothing?
- }
-
- $mform->addElement('html', ''.$instance->customtext1.'
');
- $mform->addElement('textarea', 'applydescription', get_string('comment', 'enrol_apply'),'cols="80"');
-
- //user profile
- global $USER,$CFG,$DB;
- require_once($CFG->libdir.'/gdlib.php');
- require_once($CFG->dirroot.'/user/edit_form.php');
- require_once($CFG->dirroot.'/user/editlib.php');
- require_once($CFG->dirroot.'/user/profile/lib.php');
- require_once($CFG->dirroot.'/user/lib.php');
-
- $user = $DB->get_record('user',array('id'=>$USER->id));
- $editoroptions = $filemanageroptions = null;
-
- $apply_setting = $DB->get_records_sql("select name,value from ".$CFG->prefix."config_plugins where plugin='enrol_apply'");
-
- $show_standard_user_profile = $show_extra_user_profile = false;
- if($instance->customint1 != ''){
- ($instance->customint1 == 0)?$show_standard_user_profile = true:$show_standard_user_profile = false;
- }else{
- ($apply_setting['show_standard_user_profile']->value == 0)?$show_standard_user_profile = true:$show_standard_user_profile = false;
- }
-
- if($instance->customint2 != ''){
- ($instance->customint2 == 0)?$show_extra_user_profile = true:$show_extra_user_profile = false;
- }else{
- ($apply_setting['show_extra_user_profile']->value == 0)?$show_extra_user_profile = true:$show_extra_user_profile = false;
- }
-
- if($show_standard_user_profile){
- useredit_shared_definition($mform, $editoroptions, $filemanageroptions,$user);
- }
-
- if($show_extra_user_profile){
- profile_definition($mform, $user->id);
- }
-
- $profile_default_values = $user;
- if (is_object($profile_default_values)) {
- $profile_default_values = (array)$profile_default_values;
- }
- $mform->setDefaults($profile_default_values);
-
- $this->add_action_buttons(false, get_string('enrolme', 'enrol_self'));
-
- $mform->addElement('hidden', 'id');
- $mform->setType('id', PARAM_INT);
- $mform->setDefault('id', $instance->courseid);
-
- $mform->addElement('hidden', 'instance');
- $mform->setType('instance', PARAM_INT);
- $mform->setDefault('instance', $instance->id);
-
- //$mform->addElement('html',"");
- //$mform->addElement('html','');
- //$mform->addElement('html','');
- }
-
- public function validation($data, $files) {
- global $DB, $CFG;
-
- $errors = parent::validation($data, $files);
- $instance = $this->instance;
-
- if ($instance->password) {
- if ($data['enrolpassword'] !== $instance->password) {
- if ($instance->customint1) {
- $groups = $DB->get_records('groups', array('courseid'=>$instance->courseid), 'id ASC', 'id, enrolmentkey');
- $found = false;
- foreach ($groups as $group) {
- if (empty($group->enrolmentkey)) {
- continue;
- }
- if ($group->enrolmentkey === $data['enrolpassword']) {
- $found = true;
- break;
- }
- }
- if (!$found) {
- // we can not hint because there are probably multiple passwords
- $errors['enrolpassword'] = get_string('passwordinvalid', 'enrol_self');
- }
-
- } else {
- $plugin = enrol_get_plugin('self');
- if ($plugin->get_config('showhint')) {
- $textlib = textlib_get_instance();
- $hint = $textlib->substr($instance->password, 0, 1);
- $errors['enrolpassword'] = get_string('passwordinvalidhint', 'enrol_self', $hint);
- } else {
- $errors['enrolpassword'] = get_string('passwordinvalid', 'enrol_self');
- }
- }
- }
- }
-
- return $errors;
- }
-}
\ No newline at end of file
diff --git a/manage.php b/manage.php
index 26050ba..5dc7365 100644
--- a/manage.php
+++ b/manage.php
@@ -1,62 +1,76 @@
.
+
/**
- * *************************************************************************
- * * Apply Enrol **
- * *************************************************************************
- * @copyright emeneo.com **
- * @link emeneo.com **
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later **
- * *************************************************************************
- * ************************************************************************
-*/
-require ('../../config.php');
-require_once ('lib.php');
+ * @package enrol_apply
+ * @copyright emeneo.com (http://emeneo.com/)
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @author emeneo.com (http://emeneo.com/)
+ * @author Johannes Burk
+ */
+
+require_once('../../config.php');
+require_once($CFG->dirroot.'/enrol/apply/lib.php');
+require_once($CFG->dirroot.'/enrol/apply/manage_table.php');
+require_once($CFG->dirroot.'/enrol/apply/renderer.php');
+
+$id = optional_param('id', null, PARAM_INT);
+$userenrolments = optional_param_array('userenrolments', null, PARAM_INT);
+
require_login();
-require_capability('enrol/apply:manage', context_system::instance());
-
-$site = get_site ();
-$systemcontext = context_system::instance();
-
-$PAGE->set_url ( '/enrol/manage.php');
-$PAGE->set_context($systemcontext);
-$PAGE->set_pagelayout ( 'admin' );
-//$PAGE->set_heading ( $course->fullname );
-
-$PAGE->navbar->add ( get_string ( 'confirmusers', 'enrol_apply' ) );
-$PAGE->set_title ( "$site->shortname: " . get_string ( 'confirmusers', 'enrol_apply' ) );
-
-if (isset ( $_POST ['enrolid'] )) {
- if ($_POST ['enrolid']) {
- if ($_POST ['type'] == 'confirm') {
- confirmEnrolment ( $_POST ['enrolid'] );
- } elseif ($_POST ['type'] == 'cancel') {
- cancelEnrolment ( $_POST ['enrolid'] );
- }
- redirect ( "$CFG->wwwroot/enrol/apply/manage.php" );
- }
+
+$manageurlparams = array();
+if ($id == null) {
+ $context = context_system::instance();
+ require_capability('enrol/apply:manageapplications', $context);
+ $pageheading = get_string('confirmusers', 'enrol_apply');
+} else {
+ $instance = $DB->get_record('enrol', array('id' => $id, 'enrol' => 'apply'), '*', MUST_EXIST);
+ require_course_login($instance->courseid);
+ $course = get_course($instance->courseid);
+ $context = context_course::instance($course->id, MUST_EXIST);
+ require_capability('enrol/apply:manageapplications', $context);
+ $manageurlparams['id'] = $instance->id;
+ $pageheading = $course->fullname;
}
-$enrols = getAllEnrolment();
-echo $OUTPUT->header ();
-echo $OUTPUT->heading ( get_string ( 'confirmusers', 'enrol_apply' ) );
-echo '';
-echo '';
-echo $OUTPUT->footer ();
\ No newline at end of file
+
+$table = new enrol_apply_manage_table($id);
+$table->define_baseurl($manageurl);
+
+$renderer = $PAGE->get_renderer('enrol_apply');
+$renderer->manage_page($table, $manageurl);
diff --git a/manage_table.php b/manage_table.php
new file mode 100644
index 0000000..3c98dd4
--- /dev/null
+++ b/manage_table.php
@@ -0,0 +1,87 @@
+.
+
+/**
+ *
+ * @package enrol_apply
+ * @copyright 2016 sudile GbR (http://www.sudile.com)
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @author Johannes Burk
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+require_once($CFG->libdir . '/tablelib.php');
+
+class enrol_apply_manage_table extends table_sql {
+
+ public $is_collapsible = false;
+
+ public function __construct($enrolid = null) {
+ parent::__construct('enrol_apply_manage_table');
+
+ global $DB;
+
+ $sqlwhere = 'ue.status != 0';
+ $sqlparams = array();
+ if ($enrolid != null) {
+ $sqlwhere .= " AND e.id = :enrolid";
+ $sqlparams['enrolid'] = $enrolid;
+ } else {
+ $sqlwhere .= " AND e.enrol = :enrol";
+ $sqlparams['enrol'] = 'apply';
+ }
+
+ $this->set_sql(
+ 'ue.id AS userenrolmentid, ue.userid, ue.status AS enrolstatus, ue.timecreated AS applydate,
+ ai.comment AS applycomment, u.*, c.fullname as course',
+ "{user_enrolments} AS ue
+ LEFT JOIN {enrol_apply_applicationinfo} ai ON ai.userenrolmentid = ue.id
+ JOIN {user} u ON u.id = ue.userid
+ JOIN {enrol} e ON e.id = ue.enrolid
+ JOIN {course} c ON c.id = e.courseid",
+ $sqlwhere,
+ $sqlparams);
+ }
+
+ /**
+ * Get any extra classes names to add to this row in the HTML.
+ * @param $row array the data for this row. Note (Johannes): this is actually an object with all sql columns.
+ * @return string added to the class="" attribute of the tr.
+ */
+ public function get_row_class($row) {
+ if ($row->enrolstatus == 2) {
+ return 'enrol_apply_waitinglist_highlight';
+ }
+ return '';
+ }
+
+ public function col_checkboxcolumn($row) {
+ return html_writer::checkbox('userenrolments[]', $row->userenrolmentid, false);
+ }
+
+ public function col_fullname($row) {
+ // The $row variable contains all user fields, see sql query.
+ global $OUTPUT;
+ $col = $OUTPUT->user_picture($row, array('popup' => true));
+ $col .= fullname($row);
+ return $col;
+ }
+
+ public function col_applydate($row) {
+ return date("Y-m-d", $row->applydate);
+ }
+}
diff --git a/renderer.php b/renderer.php
new file mode 100644
index 0000000..7d95c76
--- /dev/null
+++ b/renderer.php
@@ -0,0 +1,137 @@
+.
+
+/**
+ *
+ * @package enrol_apply
+ * @copyright 2016 sudile GbR (http://www.sudile.com)
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @author Johannes Burk
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+class enrol_apply_renderer extends plugin_renderer_base {
+ public function manage_page($table, $manageurl) {
+ echo $this->header();
+ echo $this->heading(get_string('confirmusers', 'enrol_apply'));
+ echo get_string('confirmusers_desc', 'enrol_apply');
+ $this->manage_form($table, $manageurl);
+ echo $this->footer();
+ }
+
+ public function edit_page($mform) {
+ echo $this->header();
+ echo $this->heading(get_string('pluginname', 'enrol_apply'));
+ $mform->display();
+ echo $this->footer();
+ }
+
+ public function manage_form($table, $manageurl) {
+ echo html_writer::start_tag('form', array(
+ 'id' => 'enrol_apply_manage_form',
+ 'method' => 'post',
+ 'action' => $manageurl->out()));
+
+ $this->manage_table($table);
+
+ echo html_writer::start_tag('p', array('align' => 'center'));
+
+ echo html_writer::empty_tag('input', array(
+ 'type' => 'submit',
+ 'name' => 'confirm',
+ 'value' => get_string('btnconfirm', 'enrol_apply')));
+ echo html_writer::empty_tag('input', array(
+ 'type' => 'submit',
+ 'name' => 'wait',
+ 'value' => get_string('btnwait', 'enrol_apply')));
+ echo html_writer::empty_tag('input', array(
+ 'type' => 'submit',
+ 'name' => 'cancel',
+ 'value' => get_string('btncancel', 'enrol_apply')));
+
+ echo html_writer::end_tag('p');
+ echo html_writer::end_tag('form');
+ }
+
+ public function manage_table($table) {
+ $columns = array(
+ 'checkboxcolumn',
+ 'course',
+ 'fullname', // Magic happens here: The column heading will automatically be set.
+ 'email',
+ 'applydate',
+ 'applycomment');
+ $headers = array(
+ '',
+ get_string('course'),
+ 'fullname', // Magic happens here: The column heading will automatically be set due to column name 'fullname'.
+ get_string('email'),
+ get_string('applydate', 'enrol_apply'),
+ get_string('comment', 'enrol_apply'));
+ $table->define_columns($columns);
+ $table->define_headers($headers);
+
+ $table->sortable(true, 'id');
+
+ $table->out(50, true);
+ }
+
+ public function application_notification_mail_body(
+ $course, $user, $manageurl, $applydescription, $standarduserfields = null, $extrauserfields = null) {
+
+ $body = ''. get_string('coursename', 'enrol_apply') .': '.format_string($course->fullname).'
';
+ $body .= ''. get_string('applyuser', 'enrol_apply') .': '.$user->firstname.' '.$user->lastname.'
';
+ $body .= ''. get_string('comment', 'enrol_apply') .': '.$applydescription.'
';
+ if ($standarduserfields) {
+ $body .= ''. get_string('user_profile', 'enrol_apply').'
';
+ $body .= ''. get_string('firstname') .': '.$standarduserfields->firstname.'
';
+ $body .= ''. get_string('lastname') .': '.$standarduserfields->lastname.'
';
+ $body .= ''. get_string('email') .': '.$standarduserfields->email.'
';
+ $body .= ''. get_string('city') .': '.$standarduserfields->city.'
';
+ $body .= ''. get_string('country') .': '.$standarduserfields->country.'
';
+ $body .= ''. get_string('preferredlanguage') .': '.$standarduserfields->lang.'
';
+ $body .= ''. get_string('description') .': '.$standarduserfields->description_editor['text'].'
';
+
+ $body .= ''. get_string('firstnamephonetic') .': '.$standarduserfields->firstnamephonetic.'
';
+ $body .= ''. get_string('lastnamephonetic') .': '.$standarduserfields->lastnamephonetic.'
';
+ $body .= ''. get_string('middlename') .': '.$standarduserfields->middlename.'
';
+ $body .= ''. get_string('alternatename') .': '.$standarduserfields->alternatename.'
';
+ $body .= ''. get_string('url') .': '.$standarduserfields->url.'
';
+ $body .= ''. get_string('icqnumber') .': '.$standarduserfields->icq.'
';
+ $body .= ''. get_string('skypeid') .': '.$standarduserfields->skype.'
';
+ $body .= ''. get_string('aimid') .': '.$standarduserfields->aim.'
';
+ $body .= ''. get_string('yahooid') .': '.$standarduserfields->yahoo.'
';
+ $body .= ''. get_string('msnid') .': '.$standarduserfields->msn.'
';
+ $body .= ''. get_string('idnumber') .': '.$standarduserfields->idnumber.'
';
+ $body .= ''. get_string('institution') .': '.$standarduserfields->institution.'
';
+ $body .= ''. get_string('department') .': '.$standarduserfields->department.'
';
+ $body .= ''. get_string('phone') .': '.$standarduserfields->phone1.'
';
+ $body .= ''. get_string('phone2') .': '.$standarduserfields->phone2.'
';
+ $body .= ''. get_string('address') .': '.$standarduserfields->address.'
';
+ }
+
+ if ($extrauserfields) {
+ foreach ($extrauserfields as $key => $value) {
+ $body .= ''. $key .': '.$value.'
';
+ }
+ }
+
+ $body .= ''. html_writer::link($manageurl, get_string('applymanage', 'enrol_apply')).'
';
+
+ return $body;
+ }
+}
diff --git a/selectlib.php b/selectlib.php
deleted file mode 100644
index f49c143..0000000
--- a/selectlib.php
+++ /dev/null
@@ -1,155 +0,0 @@
-.
-
-/**
- * Auxiliary manual user enrolment lib, the main purpose is to lower memory requirements...
- *
- * @package enrol
- * @subpackage manual
- * @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();
-
-require_once($CFG->dirroot . '/user/selector/lib.php');
-
-/**
- * Enrol candidates
- */
-class enrol_apply_potential_participant extends user_selector_base {
- protected $enrolid;
-
- public function __construct($name, $options) {
- $this->enrolid = $options['enrolid'];
- parent::__construct($name, $options);
- }
-
- /**
- * Candidate users
- * @param $search
- * @return array
- */
- public function find_users($search) {
- global $DB;
- //by default wherecondition retrieves all users except the deleted, not confirmed and guest
- list($wherecondition, $params) = $this->search_sql($search, 'u');
- $params['enrolid'] = $this->enrolid;
-
- $fields = 'SELECT ' . $this->required_fields_sql('u');
- $countfields = 'SELECT COUNT(1)';
-
- $sql = " FROM {user} u
- WHERE $wherecondition
- AND u.id NOT IN (SELECT ue.userid
- FROM {user_enrolments} ue
- JOIN {enrol} e ON (e.id = ue.enrolid AND e.id = :enrolid))";
-
- $order = ' ORDER BY u.lastname ASC, u.firstname ASC';
-
- if (!$this->is_validating()) {
- $potentialmemberscount = $DB->count_records_sql($countfields . $sql, $params);
- if ($potentialmemberscount > 100) {
- return $this->too_many_results($search, $potentialmemberscount);
- }
- }
-
- $availableusers = $DB->get_records_sql($fields . $sql . $order, $params);
-
- if (empty($availableusers)) {
- return array();
- }
-
-
- if ($search) {
- $groupname = get_string('enrolcandidatesmatching', 'enrol', $search);
- } else {
- $groupname = get_string('enrolcandidates', 'enrol');
- }
-
- return array($groupname => $availableusers);
- }
-
- protected function get_options() {
- $options = parent::get_options();
- $options['enrolid'] = $this->enrolid;
- $options['file'] = 'enrol/apply/selectlib.php';
- return $options;
- }
-}
-
-/**
- * Enroled users
- */
-class enrol_apply_current_participant extends user_selector_base {
- protected $courseid;
- protected $enrolid;
-
- public function __construct($name, $options) {
- $this->enrolid = $options['enrolid'];
- parent::__construct($name, $options);
- }
-
- /**
- * Candidate users
- * @param $search
- * @return array
- */
- public function find_users($search) {
- global $DB;
- //by default wherecondition retrieves all users except the deleted, not confirmed and guest
- list($wherecondition, $params) = $this->search_sql($search, 'u');
- $params['enrolid'] = $this->enrolid;
-
- $fields = 'SELECT ' . $this->required_fields_sql('u');
- $countfields = 'SELECT COUNT(1)';
-
- $sql = " FROM {user} u
- JOIN {user_enrolments} ue ON (ue.userid = u.id AND ue.enrolid = :enrolid)
- WHERE $wherecondition";
-
- $order = ' ORDER BY u.lastname ASC, u.firstname ASC';
-
- if (!$this->is_validating()) {
- $potentialmemberscount = $DB->count_records_sql($countfields . $sql, $params);
- if ($potentialmemberscount > 100) {
- return $this->too_many_results($search, $potentialmemberscount);
- }
- }
-
- $availableusers = $DB->get_records_sql($fields . $sql . $order, $params);
-
- if (empty($availableusers)) {
- return array();
- }
-
-
- if ($search) {
- $groupname = get_string('enrolledusersmatching', 'enrol', $search);
- } else {
- $groupname = get_string('enrolledusers', 'enrol');
- }
-
- return array($groupname => $availableusers);
- }
-
- protected function get_options() {
- $options = parent::get_options();
- $options['enrolid'] = $this->enrolid;
- $options['file'] = 'enrol/apply/locallib.php';
- return $options;
- }
-}
diff --git a/settings.php b/settings.php
index de61af9..f58eb01 100644
--- a/settings.php
+++ b/settings.php
@@ -1,60 +1,127 @@
.
+
/**
- * *************************************************************************
- * * Apply Enrol **
- * *************************************************************************
- * @copyright emeneo.com **
- * @link emeneo.com **
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later **
- * *************************************************************************
- * ************************************************************************
-*/
+ * @package enrol_apply
+ * @copyright emeneo.com (http://emeneo.com/)
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @author emeneo.com (http://emeneo.com/)
+ * @author Johannes Burk
+ */
+
defined('MOODLE_INTERNAL') || die();
if ($ADMIN->fulltree) {
- //--- general settings -----------------------------------------------------------------------------------
- $settings->add(new admin_setting_heading('enrol_apply_enrolname','',get_string('pluginname_desc', 'enrol_apply')));
-
- $settings->add(new admin_setting_configtext('enrol_apply/confirmmailsubject','',get_string('confirmmailsubject', 'enrol_apply'),null,PARAM_TEXT,60));
+ $settings->add(new admin_setting_heading('enrol_apply_enrolname', '', get_string('pluginname_desc', 'enrol_apply')));
+
+ // Confirm mail settings...
+ $settings->add(new admin_setting_heading(
+ 'enrol_apply_confirmmail',
+ get_string('confirmmail_heading', 'enrol_apply'),
+ get_string('confirmmail_desc', 'enrol_apply')));
+ $settings->add(new admin_setting_configtext(
+ 'enrol_apply/confirmmailsubject',
+ get_string('confirmmailsubject', 'enrol_apply'),
+ get_string('confirmmailsubject_desc', 'enrol_apply'),
+ null,
+ PARAM_TEXT,
+ 60));
+ $settings->add(new admin_setting_confightmleditor(
+ 'enrol_apply/confirmmailcontent',
+ get_string('confirmmailcontent', 'enrol_apply'),
+ get_string('confirmmailcontent_desc', 'enrol_apply'),
+ null,
+ PARAM_RAW));
- $settings->add(new admin_setting_heading('enrol_apply_confirmmailcontent', '', get_string('confirmmailcontent_desc', 'enrol_apply')));
- $settings->add(new admin_setting_confightmleditor('enrol_apply/confirmmailcontent', get_string('confirmmailcontent', 'enrol_apply'),'utf-8',''));
-
- $settings->add(new admin_setting_configtext('enrol_apply/waitmailsubject','',get_string('waitmailsubject', 'enrol_apply'),null,PARAM_TEXT,60));
+ // Wait mail settings.
+ $settings->add(new admin_setting_heading(
+ 'enrol_apply_waitmail',
+ get_string('waitmail_heading', 'enrol_apply'),
+ get_string('waitmail_desc', 'enrol_apply')));
+ $settings->add(new admin_setting_configtext(
+ 'enrol_apply/waitmailsubject',
+ get_string('waitmailsubject', 'enrol_apply'),
+ get_string('waitmailsubject_desc', 'enrol_apply'),
+ null,
+ PARAM_TEXT,
+ 60));
+ $settings->add(new admin_setting_confightmleditor(
+ 'enrol_apply/waitmailcontent',
+ get_string('waitmailcontent', 'enrol_apply'),
+ get_string('waitmailcontent_desc', 'enrol_apply'),
+ null,
+ PARAM_RAW));
- $settings->add(new admin_setting_heading('enrol_apply_waitmailcontent', '', get_string('waitmailcontent_desc', 'enrol_apply')));
- $settings->add(new admin_setting_confightmleditor('enrol_apply/waitmailcontent', get_string('waitmailcontent', 'enrol_apply'),'utf-8',''));
+ // Cancel mail settings...
+ $settings->add(new admin_setting_heading(
+ 'enrol_apply_cancelmail',
+ get_string('cancelmail_heading', 'enrol_apply'),
+ get_string('cancelmail_desc', 'enrol_apply')));
+ $settings->add(new admin_setting_configtext(
+ 'enrol_apply/cancelmailsubject',
+ get_string('cancelmailsubject', 'enrol_apply'),
+ get_string('cancelmailsubject_desc', 'enrol_apply'),
+ null,
+ PARAM_TEXT,
+ 60));
+ $settings->add(new admin_setting_confightmleditor(
+ 'enrol_apply/cancelmailcontent',
+ get_string('cancelmailcontent', 'enrol_apply'),
+ get_string('cancelmailcontent_desc', 'enrol_apply'),
+ null,
+ PARAM_RAW));
- $settings->add(new admin_setting_configtext('enrol_apply/cancelmailsubject','',get_string('cancelmailsubject', 'enrol_apply'),null,PARAM_TEXT,60));
+ // Notification settings...
+ $settings->add(new admin_setting_heading(
+ 'enrol_apply_notify',
+ get_string('notify_heading', 'enrol_apply'),
+ get_string('notify_desc', 'enrol_apply')));
+ $settings->add(new admin_setting_configcheckbox(
+ 'enrol_apply/sendmailtoteacher',
+ get_string('sendmailtoteacher', 'enrol_apply'),
+ '',
+ 0));
+ $settings->add(new admin_setting_configcheckbox(
+ 'enrol_apply/sendmailtomanager',
+ get_string('sendmailtomanager', 'enrol_apply'),
+ '',
+ 0));
- $settings->add(new admin_setting_heading('enrol_apply_cancelmailcontent', '', get_string('cancelmailcontent_desc', 'enrol_apply')));
- $settings->add(new admin_setting_confightmleditor('enrol_apply/cancelmailcontent', get_string('cancelmailcontent', 'enrol_apply'),'utf-8',''));
-
- $settings->add(new admin_setting_configcheckbox('enrol_apply/sendmailtoteacher', get_string('sendmailtoteacher', 'enrol_apply'), '', 0));
- $settings->add(new admin_setting_configcheckbox('enrol_apply/sendmailtomanager', get_string('sendmailtomanager', 'enrol_apply'), '', 0));
-
- //--- enrol instance defaults ----------------------------------------------------------------------------
+ // Enrol instance defaults...
$settings->add(new admin_setting_heading('enrol_manual_defaults',
get_string('enrolinstancedefaults', 'admin'), get_string('enrolinstancedefaults_desc', 'admin')));
-
+
$settings->add(new admin_setting_configcheckbox('enrol_apply/defaultenrol',
get_string('defaultenrol', 'enrol'), get_string('defaultenrol_desc', 'enrol'), 0));
-
+
$options = array(ENROL_INSTANCE_ENABLED => get_string('yes'),
ENROL_INSTANCE_DISABLED => get_string('no'));
$settings->add(new admin_setting_configselect('enrol_apply/status',
get_string('status', 'enrol_apply'), get_string('status_desc', 'enrol_apply'), ENROL_INSTANCE_ENABLED, $options));
- $options = array(ENROL_INSTANCE_ENABLED => get_string('yes'),
- ENROL_INSTANCE_DISABLED => get_string('no'));
+ $options = array(1 => get_string('yes'),
+ 0 => get_string('no'));
$settings->add(new admin_setting_configselect('enrol_apply/show_standard_user_profile',
- get_string('show_standard_user_profile', 'enrol_apply'), '', ENROL_INSTANCE_ENABLED, $options));
+ get_string('show_standard_user_profile', 'enrol_apply'), '', 1, $options));
- $options = array(ENROL_INSTANCE_ENABLED => get_string('yes'),
- ENROL_INSTANCE_DISABLED => get_string('no'));
+ $options = array(1 => get_string('yes'),
+ 0 => get_string('no'));
$settings->add(new admin_setting_configselect('enrol_apply/show_extra_user_profile',
- get_string('show_extra_user_profile', 'enrol_apply'), '', ENROL_INSTANCE_ENABLED, $options));
+ get_string('show_extra_user_profile', 'enrol_apply'), '', 1, $options));
if (!during_initial_install()) {
$options = get_default_enrol_roles(context_system::instance());
@@ -65,7 +132,7 @@ if ($ADMIN->fulltree) {
}
}
-if ($hassiteconfig) { // needs this condition or there is error on login page
+if ($hassiteconfig) { // Needs this condition or there is error on login page.
$ADMIN->add('courses', new admin_externalpage('enrol_apply',
get_string('applymanage', 'enrol_apply'),
new moodle_url('/enrol/apply/manage.php')));
diff --git a/style.css b/style.css
new file mode 100644
index 0000000..05b7433
--- /dev/null
+++ b/style.css
@@ -0,0 +1,3 @@
+.enrol_apply_waitinglist_highlight {
+ border-left: 6px solid grey;
+}
diff --git a/unenrolself.php b/unenrolself.php
index 942014c..4cf6021 100644
--- a/unenrolself.php
+++ b/unenrolself.php
@@ -15,9 +15,12 @@
// along with Moodle. If not, see .
/**
- * Self enrolment plugin - support for user self unenrolment.
+ * User self unenrolment action and user secrity query for the enrol_apply plugin.
+ * The presence of this file plus the capability 'apply:unenrolself'
+ * results in a self unenrolment link in the course administration
+ * navigation ('Unenrol me from ...').
*
- * @package enrol_self
+ * @package enrol_apply
* @copyright 2010 Petr Skoda {@link http://skodak.org}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
@@ -27,8 +30,8 @@ require('../../config.php');
$enrolid = required_param('enrolid', PARAM_INT);
$confirm = optional_param('confirm', 0, PARAM_BOOL);
-$instance = $DB->get_record('enrol', array('id'=>$enrolid, 'enrol'=>'apply'), '*', MUST_EXIST);
-$course = $DB->get_record('course', array('id'=>$instance->courseid), '*', MUST_EXIST);
+$instance = $DB->get_record('enrol', array('id' => $enrolid, 'enrol' => 'apply'), '*', MUST_EXIST);
+$course = $DB->get_record('course', array('id' => $instance->courseid), '*', MUST_EXIST);
$context = context_course::instance($course->id, MUST_EXIST);
require_login();
@@ -41,26 +44,22 @@ $plugin = enrol_get_plugin('apply');
// Security defined inside following function.
if (!$plugin->get_unenrolself_link($instance)) {
- redirect(new moodle_url('/course/view.php', array('id'=>$course->id)));
+ redirect(new moodle_url('/course/view.php', array('id' => $course->id)));
}
-$PAGE->set_url('/enrol/apply/unenrolself.php', array('enrolid'=>$instance->id));
+$PAGE->set_url('/enrol/apply/unenrolself.php', array('enrolid' => $instance->id));
$PAGE->set_title($plugin->get_instance_name($instance));
if ($confirm and confirm_sesskey()) {
$plugin->unenrol_user($instance, $USER->id);
-
- // Deprecated fixed by Shiro
- //add_to_log($course->id, 'course', 'unenrol', '../enrol/users.php?id='.$course->id, $course->id); //TODO: there should be userid somewhere!
- $context = context_course::instance($course->id);
- \core\event\user_enrolment_deleted::delete(array('context' => $context))->trigger();
redirect(new moodle_url('/index.php'));
}
echo $OUTPUT->header();
-$yesurl = new moodle_url($PAGE->url, array('confirm'=>1, 'sesskey'=>sesskey()));
-$nourl = new moodle_url('/course/view.php', array('id'=>$course->id));
-$message = get_string('unenrolselfconfirm', 'enrol_self', format_string($course->fullname)); //I leave the unenrolselfconfirm message because it fits perfectly
+$yesurl = new moodle_url($PAGE->url, array('confirm' => 1, 'sesskey' => sesskey()));
+$nourl = new moodle_url('/course/view.php', array('id' => $course->id));
+// I leave the unenrolselfconfirm message because it fits perfectly.
+$message = get_string('unenrolselfconfirm', 'enrol_self', format_string($course->fullname));
echo $OUTPUT->confirm($message, $yesurl, $nourl);
echo $OUTPUT->footer();
diff --git a/unenroluser.php b/unenroluser.php
deleted file mode 100644
index 9d423e4..0000000
--- a/unenroluser.php
+++ /dev/null
@@ -1,98 +0,0 @@
-dirroot/enrol/locallib.php");
-require_once("$CFG->dirroot/enrol/renderer.php");
-
-$ueid = required_param('ue', PARAM_INT); // user enrolment id
-$filter = optional_param('ifilter', 0, PARAM_INT);
-$confirm = optional_param('confirm', false, PARAM_BOOL);
-
-// Get the user enrolment object
-$ue = $DB->get_record('user_enrolments', array('id' => $ueid), '*', MUST_EXIST);
-// Get the user for whom the enrolment is
-$user = $DB->get_record('user', array('id'=>$ue->userid), '*', MUST_EXIST);
-// Get the course the enrolment is to
-//list($ctxsql, $ctxjoin) = context_instance_preload_sql('c.id', CONTEXT_COURSE, 'ctx');
-$ctxsql = context_helper::get_preload_record_columns_sql('ctx');
-$sql = "SELECT c.*, $ctxsql
- FROM {course} c
- LEFT JOIN {enrol} e ON e.courseid = c.id
- LEFT JOIN {context} ctx ON (ctx.instanceid = c.id AND ctx.contextlevel = :contextcourse)
- WHERE e.id = :enrolid";
-$params = array('enrolid' => $ue->enrolid, 'contextcourse' => CONTEXT_COURSE);
-$course = $DB->get_record_sql($sql, $params, MUST_EXIST);
-context_helper::preload_from_record($course);
-
-
-// Make sure it's not the front page
-if ($course->id == SITEID) {
- redirect(new moodle_url('/'));
-}
-
-// Obviously
-require_login($course);
-// Make sure the user can unenrol users.
-require_capability("enrol/apply:unenrol", context_course::instance($course->id));
-
-// Get the enrolment manager for this course
-$manager = new course_enrolment_manager($PAGE, $course, $filter);
-// Get an enrolment users table object. Doign this will automatically retrieve the the URL params
-// relating to table the user was viewing before coming here, and allows us to return the user to the
-// exact page of the users screen they can from.
-$table = new course_enrolment_users_table($manager, $PAGE);
-
-// The URL of the enrolled users page for the course.
-$usersurl = new moodle_url('/enrol/users.php', array('id' => $course->id));
-// The URl to return the user too after this screen.
-$returnurl = new moodle_url($usersurl, $manager->get_url_params()+$table->get_url_params());
-// The URL of this page
-$url = new moodle_url('/enrol/apply/unenroluser.php', $returnurl->params());
-$url->param('ue', $ueid);
-
-$PAGE->set_url($url);
-$PAGE->set_pagelayout('admin');
-navigation_node::override_active_url($usersurl);
-
-list($instance, $plugin) = $manager->get_user_enrolment_components($ue);
-if (!$plugin->allow_unenrol($instance) || $instance->enrol != 'apply' || !($plugin instanceof enrol_apply_plugin)) {
- print_error('erroreditenrolment', 'enrol');
-}
-
-// If the unenrolment has been confirmed and the sesskey is valid unenrol the user.
-if ($confirm && confirm_sesskey() && $manager->unenrol_user($ue)) {
- redirect($returnurl);
-}
-
-$yesurl = new moodle_url($PAGE->url, array('confirm'=>1, 'sesskey'=>sesskey()));
-$message = get_string('unenroluser', 'enrol_self', array('user' => fullname($user, true), 'course' => format_string($course->fullname)));
-$fullname = fullname($user);
-$title = get_string('unenrol', 'enrol_self');
-
-$PAGE->set_title($title);
-$PAGE->set_heading($title);
-$PAGE->navbar->add($title);
-$PAGE->navbar->add($fullname);
-
-echo $OUTPUT->header();
-echo $OUTPUT->heading($fullname);
-echo $OUTPUT->confirm($message, $yesurl, $returnurl);
-echo $OUTPUT->footer();
diff --git a/version.php b/version.php
index 9d68c8b..f504dcf 100644
--- a/version.php
+++ b/version.php
@@ -1,24 +1,30 @@
.
+
/**
- * *************************************************************************
- * * Apply Enrol **
- * *************************************************************************
- * @copyright emeneo.com **
- * @link emeneo.com **
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later **
- * *************************************************************************
- * ************************************************************************
-*/
-/**
- * Short answer question type version information.
- *
- * @package enrol apply
- * @copyright Emeneo {@link http://www.emeneo.com/}
+ * @package enrol_apply
+ * @copyright emeneo.com (http://emeneo.com/)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @author emeneo.com (http://emeneo.com/)
+ * @author Johannes Burk
*/
+
defined('MOODLE_INTERNAL') || die();
-$plugin->version = 2016042201;
+$plugin->version = 2016042203;
$plugin->requires = 2011080100;
$plugin->maturity = MATURITY_STABLE;
$plugin->release = 'Enrolment upon approval plugin Version 3.0-d';