summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2012-11-04 11:03:18 -0800
committerLukas Reschke <lukas@statuscode.ch>2012-11-04 11:03:18 -0800
commit555dd5c261e52cf64f5a8eb6f4d03635cedafbbe (patch)
treef5d69cf10ef3fd157a21990a38515c03b74035a1
parent8ac3849a95bd6a733cce9134bab4bf38c5c0fadd (diff)
parent00bb246a0d90ddbcc1016fdedb5cf629bfbca70a (diff)
downloadnextcloud-server-555dd5c261e52cf64f5a8eb6f4d03635cedafbbe.tar.gz
nextcloud-server-555dd5c261e52cf64f5a8eb6f4d03635cedafbbe.zip
Merge pull request #200 from owncloud/ldap
LDAP: clear the cache not only when TTL changes, but with every settings...
-rw-r--r--apps/user_ldap/settings.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php
index 95bf6f1ed7d..2ee936d29a8 100644
--- a/apps/user_ldap/settings.php
+++ b/apps/user_ldap/settings.php
@@ -26,16 +26,12 @@ OCP\Util::addscript('user_ldap', 'settings');
OCP\Util::addstyle('user_ldap', 'settings');
if ($_POST) {
+ $clearCache = false;
foreach($params as $param) {
if(isset($_POST[$param])) {
+ $clearCache = true;
if('ldap_agent_password' == $param) {
OCP\Config::setAppValue('user_ldap', $param, base64_encode($_POST[$param]));
- } elseif('ldap_cache_ttl' == $param) {
- if(OCP\Config::getAppValue('user_ldap', $param, '') != $_POST[$param]) {
- $ldap = new \OCA\user_ldap\lib\Connection('user_ldap');
- $ldap->clearCache();
- OCP\Config::setAppValue('user_ldap', $param, $_POST[$param]);
- }
} elseif('home_folder_naming_rule' == $param) {
$value = empty($_POST[$param]) ? 'opt:username' : 'attr:'.$_POST[$param];
OCP\Config::setAppValue('user_ldap', $param, $value);
@@ -54,6 +50,10 @@ if ($_POST) {
OCP\Config::setAppValue('user_ldap', $param, 0);
}
}
+ if($clearCache) {
+ $ldap = new \OCA\user_ldap\lib\Connection('user_ldap');
+ $ldap->clearCache();
+ }
}
// fill template