diff options
| author | blizzz <blizzz@owncloud.com> | 2015-05-05 15:17:13 +0200 |
|---|---|---|
| committer | blizzz <blizzz@owncloud.com> | 2015-05-05 15:17:13 +0200 |
| commit | 67836995011c2506e67e49e2e1857b0003f643fc (patch) | |
| tree | 172e87020684c8616664ad634b3f9cba2025c8ec | |
| parent | 2aaafc134cf634c301b4258066012b3166247ef5 (diff) | |
| parent | 0e7fd82e89129a1ce2524d9f520b0aeb697563a3 (diff) | |
| download | nextcloud-server-67836995011c2506e67e49e2e1857b0003f643fc.tar.gz nextcloud-server-67836995011c2506e67e49e2e1857b0003f643fc.zip | |
Merge pull request #16069 from owncloud/fix-15933
Fix: user login filter does not take username into account
| -rw-r--r-- | apps/user_ldap/ajax/getNewServerConfigPrefix.php | 1 | ||||
| -rw-r--r-- | apps/user_ldap/js/wizard/wizardTabElementary.js | 1 | ||||
| -rw-r--r-- | apps/user_ldap/lib/wizard.php | 1 |
3 files changed, 1 insertions, 2 deletions
diff --git a/apps/user_ldap/ajax/getNewServerConfigPrefix.php b/apps/user_ldap/ajax/getNewServerConfigPrefix.php index aa97b181846..897e4a9924f 100644 --- a/apps/user_ldap/ajax/getNewServerConfigPrefix.php +++ b/apps/user_ldap/ajax/getNewServerConfigPrefix.php @@ -41,6 +41,7 @@ if(isset($_POST['copyConfig'])) { $newConfig->setConfiguration($originalConfig->getConfiguration()); } else { $configuration = new \OCA\user_ldap\lib\Configuration($nk, false); + $newConfig->setConfiguration($configuration->getDefaults()); $resultData['defaults'] = $configuration->getDefaults(); } $newConfig->saveConfiguration(); diff --git a/apps/user_ldap/js/wizard/wizardTabElementary.js b/apps/user_ldap/js/wizard/wizardTabElementary.js index d123a1ea080..b8ab367dfd1 100644 --- a/apps/user_ldap/js/wizard/wizardTabElementary.js +++ b/apps/user_ldap/js/wizard/wizardTabElementary.js @@ -207,7 +207,6 @@ OCA = OCA || {}; */ onNewConfiguration: function(view, result) { if(result.isSuccess === true) { - console.log('new config'); var nthServer = view._configChooserNextServerNumber; view.$configChooser.find('option:selected').removeAttr('selected'); var html = '<option value="'+result.configPrefix+'" selected="selected">'+t('user_ldap','{nthServer}. Server', {nthServer: nthServer})+'</option>'; diff --git a/apps/user_ldap/lib/wizard.php b/apps/user_ldap/lib/wizard.php index 7bb5752352f..824923eecbf 100644 --- a/apps/user_ldap/lib/wizard.php +++ b/apps/user_ldap/lib/wizard.php @@ -958,7 +958,6 @@ class Wizard extends LDAPUtility { $userAttributes = array_change_key_case(array_flip($userAttributes)); $parts = 0; - $x = $this->configuration->ldapLoginFilterUsername; if($this->configuration->ldapLoginFilterUsername === '1') { $attr = ''; if(isset($userAttributes['uid'])) { |