From 5ba53819cfd4ebfa25dd6a416b663c2c5748d8eb Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Thu, 06 Mar 2014 07:18:07 -0500
Subject: [PATCH] Revert "Support structured data for autocompletion results; map 'type' attribute to CSS class for autocomplete list items"
---
program/lib/Roundcube/rcube_ldap.php | 14 ++------------
1 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/program/lib/Roundcube/rcube_ldap.php b/program/lib/Roundcube/rcube_ldap.php
index 55a64ac..de3790e 100644
--- a/program/lib/Roundcube/rcube_ldap.php
+++ b/program/lib/Roundcube/rcube_ldap.php
@@ -95,8 +95,8 @@
if (empty($this->prop['groups']['scope']))
$this->prop['groups']['scope'] = 'sub';
// extend group objectclass => member attribute mapping
- if (!empty($this->prop['groups']['event-panel-summary']))
- $this->group_types = array_merge($this->group_types, $this->prop['groups']['event-panel-summary']);
+ if (!empty($this->prop['groups']['class_member_attr']))
+ $this->group_types = array_merge($this->group_types, $this->prop['groups']['class_member_attr']);
// add group name attrib to the list of attributes to be fetched
$fetch_attributes[] = $this->prop['groups']['name_attr'];
@@ -1407,16 +1407,6 @@
$out['_type'] = 'group';
$out['readonly'] = true;
$fieldmap['name'] = $this->group_data['name_attr'] ? $this->group_data['name_attr'] : $this->prop['groups']['name_attr'];
- }
-
- // assign object type from object class mapping
- if (!empty($this->prop['class_type_map'])) {
- foreach (array_map('strtolower', (array)$rec['objectclass']) as $objcls) {
- if (!empty($this->prop['class_type_map'][$objcls])) {
- $out['_type'] = $this->prop['class_type_map'][$objcls];
- break;
- }
- }
}
foreach ($fieldmap as $rf => $lf)
--
Gitblit v1.9.1