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

Remove whitespace from base-DNs

This commit is contained in:
Lennart Rosam 2015-08-21 23:54:45 +02:00 committed by Morris Jobke
parent f4885f6da3
commit b47d15cd20
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/user_ldap/lib/configuration.php
View File

@ -145,6 +145,7 @@ class Configuration {
} }
$setMethod = 'setValue'; $setMethod = 'setValue';
$trim = false;
switch($key) { switch($key) {
case 'homeFolderNamingRule': case 'homeFolderNamingRule':
if(!empty($val) && strpos($val, 'attr:') === false) { if(!empty($val) && strpos($val, 'attr:') === false) {
@ -154,6 +155,7 @@ class Configuration {
case 'ldapBase': case 'ldapBase':
case 'ldapBaseUsers': case 'ldapBaseUsers':
case 'ldapBaseGroups': case 'ldapBaseGroups':
$trim = true;// Prevent login errors due to whitespace
case 'ldapAttributesForUserSearch': case 'ldapAttributesForUserSearch':
case 'ldapAttributesForGroupSearch': case 'ldapAttributesForGroupSearch':
case 'ldapUserFilterObjectclass': case 'ldapUserFilterObjectclass':
@ -164,7 +166,7 @@ class Configuration {
$setMethod = 'setMultiLine'; $setMethod = 'setMultiLine';
break; break;
} }
$this->$setMethod($key, $val); $this->$setMethod($key, $val, $trim);
if(is_array($applied)) { if(is_array($applied)) {
$applied[] = $inputKey; $applied[] = $inputKey;
} }
@ -275,13 +277,17 @@ class Configuration {
* @param string $varName * @param string $varName
* @param array|string $value * @param array|string $value
*/ */
protected function setMultiLine($varName, $value) { protected function setMultiLine($varName, $value, $trim = false) {
if(empty($value)) { if(empty($value)) {
$value = ''; $value = '';
} else if (!is_array($value)) { } else if (!is_array($value)) {
$value = preg_split('/\r\n|\r|\n|;/', $value); $value = preg_split('/\r\n|\r|\n|;/', $value);
if($value === false) { if($value === false) {
$value = ''; $value = '';
} else if($trim) {
foreach($value as $key => $val) {
$value[$key] = trim($val);
}
} }
} }
@ -331,8 +337,8 @@ class Configuration {
* @param string $varName * @param string $varName
* @param mixed $value * @param mixed $value
*/ */
protected function setValue($varName, $value) { protected function setValue($varName, $value, $trim = false) {
$this->config[$varName] = $value; $this->config[$varName] = $trim ? trim($value) : $value;
} }
/** /**