Skip to content
Permalink
Browse files

[multienrol]Merged Ethem Evlice's changes to authorize.net

Minimal changes -- with this, the tip of MOODLE_16_MULTIENROL is fully merged.
  • Loading branch information...
martinlanghoff
martinlanghoff committed Mar 9, 2006
1 parent ed8365d commit aa190ccd1e846b6c6c65fa6839ef346a03d1323d
Showing with 10 additions and 13 deletions.
  1. +10 −13 enrol/authorize/enrol.php
@@ -36,10 +36,10 @@ function print_entry($course)
{
global $CFG, $USER, $form;
if ($this->zero_cost($course) || isguest()) { // No money for guests ;)
$internal = enrolment_factory::factory('internal');
$internal->print_entry($course);
return;
if ($this->zero_cost($course) || isguest()) {
$manual = enrolment_factory::factory('manual');
$manual->print_entry($course);
return; // No money for guests ;)
}
$this->prevent_double_paid($course);
@@ -64,7 +64,7 @@ function print_entry($course)
if ($course->password) {
print_simple_box(get_string('choosemethod', 'enrol_authorize'), 'center');
$password = '';
include $CFG->dirroot.'/enrol/internal/enrol.html';
include $CFG->dirroot.'/enrol/manual/enrol.html';
}
print_simple_box_start('center');
@@ -83,9 +83,9 @@ function print_entry($course)
* @access public
*/
function check_entry($form, $course) {
if ($this->zero_cost($course) || isguest() || (!empty($form->password))) {
$internal = enrolment_factory::factory('internal');
$internal->print_entry($course);
if ((!empty($form->password)) || isguest() || $this->zero_cost($course)) {
$manual = enrolment_factory::factory('manual');
$manual->check_entry($form, $course);
} elseif ((!empty($form->ccsubmit)) && $this->validate_enrol_form($form)) {
$this->cc_submit($form, $course);
}
@@ -373,9 +373,8 @@ function get_course_cost($course)
*/
function get_access_icons($course) {
$internal = enrolment_factory::factory('internal');
$str = $internal->get_access_icons($course);
$manual = enrolment_factory::factory('manual');
$str = $manual->get_access_icons($course);
$curcost = $this->get_course_cost($course);
if (abs($curcost['cost']) > 0.00) {
@@ -574,8 +573,6 @@ function check_openssl_loaded() {
function cron()
{
global $CFG;
$internal = enrolment_factory::factory('internal');
$internal->cron();
require_once $CFG->dirroot.'/enrol/authorize/action.php';
$oneday = 86400;

0 comments on commit aa190cc

Please sign in to comment.
You can’t perform that action at this time.