summaryrefslogtreecommitdiff
path: root/program/lib
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2014-03-06 13:18:07 +0100
committerThomas Bruederli <thomas@roundcube.net>2014-03-06 13:18:07 +0100
commit5ba53819cfd4ebfa25dd6a416b663c2c5748d8eb (patch)
tree71ea38b5752f98d5c598f8e0032ad6329e41ef3a /program/lib
parent881d6b037507b9d01b267dd600f8977ac361100c (diff)
Revert "Support structured data for autocompletion results; map 'type' attribute to CSS class for autocomplete list items"
This reverts commit e3773d46cb4f06aaab2747db98765edd6d871524.
Diffstat (limited to 'program/lib')
-rw-r--r--program/lib/Roundcube/rcube_ldap.php14
1 files changed, 2 insertions, 12 deletions
diff --git a/program/lib/Roundcube/rcube_ldap.php b/program/lib/Roundcube/rcube_ldap.php
index 55a64acec..de3790e5c 100644
--- a/program/lib/Roundcube/rcube_ldap.php
+++ b/program/lib/Roundcube/rcube_ldap.php
@@ -95,8 +95,8 @@ class rcube_ldap extends rcube_addressbook
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'];
@@ -1409,16 +1409,6 @@ class rcube_ldap extends rcube_addressbook
$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)
{
for ($i=0; $i < $rec[$lf]['count']; $i++) {