Merge pull request #11478 from owncloud/fix-11448

LDAP: add setting to wizard that disables auto-detection and enables raw mode

1 files changed, 91 insertions, 88 deletions

diff --git a/apps/user_ldap/lib/configuration.php b/apps/user_ldap/lib/configuration.php
index 4cb00561b3f..28e456ae2ef 100644
--- a/apps/user_ldap/lib/configuration.php
+++ b/apps/user_ldap/lib/configuration.php
@@ -69,6 +69,7 @@ class Configuration {
 		'ldapConfigurationActive' => false,
 		'ldapAttributesForUserSearch' => null,
 		'ldapAttributesForGroupSearch' => null,
+		'ldapExperiencedAdmin' => false,
 		'homeFolderNamingRule' => null,
 		'hasPagedResultSupport' => false,
 		'hasMemberOfFilterSupport' => false,
@@ -345,52 +346,53 @@ class Configuration {
 	 */
 	public function getDefaults() {
 		return array(
-			'ldap_host'							=> '',
-			'ldap_port'							=> '',
-			'ldap_backup_host'					=> '',
-			'ldap_backup_port'					=> '',
-			'ldap_override_main_server'			=> '',
-			'ldap_dn'							=> '',
-			'ldap_agent_password'				=> '',
-			'ldap_base'							=> '',
-			'ldap_base_users'					=> '',
-			'ldap_base_groups'					=> '',
-			'ldap_userlist_filter'				=> '',
-			'ldap_user_filter_mode'				=> 0,
-			'ldap_userfilter_objectclass'		=> '',
-			'ldap_userfilter_groups'			=> '',
-			'ldap_login_filter'					=> '',
-			'ldap_login_filter_mode'			=> 0,
-			'ldap_loginfilter_email'			=> 0,
-			'ldap_loginfilter_username'			=> 1,
-			'ldap_loginfilter_attributes'		=> '',
-			'ldap_group_filter'					=> '',
-			'ldap_group_filter_mode'			=> 0,
-			'ldap_groupfilter_objectclass'		=> '',
-			'ldap_groupfilter_groups'			=> '',
-			'ldap_display_name'					=> 'displayName',
-			'ldap_group_display_name'			=> 'cn',
-			'ldap_tls'							=> 1,
-			'ldap_nocase'						=> 0,
-			'ldap_quota_def'					=> '',
-			'ldap_quota_attr'					=> '',
-			'ldap_email_attr'					=> '',
-			'ldap_group_member_assoc_attribute'	=> 'uniqueMember',
-			'ldap_cache_ttl'					=> 600,
-			'ldap_uuid_user_attribute'			=> 'auto',
-			'ldap_uuid_group_attribute'			=> 'auto',
-			'home_folder_naming_rule'			=> '',
-			'ldap_turn_off_cert_check'			=> 0,
-			'ldap_configuration_active'			=> 0,
-			'ldap_attributes_for_user_search'	=> '',
-			'ldap_attributes_for_group_search'	=> '',
-			'ldap_expert_username_attr'			=> '',
-			'ldap_expert_uuid_user_attr'		=> '',
-			'ldap_expert_uuid_group_attr'		=> '',
-			'has_memberof_filter_support'		=> 0,
-			'last_jpegPhoto_lookup'				=> 0,
-			'ldap_nested_groups'		        => 0,
-			'ldap_paging_size'					=> 500,
+			'ldap_host'                         => '',
+			'ldap_port'                         => '',
+			'ldap_backup_host'                  => '',
+			'ldap_backup_port'                  => '',
+			'ldap_override_main_server'         => '',
+			'ldap_dn'                           => '',
+			'ldap_agent_password'               => '',
+			'ldap_base'                         => '',
+			'ldap_base_users'                   => '',
+			'ldap_base_groups'                  => '',
+			'ldap_userlist_filter'              => '',
+			'ldap_user_filter_mode'             => 0,
+			'ldap_userfilter_objectclass'       => '',
+			'ldap_userfilter_groups'            => '',
+			'ldap_login_filter'                 => '',
+			'ldap_login_filter_mode'            => 0,
+			'ldap_loginfilter_email'            => 0,
+			'ldap_loginfilter_username'         => 1,
+			'ldap_loginfilter_attributes'       => '',
+			'ldap_group_filter'                 => '',
+			'ldap_group_filter_mode'            => 0,
+			'ldap_groupfilter_objectclass'      => '',
+			'ldap_groupfilter_groups'           => '',
+			'ldap_display_name'                 => 'displayName',
+			'ldap_group_display_name'           => 'cn',
+			'ldap_tls'                          => 1,
+			'ldap_nocase'                       => 0,
+			'ldap_quota_def'                    => '',
+			'ldap_quota_attr'                   => '',
+			'ldap_email_attr'                   => '',
+			'ldap_group_member_assoc_attribute' => 'uniqueMember',
+			'ldap_cache_ttl'                    => 600,
+			'ldap_uuid_user_attribute'          => 'auto',
+			'ldap_uuid_group_attribute'         => 'auto',
+			'home_folder_naming_rule'           => '',
+			'ldap_turn_off_cert_check'          => 0,
+			'ldap_configuration_active'         => 0,
+			'ldap_attributes_for_user_search'   => '',
+			'ldap_attributes_for_group_search'  => '',
+			'ldap_expert_username_attr'         => '',
+			'ldap_expert_uuid_user_attr'        => '',
+			'ldap_expert_uuid_group_attr'       => '',
+			'has_memberof_filter_support'       => 0,
+			'last_jpegPhoto_lookup'             => 0,
+			'ldap_nested_groups'                => 0,
+			'ldap_paging_size'                  => 500,
+			'ldap_experienced_admin'            => 0,
 		);
 	}
 
@@ -400,50 +402,51 @@ class Configuration {
 	public function getConfigTranslationArray() {
 		//TODO: merge them into one representation
 		static $array = array(
-			'ldap_host'							=> 'ldapHost',
-			'ldap_port'							=> 'ldapPort',
-			'ldap_backup_host'					=> 'ldapBackupHost',
-			'ldap_backup_port'					=> 'ldapBackupPort',
-			'ldap_override_main_server' 		=> 'ldapOverrideMainServer',
-			'ldap_dn'							=> 'ldapAgentName',
-			'ldap_agent_password'				=> 'ldapAgentPassword',
-			'ldap_base'							=> 'ldapBase',
-			'ldap_base_users'					=> 'ldapBaseUsers',
-			'ldap_base_groups'					=> 'ldapBaseGroups',
-			'ldap_userfilter_objectclass' 		=> 'ldapUserFilterObjectclass',
-			'ldap_userfilter_groups'	 		=> 'ldapUserFilterGroups',
-			'ldap_userlist_filter'				=> 'ldapUserFilter',
-			'ldap_user_filter_mode'				=> 'ldapUserFilterMode',
-			'ldap_login_filter'					=> 'ldapLoginFilter',
-			'ldap_login_filter_mode'			=> 'ldapLoginFilterMode',
-			'ldap_loginfilter_email'			=> 'ldapLoginFilterEmail',
-			'ldap_loginfilter_username'			=> 'ldapLoginFilterUsername',
-			'ldap_loginfilter_attributes'		=> 'ldapLoginFilterAttributes',
-			'ldap_group_filter'					=> 'ldapGroupFilter',
-			'ldap_group_filter_mode'			=> 'ldapGroupFilterMode',
-			'ldap_groupfilter_objectclass'		=> 'ldapGroupFilterObjectclass',
-			'ldap_groupfilter_groups'			=> 'ldapGroupFilterGroups',
-			'ldap_display_name'					=> 'ldapUserDisplayName',
-			'ldap_group_display_name'			=> 'ldapGroupDisplayName',
-			'ldap_tls'							=> 'ldapTLS',
-			'ldap_nocase'						=> 'ldapNoCase',
-			'ldap_quota_def'					=> 'ldapQuotaDefault',
-			'ldap_quota_attr'					=> 'ldapQuotaAttribute',
-			'ldap_email_attr'					=> 'ldapEmailAttribute',
-			'ldap_group_member_assoc_attribute'	=> 'ldapGroupMemberAssocAttr',
-			'ldap_cache_ttl'					=> 'ldapCacheTTL',
-			'home_folder_naming_rule' 			=> 'homeFolderNamingRule',
-			'ldap_turn_off_cert_check' 			=> 'turnOffCertCheck',
-			'ldap_configuration_active' 		=> 'ldapConfigurationActive',
-			'ldap_attributes_for_user_search' 	=> 'ldapAttributesForUserSearch',
-			'ldap_attributes_for_group_search'	=> 'ldapAttributesForGroupSearch',
-			'ldap_expert_username_attr' 		=> 'ldapExpertUsernameAttr',
-			'ldap_expert_uuid_user_attr' 		=> 'ldapExpertUUIDUserAttr',
-			'ldap_expert_uuid_group_attr'		=> 'ldapExpertUUIDGroupAttr',
-			'has_memberof_filter_support'		=> 'hasMemberOfFilterSupport',
-			'last_jpegPhoto_lookup'				=> 'lastJpegPhotoLookup',
+			'ldap_host'                         => 'ldapHost',
+			'ldap_port'                         => 'ldapPort',
+			'ldap_backup_host'                  => 'ldapBackupHost',
+			'ldap_backup_port'                  => 'ldapBackupPort',
+			'ldap_override_main_server'         => 'ldapOverrideMainServer',
+			'ldap_dn'                           => 'ldapAgentName',
+			'ldap_agent_password'               => 'ldapAgentPassword',
+			'ldap_base'                         => 'ldapBase',
+			'ldap_base_users'                   => 'ldapBaseUsers',
+			'ldap_base_groups'                  => 'ldapBaseGroups',
+			'ldap_userfilter_objectclass'       => 'ldapUserFilterObjectclass',
+			'ldap_userfilter_groups'            => 'ldapUserFilterGroups',
+			'ldap_userlist_filter'              => 'ldapUserFilter',
+			'ldap_user_filter_mode'             => 'ldapUserFilterMode',
+			'ldap_login_filter'                 => 'ldapLoginFilter',
+			'ldap_login_filter_mode'            => 'ldapLoginFilterMode',
+			'ldap_loginfilter_email'            => 'ldapLoginFilterEmail',
+			'ldap_loginfilter_username'         => 'ldapLoginFilterUsername',
+			'ldap_loginfilter_attributes'       => 'ldapLoginFilterAttributes',
+			'ldap_group_filter'                 => 'ldapGroupFilter',
+			'ldap_group_filter_mode'            => 'ldapGroupFilterMode',
+			'ldap_groupfilter_objectclass'      => 'ldapGroupFilterObjectclass',
+			'ldap_groupfilter_groups'           => 'ldapGroupFilterGroups',
+			'ldap_display_name'                 => 'ldapUserDisplayName',
+			'ldap_group_display_name'           => 'ldapGroupDisplayName',
+			'ldap_tls'                          => 'ldapTLS',
+			'ldap_nocase'                       => 'ldapNoCase',
+			'ldap_quota_def'                    => 'ldapQuotaDefault',
+			'ldap_quota_attr'                   => 'ldapQuotaAttribute',
+			'ldap_email_attr'                   => 'ldapEmailAttribute',
+			'ldap_group_member_assoc_attribute' => 'ldapGroupMemberAssocAttr',
+			'ldap_cache_ttl'                    => 'ldapCacheTTL',
+			'home_folder_naming_rule'           => 'homeFolderNamingRule',
+			'ldap_turn_off_cert_check'          => 'turnOffCertCheck',
+			'ldap_configuration_active'         => 'ldapConfigurationActive',
+			'ldap_attributes_for_user_search'   => 'ldapAttributesForUserSearch',
+			'ldap_attributes_for_group_search'  => 'ldapAttributesForGroupSearch',
+			'ldap_expert_username_attr'         => 'ldapExpertUsernameAttr',
+			'ldap_expert_uuid_user_attr'        => 'ldapExpertUUIDUserAttr',
+			'ldap_expert_uuid_group_attr'       => 'ldapExpertUUIDGroupAttr',
+			'has_memberof_filter_support'       => 'hasMemberOfFilterSupport',
+			'last_jpegPhoto_lookup'             => 'lastJpegPhotoLookup',
 			'ldap_nested_groups'                => 'ldapNestedGroups',
 			'ldap_paging_size'                  => 'ldapPagingSize',
+			'ldap_experienced_admin'            => 'ldapExperiencedAdmin'
 		);
 		return $array;
 	}