From b91186c503621b3c6beed3f6950922d8155d8ec1 Mon Sep 17 00:00:00 2001 From: Lennart Rosam Date: Wed, 12 Aug 2015 22:18:28 +0200 Subject: [PATCH 1/5] Fix 17677 --- apps/user_ldap/ajax/setConfiguration.php | 2 +- apps/user_ldap/lib/configuration.php | 3 --- apps/user_ldap/templates/settings.php | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) 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/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');

-

>


From 45fba849a9ec4c0ae0673d9314d5c941def6460e Mon Sep 17 00:00:00 2001 From: Lennart Rosam Date: Wed, 19 Aug 2015 17:54:16 +0200 Subject: [PATCH 2/5] Remove another occurance of ldap_nocase --- apps/user_ldap/js/wizard/wizardTabAdvanced.js | 14 -------------- 1 file changed, 14 deletions(-) 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 * From fdf1a941b760582c43015204add732d37cf94e0c Mon Sep 17 00:00:00 2001 From: Lennart Rosam Date: Wed, 19 Aug 2015 17:55:21 +0200 Subject: [PATCH 3/5] Add database update routine and bump version to 0.6.2 --- apps/user_ldap/appinfo/update.php | 15 +++++++++++++++ apps/user_ldap/appinfo/version | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/apps/user_ldap/appinfo/update.php b/apps/user_ldap/appinfo/update.php index b904bce072e..f369c5d0676 100644 --- a/apps/user_ldap/appinfo/update.php +++ b/apps/user_ldap/appinfo/update.php @@ -24,3 +24,18 @@ $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(); + + // Add empty prefix if only one serverconfig exists + if(count($prefixes) === 0) { + $prefixes[] = ""; + } + + 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 From 588fae54cb2410071e0f0933d6620b62c60edad0 Mon Sep 17 00:00:00 2001 From: Lennart Rosam Date: Fri, 21 Aug 2015 22:50:28 +0200 Subject: [PATCH 4/5] Remove if-block as the helper does return the empty prefix --- apps/user_ldap/appinfo/update.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/apps/user_ldap/appinfo/update.php b/apps/user_ldap/appinfo/update.php index f369c5d0676..410b8408f84 100644 --- a/apps/user_ldap/appinfo/update.php +++ b/apps/user_ldap/appinfo/update.php @@ -30,11 +30,6 @@ if(version_compare($installedVersion, '0.6.2', '<')) { $helper = new \OCA\user_ldap\lib\Helper(); $prefixes = $helper->getServerConfigurationPrefixes(); - // Add empty prefix if only one serverconfig exists - if(count($prefixes) === 0) { - $prefixes[] = ""; - } - foreach($prefixes as $prefix) { \OC::$server->getConfig()->deleteAppValue('user_ldap', $prefix . "ldap_nocase"); } From 4b04412db3e0b7e50388a3ade1f8c33cb3f0232a Mon Sep 17 00:00:00 2001 From: Lennart Rosam Date: Sat, 22 Aug 2015 01:27:32 +0200 Subject: [PATCH 5/5] Spaces -> tabs --- apps/user_ldap/appinfo/update.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/user_ldap/appinfo/update.php b/apps/user_ldap/appinfo/update.php index 410b8408f84..4907db0cdae 100644 --- a/apps/user_ldap/appinfo/update.php +++ b/apps/user_ldap/appinfo/update.php @@ -26,11 +26,11 @@ if (version_compare($installedVersion, '0.6.1', '<')) { } 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(); + // 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"); - } + foreach($prefixes as $prefix) { + \OC::$server->getConfig()->deleteAppValue('user_ldap', $prefix . "ldap_nocase"); + } }