[multienrol]More changes to the internal->manual transition

diff --git a/admin/enrol.php b/admin/enrol.php
index 27ec207a6ab9ded8bda1083f2e84790a68866209..1330da93ddaccf111a7a841bd1850ec406de24f9 100644 (file)
--- a/admin/enrol.php
+++ b/admin/enrol.php
@@ -31,11 +31,11 @@
         if (empty($frm->default)) {
             $frm->default = '';
         }
-        if ($frm->default && $frm->default != 'internal' && !in_array($frm->default, $frm->enable)) {
+        if ($frm->default && $frm->default != 'manual' && !in_array($frm->default, $frm->enable)) {
             $frm->enable[] = $frm->default;
         }
         asort($frm->enable);
-        $frm->enable = array_merge(array('internal'), $frm->enable); // make sure internal plugin is called first
+        $frm->enable = array_merge(array('manual'), $frm->enable); // make sure manual plugin is called first
         set_config('enrol_plugins_enabled', implode(',', $frm->enable));
         set_config('enrol', $frm->default);
         redirect("enrol.php?sesskey=$USER->sesskey", get_string("changessaved"), 1);
@@ -76,7 +76,7 @@
         if (stristr($CFG->enrol_plugins_enabled, $module) !== false) {
             $enable .= ' checked="checked"';
         }
-        if ($module == 'internal') {
+        if ($module == 'manual') {
             $enable .= ' disabled="disabled"';
         }
         $enable .= ' />';

diff --git a/course/edit.html b/course/edit.html
index 8bfdde1eb4071f283f9bcdd876bea8f558c8ae6b..dd50389e36d1cc7817520f7c74dff6aa0ca1f021 100644 (file)
--- a/course/edit.html
+++ b/course/edit.html
@@ -271,7 +271,7 @@
     </td>
 </tr>
 <?php
-    if (method_exists(enrolment_factory::factory($course->enrol), 'print_entry') && $course->enrol != 'internal') {
+    if (method_exists(enrolment_factory::factory($course->enrol), 'print_entry') && $course->enrol != 'manual') {
 ?>
 <tr valign="top">
     <td align="right"><?php  print_string("cost") ?>:</td>

diff --git a/lib/db/mysql.php b/lib/db/mysql.php
index 8fcbbda755cc6b12bcaba4efe8d468b1cb83a0b0..9f0f535939a6d93eaed6d77d558b012c4a6f72b2 100644 (file)
--- a/lib/db/mysql.php
+++ b/lib/db/mysql.php
@@ -1673,6 +1673,11 @@ function main_upgrade($oldversion=0) {
         execute_sql("UPDATE {$CFG->prefix}user_teachers SET enrol='manual' WHERE enrol=''");
     }
 
+    if ($oldversion < 2005103101) { // rename internal to manual
+        set_config('enrol_plugins_enabled', str_replace('internal', 'manual', $CFG->enrol_plugins_enabled));
+        set_config('enrol', str_replace('internal', 'manual', $CFG->enrol));
+    }
+
     return $result;
 }
 

diff --git a/lib/db/postgres7.php b/lib/db/postgres7.php
index d123db91f84ae837fee47e96d5035df9c346b7d9..c3addef052bac6a28032fbb9110cc0b58c2767da 100644 (file)
--- a/lib/db/postgres7.php
+++ b/lib/db/postgres7.php
@@ -1416,6 +1416,11 @@ function main_upgrade($oldversion=0) {
         execute_sql("UPDATE {$CFG->prefix}user_teachers SET enrol='manual' WHERE enrol=''");
     }
 
+    if ($oldversion < 2005103101) { // rename internal to manual
+        set_config('enrol_plugins_enabled', str_replace('internal', 'manual', $CFG->enrol_plugins_enabled));
+        set_config('enrol', str_replace('internal', 'manual', $CFG->enrol));
+    }
+
     return $result;
 }