Permalink
Browse files

Merged from MOODLE_16_STABLE.

  • Loading branch information...
ethem
ethem committed Jun 29, 2006
1 parent 5e21944 commit 11fffc6059df96c24f98041c44fc0ebd934a9f5e
Showing with 17 additions and 11 deletions.
  1. +1 −0 enrol/authorize/enrol.html
  2. +16 −11 enrol/authorize/enrol.php
@@ -1,5 +1,6 @@
<?php // $Id$
+$this->prevent_double_paid($course);
$formvars = array('password', 'ccaddress', 'cccity', 'ccstate', 'cccountry', 'cczip',
'ccfirstname', 'cclastname', 'cc', 'ccexpiremm', 'ccexpireyyyy', 'cctype', 'cvv');
View
@@ -100,6 +100,16 @@ function get_teacher_courses(&$user) {
function print_entry($course) {
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();
if (empty($_SERVER['HTTPS']) || $_SERVER['HTTPS'] == 'off') {
@@ -114,31 +124,26 @@ function print_entry($course) {
$strcourses = get_string('courses');
$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_course($course, '80%');
- if ($course->password && !$zerocost) {
+ if ($course->password) {
print_heading(get_string('choosemethod', 'enrol_authorize'), 'center');
}
- print_simple_box_start('center');
- if ($zerocost){
- echo '<div align="center"><p>'.get_string('nocostyet', 'enrol_authorize').'</p></div>';
- } else if (isguest()) {
+ if (isguest()) {
$curcost = $this->get_course_cost($course);
echo '<div align="center"><p>'.get_string('paymentrequired').'</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 '</div>';
} else {
- $this->prevent_double_paid($course);
+ print_simple_box_start('center');
include($CFG->dirroot.'/enrol/authorize/enrol.html');
+ print_simple_box_end();
}
- print_simple_box_end();
-
if ($course->password) {
$password = '';
$teacher = get_teacher($course->id);
@@ -157,10 +162,10 @@ function print_entry($course) {
* @access public
*/
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->check_entry($form, $course);
- if (isset($manual->errormsg)) {
+ if (!empty($manual->errormsg)) {
$this->errormsg = $manual->errormsg;
}
} elseif ((!empty($form->ccsubmit)) and $this->validate_enrol_form($form)) {

0 comments on commit 11fffc6

Please sign in to comment.