mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #16069 from owncloud/fix-15933 

Fix: user login filter does not take username into account
This commit is contained in:
blizzz 2015-05-05 15:17:13 +02:00
parent 2aaafc134c 0e7fd82e89
commit 6783699501
3 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/user_ldap/ajax/getNewServerConfigPrefix.php
View File

@ -41,6 +41,7 @@ if(isset($_POST['copyConfig'])) {
$newConfig->setConfiguration($originalConfig->getConfiguration()); $newConfig->setConfiguration($originalConfig->getConfiguration());
} else { } else {
$configuration = new \OCA\user_ldap\lib\Configuration($nk, false); $configuration = new \OCA\user_ldap\lib\Configuration($nk, false);
$newConfig->setConfiguration($configuration->getDefaults());
$resultData['defaults'] = $configuration->getDefaults(); $resultData['defaults'] = $configuration->getDefaults();
} }
$newConfig->saveConfiguration(); $newConfig->saveConfiguration();

1
apps/user_ldap/js/wizard/wizardTabElementary.js
View File

@ -207,7 +207,6 @@ OCA = OCA || {};
*/ */
onNewConfiguration: function(view, result) { onNewConfiguration: function(view, result) {
if(result.isSuccess === true) { if(result.isSuccess === true) {
console.log('new config');
var nthServer = view._configChooserNextServerNumber; var nthServer = view._configChooserNextServerNumber;
view.$configChooser.find('option:selected').removeAttr('selected'); view.$configChooser.find('option:selected').removeAttr('selected');
var html = '<option value="'+result.configPrefix+'" selected="selected">'+t('user_ldap','{nthServer}. Server', {nthServer: nthServer})+'</option>'; var html = '<option value="'+result.configPrefix+'" selected="selected">'+t('user_ldap','{nthServer}. Server', {nthServer: nthServer})+'</option>';

1
apps/user_ldap/lib/wizard.php
View File

@ -958,7 +958,6 @@ class Wizard extends LDAPUtility {
$userAttributes = array_change_key_case(array_flip($userAttributes)); $userAttributes = array_change_key_case(array_flip($userAttributes));
$parts = 0; $parts = 0;
$x = $this->configuration->ldapLoginFilterUsername;
if($this->configuration->ldapLoginFilterUsername === '1') { if($this->configuration->ldapLoginFilterUsername === '1') {
$attr = ''; $attr = '';
if(isset($userAttributes['uid'])) { if(isset($userAttributes['uid'])) {