diff options
author | blizzz <blizzz@owncloud.com> | 2015-02-04 14:19:58 +0100 |
---|---|---|
committer | blizzz <blizzz@owncloud.com> | 2015-02-04 14:19:58 +0100 |
commit | 09216ef49b04f2a37d853d160853d15741bbe015 (patch) | |
tree | 1b0a4902f67a0c0cf0bd4387c29b4fe6cf772def /apps | |
parent | 77e9c212edb1b0b1bbd2dfc8231ce5f183d6c3c8 (diff) | |
parent | 02a1cc01b6e7e81b26c61dd85cfb6de8be4a028c (diff) | |
download | nextcloud-server-09216ef49b04f2a37d853d160853d15741bbe015.tar.gz nextcloud-server-09216ef49b04f2a37d853d160853d15741bbe015.zip |
Merge pull request #13849 from owncloud/ldap-oc8-update
no update routine needed from OC 7 to 8
Diffstat (limited to 'apps')
-rw-r--r-- | apps/user_ldap/appinfo/update.php | 48 | ||||
-rw-r--r-- | apps/user_ldap/appinfo/version | 2 |
2 files changed, 1 insertions, 49 deletions
diff --git a/apps/user_ldap/appinfo/update.php b/apps/user_ldap/appinfo/update.php deleted file mode 100644 index b4121b19852..00000000000 --- a/apps/user_ldap/appinfo/update.php +++ /dev/null @@ -1,48 +0,0 @@ -<?php - -$configInstance = \OC::$server->getConfig(); - -//detect if we can switch on naming guidelines. We won't do it on conflicts. -//it's a bit spaghetti, but hey. -$state = $configInstance->getSystemValue('ldapIgnoreNamingRules', 'unset'); -if($state === 'unset') { - $configInstance->setSystemValue('ldapIgnoreNamingRules', false); -} - -$installedVersion = $configInstance->getAppValue('user_ldap', 'installed_version'); -$enableRawMode = version_compare($installedVersion, '0.4.1', '<'); - -$helper = new \OCA\user_ldap\lib\Helper(); -$configPrefixes = $helper->getServerConfigurationPrefixes(true); -$ldap = new OCA\user_ldap\lib\LDAP(); -foreach($configPrefixes as $config) { - $connection = new OCA\user_ldap\lib\Connection($ldap, $config); - - $state = $configInstance->getAppValue( - 'user_ldap', $config.'ldap_uuid_user_attribute', 'not existing'); - if($state === 'non existing') { - $value = $configInstance->getAppValue( - 'user_ldap', $config.'ldap_uuid_attribute', ''); - $configInstance->setAppValue( - 'user_ldap', $config.'ldap_uuid_user_attribute', $value); - $configInstance->setAppValue( - 'user_ldap', $config.'ldap_uuid_group_attribute', $value); - } - - $state = $configInstance->getAppValue( - 'user_ldap', $config.'ldap_expert_uuid_user_attr', 'not existing'); - if($state === 'non existing') { - $value = $configInstance->getAppValue( - 'user_ldap', $config.'ldap_expert_uuid_attr', ''); - $configInstance->setAppValue( - 'user_ldap', $config.'ldap_expert_uuid_user_attr', $value); - $configInstance->setAppValue( - 'user_ldap', $config.'ldap_expert_uuid_group_attr', $value); - } - - if($enableRawMode) { - $configInstance->setAppValue('user_ldap', $config.'ldap_user_filter_mode', 1); - $configInstance->setAppValue('user_ldap', $config.'ldap_login_filter_mode', 1); - $configInstance->setAppValue('user_ldap', $config.'ldap_group_filter_mode', 1); - } -} diff --git a/apps/user_ldap/appinfo/version b/apps/user_ldap/appinfo/version index 0bfccb08040..8f0916f768f 100644 --- a/apps/user_ldap/appinfo/version +++ b/apps/user_ldap/appinfo/version @@ -1 +1 @@ -0.4.5 +0.5.0 |