From 29f853322305362a53724899b0f56ddacc46d766 Mon Sep 17 00:00:00 2001 From: martinlanghoff Date: Thu, 9 Mar 2006 03:46:53 +0000 Subject: [PATCH] [multienrol]More changes to the internal->manual transition --- admin/enrol.php | 6 +++--- course/edit.html | 2 +- lib/db/mysql.php | 5 +++++ lib/db/postgres7.php | 5 +++++ 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/admin/enrol.php b/admin/enrol.php index 27ec207a6a..1330da93dd 100644 --- 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 8bfdde1eb4..dd50389e36 100644 --- a/course/edit.html +++ b/course/edit.html @@ -271,7 +271,7 @@ enrol), 'print_entry') && $course->enrol != 'internal') { + if (method_exists(enrolment_factory::factory($course->enrol), 'print_entry') && $course->enrol != 'manual') { ?> : diff --git a/lib/db/mysql.php b/lib/db/mysql.php index 8fcbbda755..9f0f535939 100644 --- 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 d123db91f8..c3addef052 100644 --- 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; } -- 2.39.5