diff --git a/apps/user_ldap/ajax/setConfiguration.php b/apps/user_ldap/ajax/setConfiguration.php index 8e6994d8f94..9311d72d21f 100644 --- a/apps/user_ldap/ajax/setConfiguration.php +++ b/apps/user_ldap/ajax/setConfiguration.php @@ -33,7 +33,7 @@ $prefix = (string)$_POST['ldap_serverconfig_chooser']; // only legacy checkboxes (Advanced and Expert tab) need to be handled here, // the Wizard-like tabs handle it on their own $chkboxes = array('ldap_configuration_active', 'ldap_override_main_server', - 'ldap_nocase', 'ldap_turn_off_cert_check'); + 'ldap_turn_off_cert_check'); foreach($chkboxes as $boxid) { if(!isset($_POST[$boxid])) { $_POST[$boxid] = 0; diff --git a/apps/user_ldap/appinfo/update.php b/apps/user_ldap/appinfo/update.php index b904bce072e..4907db0cdae 100644 --- a/apps/user_ldap/appinfo/update.php +++ b/apps/user_ldap/appinfo/update.php @@ -24,3 +24,13 @@ $installedVersion = \OC::$server->getConfig()->getAppValue('user_ldap', 'install if (version_compare($installedVersion, '0.6.1', '<')) { \OC::$server->getConfig()->setAppValue('user_ldap', 'enforce_home_folder_naming_rule', false); } + +if(version_compare($installedVersion, '0.6.2', '<')) { + // Remove LDAP case insensitive setting from DB as it is no longer beeing used. + $helper = new \OCA\user_ldap\lib\Helper(); + $prefixes = $helper->getServerConfigurationPrefixes(); + + foreach($prefixes as $prefix) { + \OC::$server->getConfig()->deleteAppValue('user_ldap', $prefix . "ldap_nocase"); + } +} diff --git a/apps/user_ldap/appinfo/version b/apps/user_ldap/appinfo/version index ee6cdce3c29..b6160487433 100644 --- a/apps/user_ldap/appinfo/version +++ b/apps/user_ldap/appinfo/version @@ -1 +1 @@ -0.6.1 +0.6.2 diff --git a/apps/user_ldap/js/wizard/wizardTabAdvanced.js b/apps/user_ldap/js/wizard/wizardTabAdvanced.js index a27ec87b7c4..7367bfe87ae 100644 --- a/apps/user_ldap/js/wizard/wizardTabAdvanced.js +++ b/apps/user_ldap/js/wizard/wizardTabAdvanced.js @@ -41,10 +41,6 @@ OCA = OCA || {}; $element: $('#ldap_override_main_server'), setMethod: 'setOverrideMainServerState' }, - ldap_nocase: { - $element: $('#ldap_nocase'), - setMethod: 'setNoCase' - }, ldap_turn_off_cert_check: { $element: $('#ldap_turn_off_cert_check'), setMethod: 'setCertCheckDisabled' @@ -165,16 +161,6 @@ OCA = OCA || {}; ); }, - /** - * whether the server is case insensitive. This setting does not play - * a role anymore (probably never had). - * - * @param {string} noCase contains an int - */ - setNoCase: function(noCase) { - this.setElementValue(this.managedItems.ldap_nocase.$element, noCase); - }, - /** * sets whether the SSL/TLS certification check shout be disabled * diff --git a/apps/user_ldap/lib/configuration.php b/apps/user_ldap/lib/configuration.php index 0af819ff66f..1cbe45a82c2 100644 --- a/apps/user_ldap/lib/configuration.php +++ b/apps/user_ldap/lib/configuration.php @@ -43,7 +43,6 @@ class Configuration { 'ldapAgentName' => null, 'ldapAgentPassword' => null, 'ldapTLS' => null, - 'ldapNoCase' => null, 'turnOffCertCheck' => null, 'ldapIgnoreNamingRules' => null, 'ldapUserDisplayName' => null, @@ -379,7 +378,6 @@ class Configuration { 'ldap_display_name' => 'displayName', 'ldap_group_display_name' => 'cn', 'ldap_tls' => 0, - 'ldap_nocase' => 0, 'ldap_quota_def' => '', 'ldap_quota_attr' => '', 'ldap_email_attr' => '', @@ -436,7 +434,6 @@ class Configuration { 'ldap_display_name' => 'ldapUserDisplayName', 'ldap_group_display_name' => 'ldapGroupDisplayName', 'ldap_tls' => 'ldapTLS', - 'ldap_nocase' => 'ldapNoCase', 'ldap_quota_def' => 'ldapQuotaDefault', 'ldap_quota_attr' => 'ldapQuotaAttribute', 'ldap_email_attr' => 'ldapEmailAttribute', diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php index f40eba005d8..88900e22bf7 100644 --- a/apps/user_ldap/templates/settings.php +++ b/apps/user_ldap/templates/settings.php @@ -78,7 +78,6 @@ style('user_ldap', 'settings');
->