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/steps/mail/autocomplete.inc | 5 ++---
program/lib/Roundcube/rcube_ldap.php | 14 ++------------
program/js/app.js | 12 +++---------
3 files changed, 7 insertions(+), 24 deletions(-)
diff --git a/program/js/app.js b/program/js/app.js
index 20bda2e..28a1b38 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -4310,14 +4310,10 @@
this.ksearch_destroy();
// insert all members of a group
- if (typeof this.env.contacts[id] === 'object' && this.env.contacts[id].type == 'group') {
+ if (typeof this.env.contacts[id] === 'object' && this.env.contacts[id].id) {
insert += this.env.contacts[id].name + this.env.recipients_delimiter;
this.group2expand[this.env.contacts[id].id] = $.extend({ input: this.ksearch_input }, this.env.contacts[id]);
this.http_request('mail/group-expand', {_source: this.env.contacts[id].source, _gid: this.env.contacts[id].id}, false);
- }
- else if (typeof this.env.contacts[id] === 'object' && this.env.contacts[id].name) {
- insert = this.env.contacts[id].name + this.env.recipients_delimiter;
- trigger = true;
}
else if (typeof this.env.contacts[id] === 'string') {
insert = this.env.contacts[id] + this.env.recipients_delimiter;
@@ -4332,7 +4328,7 @@
this.ksearch_input.setSelectionRange(cpos, cpos);
if (trigger) {
- this.triggerEvent('autocomplete_insert', { field:this.ksearch_input, insert:insert, data:this.env.contacts[id] });
+ this.triggerEvent('autocomplete_insert', { field:this.ksearch_input, insert:insert });
this.compose_type_activity++;
}
};
@@ -4427,7 +4423,7 @@
return;
// display search results
- var i, len, ul, li, text, type, init,
+ var i, len, ul, li, text, init,
value = this.ksearch_value,
data = this.ksearch_data,
maxlen = this.env.autocomplete_max ? this.env.autocomplete_max : 15;
@@ -4461,13 +4457,11 @@
if (results && (len = results.length)) {
for (i=0; i < len && maxlen > 0; i++) {
text = typeof results[i] === 'object' ? results[i].name : results[i];
- type = typeof results[i] === 'object' ? results[i].type : '';
li = document.createElement('LI');
li.innerHTML = text.replace(new RegExp('('+RegExp.escape(value)+')', 'ig'), '##$1%%').replace(/</g, '<').replace(/>/g, '>').replace(/##([^%]+)%%/g, '<b>$1</b>');
li.onmouseover = function(){ ref.ksearch_select(this); };
li.onmouseup = function(){ ref.ksearch_click(this) };
li._rcm_id = this.env.contacts.length + i;
- if (type) li.className = type;
ul.appendChild(li);
maxlen -= 1;
}
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)
diff --git a/program/steps/mail/autocomplete.inc b/program/steps/mail/autocomplete.inc
index 20cf940..c15de92 100644
--- a/program/steps/mail/autocomplete.inc
+++ b/program/steps/mail/autocomplete.inc
@@ -90,7 +90,7 @@
// skip duplicates
if (!in_array($contact, $contacts)) {
- $contacts[] = array('name' => $contact, 'type' => $sql_arr['_type']);
+ $contacts[] = $contact;
$sort_keys[] = sprintf('%s %03d', $sql_arr['name'] , $idx++);
if (count($contacts) >= $MAXNUM) {
@@ -118,7 +118,7 @@
if ($group_prop['email']) {
$idx = 0;
foreach ((array)$group_prop['email'] as $email) {
- $contacts[] = array('name' => format_email_recipient($email, $group['name']), 'type' => 'group');
+ $contacts[] = format_email_recipient($email, $group['name']);
$sort_keys[] = sprintf('%s %03d', $group['name'] , $idx++);
if (count($contacts) >= $MAXNUM) {
@@ -131,7 +131,6 @@
$sort_keys[] = $group['name'];
$contacts[] = array(
'name' => $group['name'] . ' (' . intval($result->count) . ')',
- 'type' => 'group',
'id' => $group['ID'],
'source' => $id
);
--
Gitblit v1.9.1