Merge remote-tracking branch 'upstream/master' into apply-v.1.3

Conflicts:
	lib.php

apply.php

@@ -16,11 +16,11 @@ require_once($CFG->dirroot.'/lib/outputcomponents.php');
 require_once ('lib.php');
 
 $site = get_site ();
-$systemcontext = get_context_instance ( CONTEXT_SYSTEM );
+$systemcontext = context_system::instance();
 
 $id = required_param ( 'id', PARAM_INT ); // course id
 $course = $DB->get_record ( 'course', array ('id' => $id ), '*', MUST_EXIST );
-$context = get_context_instance ( CONTEXT_COURSE, $course->id, MUST_EXIST );
+$context =  context_course::instance($course->id, MUST_EXIST);
 
 require_login ( $course );
 require_capability ( 'moodle/course:enrolreview', $context );

edit.php

@@ -17,7 +17,7 @@ $courseid   = required_param('courseid', PARAM_INT);
 $instanceid = optional_param('id', 0, PARAM_INT); // instanceid
 
 $course = $DB->get_record('course', array('id'=>$courseid), '*', MUST_EXIST);
-$context = get_context_instance(CONTEXT_COURSE, $course->id, MUST_EXIST);
+$context =  context_course::instance($course->id, MUST_EXIST);
 
 require_login($course);
 require_capability('enrol/self:config', $context);

enroluser.php

@@ -20,7 +20,7 @@ $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 = get_context_instance(CONTEXT_COURSE, $course->id, MUST_EXIST);
+$context =  context_course::instance($course->id, MUST_EXIST);
 
 require_login($course);
 //require_capability('enrol/manual:enrol', $context);

lang/en/enrol_apply.php

@@ -18,8 +18,8 @@ $string['confirmmailsubject'] = 'Confirm mail subject';
 $string['confirmmailcontent'] = 'Confirm mail content';
 $string['cancelmailsubject'] = 'Cancel mail subject';
 $string['cancelmailcontent'] = 'Cancel mail sontent';
-$string['confirmmailcontent_desc'] = 'Please use special marks designated email content replaced.<br>{firstname}:Registration name; {content}:Course name';
-$string['cancelmailcontent_desc'] = 'Please use special marks designated email content replaced.<br>{firstname}:Registration name; {content}:Course name';
+$string['confirmmailcontent_desc'] = 'Please use special marks designated email content replaced.<br>{firstname}:Registration name; {content}:Course name;{lastname}:The last name of the user;{username}:Registration name';
+$string['cancelmailcontent_desc'] = 'Please use special marks designated email content replaced.<br>{firstname}:Registration name; {content}:Course name;{lastname}:The last name of the user;{username}:Registration name';
 
 $string['confirmusers'] = 'Enrol Confirm';
 

lib.php

@@ -30,7 +30,7 @@ class enrol_apply_plugin extends enrol_plugin {
 	}
 
 	public function get_newinstance_link($courseid) {
-		$context = get_context_instance(CONTEXT_COURSE, $courseid, MUST_EXIST);
+		$context =  context_course::instance($courseid, MUST_EXIST);
 
 		if (!has_capability('moodle/course:enrolconfig', $context) or !has_capability('enrol/manual:config', $context)) {
 			return NULL;
@@ -115,7 +115,7 @@ class enrol_apply_plugin extends enrol_plugin {
 		if ($instance->enrol !== 'apply') {
 			throw new coding_exception('invalid enrol instance!');
 		}
-		$context = get_context_instance(CONTEXT_COURSE, $instance->courseid);
+		$context =  context_course::instance($instance->courseid);
 
 		$icons = array();
 
@@ -203,7 +203,7 @@ function sendCancelMail($info){
 	global $CFG;
 	$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));
+	$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 = get_admin();
@@ -215,7 +215,7 @@ function sendConfirmMail($info){
 	global $CFG;
 	$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));
+	$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 = get_admin();

manage.php

@@ -15,7 +15,7 @@ require_login();
 require_capability('enrol/apply:manage', context_system::instance());
 
 $site = get_site ();
-$systemcontext = get_context_instance ( CONTEXT_SYSTEM );
+$systemcontext = context_system::instance();
 
 $PAGE->set_url ( '/enrol/manage.php');
 $PAGE->set_context($systemcontext);

unenroluser.php

@@ -50,7 +50,7 @@ if ($course->id == SITEID) {
 // Obviously
 require_login($course);
 // Make sure the user can unenrol self enrolled users.
-require_capability("enrol/self:unenrol", get_context_instance(CONTEXT_COURSE, $course->id));
+require_capability("enrol/self:unenrol", context_course::instance($course->id));
 
 // Get the enrolment manager for this course
 $manager = new course_enrolment_manager($PAGE, $course, $filter);

version.php

@@ -18,7 +18,7 @@
  */
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version  = 2014072000;
+$plugin->version  = 2014091000;
 $plugin->requires = 2011080100;
 $plugin->maturity = MATURITY_STABLE;
-$plugin->release = 'Course Enrol Apply Plugin Version 1.3 (build 2014072000)';
+$plugin->release = 'Course Enrol Apply Plugin Version 1.3.1 (build 2014091000)';