auth/cas MDL-23371 Still some bits missing from setting name convertion.

moodle · Jul 26, 2010 · 1298e78 · 1298e78
1 parent a67f829
commit 1298e78
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/auth/cas/auth.php b/auth/cas/auth.php
@@ -274,8 +274,8 @@ function process_config($config) {
         if (!isset($config->bind_pw)) {
             $config->bind_pw = '';
         }
-        if (!isset($config->ldapversion)) {
-            $config->ldapversion = '3';
+        if (!isset($config->ldap_version)) {
+            $config->ldap_version = '3';
         }
         if (!isset($config->objectclass)) {
             $config->objectclass = '';
@@ -317,7 +317,7 @@ function process_config($config) {
         set_config('opt_deref', $config->opt_deref, $this->pluginconfig);
         set_config('bind_dn', trim($config->bind_dn), $this->pluginconfig);
         set_config('bind_pw', $config->bind_pw, $this->pluginconfig);
-        set_config('ldapversion', $config->ldapversion, $this->pluginconfig);
+        set_config('ldap_version', $config->ldap_version, $this->pluginconfig);
         set_config('objectclass', trim($config->objectclass), $this->pluginconfig);
         set_config('memberattribute', moodle_strtolower(trim($config->memberattribute)), $this->pluginconfig);
         set_config('memberattribute_isdn', $config->memberattribute_isdn, $this->pluginconfig);

diff --git a/auth/cas/config.html b/auth/cas/config.html
@@ -56,8 +56,8 @@
 if (!isset($config->bind_pw)) {
     $config->bind_pw = '';
 }
-if (!isset($config->ldapversion)) {
-    $config->ldapversion = '3';
+if (!isset($config->ldap_version)) {
+    $config->ldap_version = '3';
 }
 if (!isset($config->objectclass)) {
     $config->objectclass = '';
@@ -200,8 +200,8 @@ <h4><?php print_string('auth_ldap_server_settings', 'auth_ldap') ?></h4>
              $versions = array();
              $versions[2] = '2';
              $versions[3] = '3';
-             echo html_writer::select($versions, 'ldapversion', $config->ldapversion, false);
-             if (isset($err['ldapversion'])) { echo $OUTPUT->error_text($err['ldapversion']); }
+             echo html_writer::select($versions, 'ldap_version', $config->ldap_version, false);
+             if (isset($err['ldap_version'])) { echo $OUTPUT->error_text($err['ldap_version']); }
         ?>
     </td>
     <td>