From 16dbf426958f0c05afe6474561911d4ed446bfe4 Mon Sep 17 00:00:00 2001 From: ethem Date: Fri, 22 Sep 2006 12:18:58 +0000 Subject: [PATCH] Changed deprecated enrol_student() function to enrol_into_course(). --- enrol/authorize/index.php | 2 +- enrol/authorize/locallib.php | 26 +++++++------------------- 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/enrol/authorize/index.php b/enrol/authorize/index.php index 643b1f002e..894e3315be 100644 --- a/enrol/authorize/index.php +++ b/enrol/authorize/index.php @@ -16,7 +16,7 @@ error("Guests cannot use this page."); } - if (!$course = get_record('course', 'id', $courseid)) { + if (! $course = get_record('course', 'id', $courseid)) { error('Could not find that course'); } diff --git a/enrol/authorize/locallib.php b/enrol/authorize/locallib.php index 608cc9e94c..d26c866ee3 100644 --- a/enrol/authorize/locallib.php +++ b/enrol/authorize/locallib.php @@ -171,7 +171,7 @@ function authorize_print_order_details($orderno) $table->size = array('30%', '70%'); $table->align = array('right', 'left'); - $sql = "SELECT e.*, c.shortname, c.enrolperiod FROM {$CFG->prefix}enrol_authorize e " . + $sql = "SELECT e.*, c.shortname FROM {$CFG->prefix}enrol_authorize e " . "INNER JOIN {$CFG->prefix}course c ON c.id = e.courseid " . "WHERE e.id = '$orderno'"; @@ -181,7 +181,8 @@ function authorize_print_order_details($orderno) return; } - $coursecontext = get_context_instance(CONTEXT_COURSE, $order->courseid); + $course = get_record('course', 'id', $order->courseid); + $coursecontext = get_context_instance(CONTEXT_COURSE, $course->id); if ($USER->id != $order->userid) { // Current user viewing someone else's order if (! has_capability('enrol/authorize:managepayments', $coursecontext)) { @@ -240,26 +241,13 @@ function authorize_print_order_details($orderno) } else { if (empty($CFG->an_test)) { - $timestart = $timeend = 0; - if ($order->enrolperiod) { - $timestart = time(); // early start - $timeend = $order->settletime + $order->enrolperiod; // lately end - } - if (enrol_student($order->userid, $order->courseid, $timestart, $timeend, 'manual')) { - $user = get_record('user', 'id', $order->userid); - $teacher = get_teacher($order->courseid); - $a = new stdClass; - $a->coursename = $order->shortname; - $a->profileurl = "$CFG->wwwroot/user/view.php?id=$user->id"; - email_to_user($user, - $teacher, - get_string("enrolmentnew", '', $order->shortname), - get_string('welcometocoursetext', '', $a)); + $user = get_record('user', 'id', $order->userid); + if (enrol_into_course($course, $user, 'manual')) { redirect("index.php?order=$orderno"); } else { - $table->data[] = array("$strs->error:", - "Error while trying to enrol ".fullname($user)." in '$order->shortname'"); + $table->data[] = array("$strs->error:", + "Error while trying to enrol ".fullname($user)." in '$order->shortname'"); } } else { -- 2.39.5