From: ethem <ethem>
Date: Thu, 29 Jun 2006 10:38:34 +0000 (+0000)
Subject: Interactive plugins (authorize and paypal ) must use 'manual'.
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=c1f6386c4772feb631c0e65d3bf8f293a22aadb1;p=moodle.git

Interactive plugins (authorize and paypal ) must use 'manual'.
Some patches must be applied to lib/db.
http://moodle.org/bugs/bug.php?op=show&bugid=5941
Look: version.patch, lib_db.patch

Eloy, your question about enrol fields for interactive plugins were solved.
Now, we sure we never use authorize and paypal field for backup and restore.
Because manual is active and cannot be disabled when restoring.
Bug #5358 - Add support for enrol systems in backup/restore
http://moodle.org/bugs/bug.php?op=show&bugid=5358&pos=0

Merged from 16 stable.
---

diff --git a/enrol/authorize/enrol.php b/enrol/authorize/enrol.php
index 15ed30bcab..2d633fe7db 100755
--- a/enrol/authorize/enrol.php
+++ b/enrol/authorize/enrol.php
@@ -220,7 +220,7 @@ class enrolment_plugin_authorize
             else {
                 $timestart = $timenow;
                 $timeend = $timestart + (3600 * 24); // just enrol for 1 days :)
-                enrol_student($USER->id, $course->id, $timestart, $timeend, 'authorize');
+                enrol_student($USER->id, $course->id, $timestart, $timeend, 'manual');
                 redirect("$CFG->wwwroot/course/view.php?id=$course->id");
             }
             return;
@@ -270,7 +270,7 @@ class enrolment_plugin_authorize
             $timestart = $timeend = 0;
         }
 
-        if (enrol_student($USER->id, $course->id, $timestart, $timeend, 'authorize')) {
+        if (enrol_student($USER->id, $course->id, $timestart, $timeend, 'manual')) {
             $teacher = get_teacher($course->id);
             if (!empty($CFG->enrol_mailstudents)) {
                 $a = new stdClass;
@@ -762,7 +762,7 @@ class enrolment_plugin_authorize
                     $timestart = $timenow;
                     $timeend = $order->settletime + $order->enrolperiod;
                 }
-                if (enrol_student($order->userid, $order->courseid, $timestart, $timeend, 'authorize')) {
+                if (enrol_student($order->userid, $order->courseid, $timestart, $timeend, 'manual')) {
                     $this->log .= "User($order->userid) has been enrolled to course($order->courseid).\n";
                     if (!empty($CFG->enrol_mailstudents)) {
                         $sendem[] = $order->id;
diff --git a/enrol/authorize/locallib.php b/enrol/authorize/locallib.php
index 6b34ec9c2f..411b42622f 100644
--- a/enrol/authorize/locallib.php
+++ b/enrol/authorize/locallib.php
@@ -235,7 +235,7 @@ function authorize_print_order_details($orderno)
                         $timestart = time(); // early start
                         $timeend = $order->settletime + $order->enrolperiod; // lately end
                     }
-                    if (enrol_student($order->userid, $order->courseid, $timestart, $timeend, 'authorize')) {
+                    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;