mirror of
https://github.com/moodle/moodle.git
synced 2025-08-04 16:36:37 +02:00
Merged from MOODLE_16_STABLE.
This commit is contained in:
parent
5e2194494b
commit
11fffc6059
2 changed files with 17 additions and 11 deletions
|
@ -1,5 +1,6 @@
|
||||||
<?php // $Id$
|
<?php // $Id$
|
||||||
|
|
||||||
|
$this->prevent_double_paid($course);
|
||||||
$formvars = array('password', 'ccaddress', 'cccity', 'ccstate', 'cccountry', 'cczip',
|
$formvars = array('password', 'ccaddress', 'cccity', 'ccstate', 'cccountry', 'cczip',
|
||||||
'ccfirstname', 'cclastname', 'cc', 'ccexpiremm', 'ccexpireyyyy', 'cctype', 'cvv');
|
'ccfirstname', 'cclastname', 'cc', 'ccexpiremm', 'ccexpireyyyy', 'cctype', 'cvv');
|
||||||
|
|
||||||
|
|
|
@ -100,6 +100,16 @@ class enrolment_plugin_authorize
|
||||||
function print_entry($course) {
|
function print_entry($course) {
|
||||||
global $CFG, $USER, $form;
|
global $CFG, $USER, $form;
|
||||||
|
|
||||||
|
$zerocost = $this->zero_cost($course);
|
||||||
|
if ($zerocost) {
|
||||||
|
$manual = enrolment_factory::factory('manual');
|
||||||
|
if (!empty($this->errormsg)) {
|
||||||
|
$manual->errormsg = $this->errormsg;
|
||||||
|
}
|
||||||
|
$manual->print_entry($course);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
httpsrequired();
|
httpsrequired();
|
||||||
|
|
||||||
if (empty($_SERVER['HTTPS']) || $_SERVER['HTTPS'] == 'off') {
|
if (empty($_SERVER['HTTPS']) || $_SERVER['HTTPS'] == 'off') {
|
||||||
|
@ -114,31 +124,26 @@ class enrolment_plugin_authorize
|
||||||
|
|
||||||
$strcourses = get_string('courses');
|
$strcourses = get_string('courses');
|
||||||
$strloginto = get_string('loginto', '', $course->shortname);
|
$strloginto = get_string('loginto', '', $course->shortname);
|
||||||
$zerocost = $this->zero_cost($course);
|
|
||||||
|
|
||||||
print_header($strloginto, $course->fullname, "<a href=\"$CFG->wwwroot/course/\">$strcourses</a> -> $strloginto");
|
print_header($strloginto, $course->fullname, "<a href=\"$CFG->wwwroot/course/\">$strcourses</a> -> $strloginto");
|
||||||
print_course($course, '80%');
|
print_course($course, '80%');
|
||||||
|
|
||||||
if ($course->password && !$zerocost) {
|
if ($course->password) {
|
||||||
print_heading(get_string('choosemethod', 'enrol_authorize'), 'center');
|
print_heading(get_string('choosemethod', 'enrol_authorize'), 'center');
|
||||||
}
|
}
|
||||||
|
|
||||||
print_simple_box_start('center');
|
if (isguest()) {
|
||||||
if ($zerocost){
|
|
||||||
echo '<div align="center"><p>'.get_string('nocostyet', 'enrol_authorize').'</p></div>';
|
|
||||||
} else if (isguest()) {
|
|
||||||
$curcost = $this->get_course_cost($course);
|
$curcost = $this->get_course_cost($course);
|
||||||
echo '<div align="center"><p>'.get_string('paymentrequired').'</p>';
|
echo '<div align="center"><p>'.get_string('paymentrequired').'</p>';
|
||||||
echo '<p><b>'.get_string('cost').": $curcost[currency] $curcost[cost]".'</b></p>';
|
echo '<p><b>'.get_string('cost').": $curcost[currency] $curcost[cost]".'</b></p>';
|
||||||
echo '<p><a href="'.$CFG->httpswwwroot.'/login/">'.get_string('loginsite').'</a></p>';
|
echo '<p><a href="'.$CFG->httpswwwroot.'/login/">'.get_string('loginsite').'</a></p>';
|
||||||
echo '</div>';
|
echo '</div>';
|
||||||
} else {
|
} else {
|
||||||
$this->prevent_double_paid($course);
|
print_simple_box_start('center');
|
||||||
include($CFG->dirroot.'/enrol/authorize/enrol.html');
|
include($CFG->dirroot.'/enrol/authorize/enrol.html');
|
||||||
|
print_simple_box_end();
|
||||||
}
|
}
|
||||||
|
|
||||||
print_simple_box_end();
|
|
||||||
|
|
||||||
if ($course->password) {
|
if ($course->password) {
|
||||||
$password = '';
|
$password = '';
|
||||||
$teacher = get_teacher($course->id);
|
$teacher = get_teacher($course->id);
|
||||||
|
@ -157,10 +162,10 @@ class enrolment_plugin_authorize
|
||||||
* @access public
|
* @access public
|
||||||
*/
|
*/
|
||||||
function check_entry($form, $course) {
|
function check_entry($form, $course) {
|
||||||
if (!empty($course->password) and !empty($form->password)) {
|
if ($this->zero_cost($course) or (!empty($course->password) and !empty($form->password))) {
|
||||||
$manual = enrolment_factory::factory('manual');
|
$manual = enrolment_factory::factory('manual');
|
||||||
$manual->check_entry($form, $course);
|
$manual->check_entry($form, $course);
|
||||||
if (isset($manual->errormsg)) {
|
if (!empty($manual->errormsg)) {
|
||||||
$this->errormsg = $manual->errormsg;
|
$this->errormsg = $manual->errormsg;
|
||||||
}
|
}
|
||||||
} elseif ((!empty($form->ccsubmit)) and $this->validate_enrol_form($form)) {
|
} elseif ((!empty($form->ccsubmit)) and $this->validate_enrol_form($form)) {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue