ILB
/
moodle-enrol_apply
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Some bugfixes 

Some bugfixes
develop_fields
Flottertotte 10 years ago
parent
d311304059
commit
9d44f1d287
4 changed files with 78 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      edit.php
  2. 8
      edit_form.php
  3. 63
      lib.php
  4. 17
      locallib.php

2
edit.php
View File

@ -53,6 +53,8 @@ if ($mform->is_cancelled()) {
$instance->status = $data->status; $instance->status = $data->status;
$instance->name = $data->name; $instance->name = $data->name;
$instance->customtext1 = $data->customtext1; $instance->customtext1 = $data->customtext1;
$instance->customint1 = $data->customint1;
$instance->customint2 = $data->customint2;
$instance->roleid = $data->roleid; $instance->roleid = $data->roleid;
$instance->timemodified = time(); $instance->timemodified = time();
$DB->update_record('enrol', $instance); $DB->update_record('enrol', $instance);

8
edit_form.php
View File

@ -29,7 +29,7 @@ class enrol_self_edit_form extends moodleform {
$options = array(ENROL_INSTANCE_ENABLED => get_string('yes'), $options = array(ENROL_INSTANCE_ENABLED => get_string('yes'),
ENROL_INSTANCE_DISABLED => get_string('no')); ENROL_INSTANCE_DISABLED => get_string('no'));
$mform->addElement('select', 'status', get_string('status', 'enrol_apply'), $options); $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')); $mform->setDefault('status', $plugin->get_config('status'));
if ($instance->id) { if ($instance->id) {
@ -42,6 +42,12 @@ class enrol_self_edit_form extends moodleform {
$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'));
$mform->addElement('select', 'customint2', get_string('show_extra_user_profile', 'enrol_apply'), $options);
$mform->setDefault('customint2', $plugin->get_config('customint2'));
$mform->addElement('hidden', 'id'); $mform->addElement('hidden', 'id');
$mform->setType('id', PARAM_INT); $mform->setType('id', PARAM_INT);
$mform->addElement('hidden', 'courseid'); $mform->addElement('hidden', 'courseid');

63
lib.php
View File

@ -84,7 +84,21 @@ class enrol_apply_plugin extends enrol_plugin {
$userInfo->id = $USER->id; $userInfo->id = $USER->id;
$apply_setting = $DB->get_records_sql("select name,value from ".$CFG->prefix."config_plugins where plugin='enrol_apply'"); $apply_setting = $DB->get_records_sql("select name,value from ".$CFG->prefix."config_plugins where plugin='enrol_apply'");
if($apply_setting['show_standard_user_profile']->value == 1 && $apply_setting['show_extra_user_profile']->value == 0){
$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); profile_save_data($userInfo);
//$res = $DB->update_record('user',$userInfoProfile); //$res = $DB->update_record('user',$userInfoProfile);
}else{ }else{
@ -106,8 +120,8 @@ class enrol_apply_plugin extends enrol_plugin {
} }
$this->enrol_user($instance, $USER->id, $roleid, $timestart, $timeend,1); $this->enrol_user($instance, $USER->id, $roleid, $timestart, $timeend,1);
sendConfirmMailToTeachers($instance->courseid, $instance->id, $data, $applydescription); sendConfirmMailToTeachers($instance, $data, $applydescription);
sendConfirmMailToManagers($instance->courseid,$data, $applydescription); sendConfirmMailToManagers($instance, $data, $applydescription);
add_to_log($instance->courseid, 'course', 'enrol', '../enrol/users.php?id='.$instance->courseid, $instance->courseid); //there should be userid somewhere! add_to_log($instance->courseid, 'course', 'enrol', '../enrol/users.php?id='.$instance->courseid, $instance->courseid); //there should be userid somewhere!
redirect("$CFG->wwwroot/course/view.php?id=$instance->courseid"); redirect("$CFG->wwwroot/course/view.php?id=$instance->courseid");
@ -278,12 +292,28 @@ function sendConfirmMail($info){
email_to_user($info, $contact, $apply_setting['confirmmailsubject']->value, html_to_text($body), $body); email_to_user($info, $contact, $apply_setting['confirmmailsubject']->value, html_to_text($body), $body);
} }
function sendConfirmMailToTeachers($courseid,$instanceid,$info,$applydescription){ function sendConfirmMailToTeachers($instance,$info,$applydescription){
global $DB; global $DB;
global $CFG; global $CFG;
global $USER; 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'"); $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['sendmailtoteacher']->value == 1){ if($apply_setting['sendmailtoteacher']->value == 1){
$course = get_course($courseid); $course = get_course($courseid);
$context = context_course::instance($courseid, MUST_EXIST); $context = context_course::instance($courseid, MUST_EXIST);
@ -295,7 +325,7 @@ function sendConfirmMailToTeachers($courseid,$instanceid,$info,$applydescription
$body .= '<p>'. get_string('applyuser', 'enrol_apply') .': '.$USER->firstname.' '.$USER->lastname.'</p>'; $body .= '<p>'. get_string('applyuser', 'enrol_apply') .': '.$USER->firstname.' '.$USER->lastname.'</p>';
$body .= '<p>'. get_string('comment', 'enrol_apply') .': '.$applydescription.'</p>'; $body .= '<p>'. get_string('comment', 'enrol_apply') .': '.$applydescription.'</p>';
if($apply_setting['show_standard_user_profile']->value == 0){ if($show_standard_user_profile){
$body .= '<p><strong>'. get_string('user_profile', 'enrol_apply').'</strong></p>'; $body .= '<p><strong>'. get_string('user_profile', 'enrol_apply').'</strong></p>';
$body .= '<p>'. get_string('firstname') .': '.$info->firstname.'</p>'; $body .= '<p>'. get_string('firstname') .': '.$info->firstname.'</p>';
$body .= '<p>'. get_string('lastname') .': '.$info->lastname.'</p>'; $body .= '<p>'. get_string('lastname') .': '.$info->lastname.'</p>';
@ -323,7 +353,7 @@ function sendConfirmMailToTeachers($courseid,$instanceid,$info,$applydescription
$body .= '<p>'. get_string('address') .': '.$info->address.'</p>'; $body .= '<p>'. get_string('address') .': '.$info->address.'</p>';
} }
if($apply_setting['show_extra_user_profile']->value == 0){ if($show_extra_user_profile){
require_once($CFG->dirroot.'/user/profile/lib.php'); require_once($CFG->dirroot.'/user/profile/lib.php');
$user = $DB->get_record('user',array('id'=>$USER->id)); $user = $DB->get_record('user',array('id'=>$USER->id));
profile_load_custom_fields($user); profile_load_custom_fields($user);
@ -341,12 +371,27 @@ function sendConfirmMailToTeachers($courseid,$instanceid,$info,$applydescription
} }
} }
function sendConfirmMailToManagers($courseid,$info,$applydescription){ function sendConfirmMailToManagers($instance,$info,$applydescription){
global $DB; global $DB;
global $CFG; global $CFG;
global $USER; global $USER;
$courseid = $instance->courseid;
$apply_setting = $DB->get_records_sql("select name,value from ".$CFG->prefix."config_plugins where plugin='enrol_apply'"); $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){ if($apply_setting['sendmailtomanager']->value == 1){
$course = get_course($courseid); $course = get_course($courseid);
$context = context_system::instance(); $context = context_system::instance();
@ -357,7 +402,7 @@ function sendConfirmMailToManagers($courseid,$info,$applydescription){
$body = '<p>'. get_string('coursename', 'enrol_apply') .': '.format_string($course->fullname).'</p>'; $body = '<p>'. get_string('coursename', 'enrol_apply') .': '.format_string($course->fullname).'</p>';
$body .= '<p>'. get_string('applyuser', 'enrol_apply') .': '.$USER->firstname.' '.$USER->lastname.'</p>'; $body .= '<p>'. get_string('applyuser', 'enrol_apply') .': '.$USER->firstname.' '.$USER->lastname.'</p>';
$body .= '<p>'. get_string('comment', 'enrol_apply') .': '.$applydescription.'</p>'; $body .= '<p>'. get_string('comment', 'enrol_apply') .': '.$applydescription.'</p>';
if($apply_setting['show_standard_user_profile']->value == 0){ if($show_standard_user_profile){
$body .= '<p><strong>'. get_string('user_profile', 'enrol_apply').'</strong></p>'; $body .= '<p><strong>'. get_string('user_profile', 'enrol_apply').'</strong></p>';
$body .= '<p>'. get_string('firstname') .': '.$info->firstname.'</p>'; $body .= '<p>'. get_string('firstname') .': '.$info->firstname.'</p>';
$body .= '<p>'. get_string('lastname') .': '.$info->lastname.'</p>'; $body .= '<p>'. get_string('lastname') .': '.$info->lastname.'</p>';
@ -385,7 +430,7 @@ function sendConfirmMailToManagers($courseid,$info,$applydescription){
$body .= '<p>'. get_string('address') .': '.$info->address.'</p>'; $body .= '<p>'. get_string('address') .': '.$info->address.'</p>';
} }
if($apply_setting['show_extra_user_profile']->value == 0){ if($show_extra_user_profile){
require_once($CFG->dirroot.'/user/profile/lib.php'); require_once($CFG->dirroot.'/user/profile/lib.php');
$user = $DB->get_record('user',array('id'=>$USER->id)); $user = $DB->get_record('user',array('id'=>$USER->id));
profile_load_custom_fields($user); profile_load_custom_fields($user);

17
locallib.php
View File

@ -72,11 +72,24 @@ class enrol_apply_enrol_form extends moodleform {
$apply_setting = $DB->get_records_sql("select name,value from ".$CFG->prefix."config_plugins where plugin='enrol_apply'"); $apply_setting = $DB->get_records_sql("select name,value from ".$CFG->prefix."config_plugins where plugin='enrol_apply'");
if($apply_setting['show_standard_user_profile']->value == 0){ $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); useredit_shared_definition($mform, $editoroptions, $filemanageroptions);
} }
if($apply_setting['show_extra_user_profile']->value == 0){ if($show_extra_user_profile){
profile_definition($mform, $user->id); profile_definition($mform, $user->id);
} }

Write Preview
Loading…
Cancel
Save