From ca742a2137aa9aed1609dcfa9dd4f92de468805e Mon Sep 17 00:00:00 2001 From: Paul Holden Date: Mon, 17 Aug 2020 20:52:51 +0100 Subject: [PATCH] MDL-69492 auth_cas: normalise member distinguished name config. --- auth/cas/db/upgrade.php | 8 ++++++++ auth/cas/settings.php | 4 ++-- auth/cas/version.php | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/auth/cas/db/upgrade.php b/auth/cas/db/upgrade.php index 34f53640959..1190c233865 100644 --- a/auth/cas/db/upgrade.php +++ b/auth/cas/db/upgrade.php @@ -47,5 +47,13 @@ function xmldb_auth_cas_upgrade($oldversion) { // Automatically generated Moodle v3.9.0 release upgrade line. // Put any upgrade step following this. + if ($oldversion < 2021052501) { + // Normalize the memberattribute_isdn plugin config. + set_config('memberattribute_isdn', + !empty(get_config('auth_cas', 'memberattribute_isdn')), 'auth_cas'); + + upgrade_plugin_savepoint(true, 2021052501, 'auth', 'cas'); + } + return true; } diff --git a/auth/cas/settings.php b/auth/cas/settings.php index 5434984b0c2..50f6733f7c1 100644 --- a/auth/cas/settings.php +++ b/auth/cas/settings.php @@ -239,9 +239,9 @@ if ($ADMIN->fulltree) { get_string('auth_ldap_memberattribute', 'auth_ldap'), '', PARAM_RAW)); // Member attribute uses dn. - $settings->add(new admin_setting_configtext('auth_cas/memberattribute_isdn', + $settings->add(new admin_setting_configselect('auth_cas/memberattribute_isdn', get_string('auth_ldap_memberattribute_isdn_key', 'auth_ldap'), - get_string('auth_ldap_memberattribute_isdn', 'auth_ldap'), '', PARAM_RAW)); + get_string('auth_ldap_memberattribute_isdn', 'auth_ldap'), 0, $yesno)); // Object class. $settings->add(new admin_setting_configtext('auth_cas/objectclass', diff --git a/auth/cas/version.php b/auth/cas/version.php index eb0c3b9b08c..4e2fbacd534 100644 --- a/auth/cas/version.php +++ b/auth/cas/version.php @@ -26,7 +26,7 @@ defined('MOODLE_INTERNAL') || die(); -$plugin->version = 2021052500; // The current plugin version (Date: YYYYMMDDXX) +$plugin->version = 2021052501; // The current plugin version (Date: YYYYMMDDXX) $plugin->requires = 2021052500; // Requires this Moodle version $plugin->component = 'auth_cas'; // Full name of the plugin (used for diagnostics)