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

Spaces -> Tabs, Update PHP-Doc and function logic

This commit is contained in:
Lennart Rosam 2015-08-22 23:06:04 +02:00 committed by Morris Jobke
parent b47d15cd20
commit 70ffa2f9f8
1 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -145,7 +145,7 @@ class Configuration {
} }
$setMethod = 'setValue'; $setMethod = 'setValue';
$trim = false; $trim = false;
switch($key) { switch($key) {
case 'homeFolderNamingRule': case 'homeFolderNamingRule':
if(!empty($val) && strpos($val, 'attr:') === false) { if(!empty($val) && strpos($val, 'attr:') === false) {
@ -155,7 +155,7 @@ class Configuration {
case 'ldapBase': case 'ldapBase':
case 'ldapBaseUsers': case 'ldapBaseUsers':
case 'ldapBaseGroups': case 'ldapBaseGroups':
$trim = true;// Prevent login errors due to whitespace $trim = true;// Prevent login errors due to whitespace
case 'ldapAttributesForUserSearch': case 'ldapAttributesForUserSearch':
case 'ldapAttributesForGroupSearch': case 'ldapAttributesForGroupSearch':
case 'ldapUserFilterObjectclass': case 'ldapUserFilterObjectclass':
@ -274,8 +274,11 @@ class Configuration {
} }
/** /**
* @param string $varName * Sets multi-line values as arrays
* @param array|string $value *
* @param string $varName name of config-key
* @param array|string $value to set
* @param boolean $trim Trim value? (default: false)
*/ */
protected function setMultiLine($varName, $value, $trim = false) { protected function setMultiLine($varName, $value, $trim = false) {
if(empty($value)) { if(empty($value)) {
@ -284,11 +287,17 @@ class Configuration {
$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);
} if($trim) {
} if(!is_array($value)) {
$value = trim($value);
} else {
foreach($value as $key => $val) {
$value[$key] = trim($val);
}
}
} }
$this->setValue($varName, $value); $this->setValue($varName, $value);
@ -334,11 +343,17 @@ class Configuration {
} }
/** /**
* @param string $varName * Sets a scalar value.
* @param mixed $value *
* @param string $varName name of config key
* @param mixed $value to set
* @param boolean $trim Trim value? (default: false)
*/ */
protected function setValue($varName, $value, $trim = false) { protected function setValue($varName, $value, $trim = false) {
$this->config[$varName] = $trim ? trim($value) : $value; if($trim && is_string($value)) {
$value = trim($value);
}
$this->config[$varName] = $value;
} }
/** /**