diff options
| author | Badlop <badlop@process-one.net> | 2007-11-29 18:24:31 +0000 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2007-11-29 18:24:31 +0000 |
| commit | 02db5aa005bdeb25db00c6d9de7aae1647cbbbfb (patch) | |
| tree | dca011ed0222c004b2c7aa25c41e105dccc57663 | |
| parent | * src/aclocal.m4: Fix autoconf caching for SSL libraries (thanks (diff) | |
* src/mod_vcard.erl: Add type of x:data field to search
results (thanks to Robin Redeker) (EJAB-327)
* src/mod_vcard_ldap.erl:
* src/mod_vcard_odbc.erl:
SVN Revision: 1002
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/mod_vcard.erl | 24 | ||||
| -rw-r--r-- | src/mod_vcard_ldap.erl | 4 | ||||
| -rw-r--r-- | src/mod_vcard_odbc.erl | 24 |
4 files changed, 31 insertions, 26 deletions
@@ -1,5 +1,10 @@ 2007-11-29 Badlop <badlop@process-one.net> + * src/mod_vcard.erl: Add type of x:data field to search + results (thanks to Robin Redeker) (EJAB-327) + * src/mod_vcard_ldap.erl: + * src/mod_vcard_odbc.erl: + * src/aclocal.m4: Fix autoconf caching for SSL libraries (thanks to Michael Shields) (EJAB-439) diff --git a/src/mod_vcard.erl b/src/mod_vcard.erl index 9734d05c8..e4d190d25 100644 --- a/src/mod_vcard.erl +++ b/src/mod_vcard.erl @@ -438,18 +438,18 @@ search_result(Lang, JID, ServerHost, Data) -> [{xmlcdata, translate:translate(Lang, "Search Results for ") ++ jlib:jid_to_string(JID)}]}, {xmlelement, "reported", [], - [?LFIELD("Jabber ID", "jid"), - ?LFIELD("Full Name", "fn"), - ?LFIELD("Name", "first"), - ?LFIELD("Middle Name", "middle"), - ?LFIELD("Family Name", "last"), - ?LFIELD("Nickname", "nick"), - ?LFIELD("Birthday", "bday"), - ?LFIELD("Country", "ctry"), - ?LFIELD("City", "locality"), - ?LFIELD("Email", "email"), - ?LFIELD("Organization Name", "orgname"), - ?LFIELD("Organization Unit", "orgunit") + [?TLFIELD("text-single", "Jabber ID", "jid"), + ?TLFIELD("text-single", "Full Name", "fn"), + ?TLFIELD("text-single", "Name", "first"), + ?TLFIELD("text-single", "Middle Name", "middle"), + ?TLFIELD("text-single", "Family Name", "last"), + ?TLFIELD("text-single", "Nickname", "nick"), + ?TLFIELD("text-single", "Birthday", "bday"), + ?TLFIELD("text-single", "Country", "ctry"), + ?TLFIELD("text-single", "City", "locality"), + ?TLFIELD("text-single", "Email", "email"), + ?TLFIELD("text-single", "Organization Name", "orgname"), + ?TLFIELD("text-single", "Organization Unit", "orgunit") ]}] ++ lists:map(fun record_to_item/1, search(ServerHost, Data)). -define(FIELD(Var, Val), diff --git a/src/mod_vcard_ldap.erl b/src/mod_vcard_ldap.erl index 8e323b058..ecbde4773 100644 --- a/src/mod_vcard_ldap.erl +++ b/src/mod_vcard_ldap.erl @@ -522,9 +522,9 @@ search_result(Lang, JID, State, Data) -> [{xmlcdata, translate:translate(Lang, "Search Results for ") ++ jlib:jid_to_string(JID)}]}, {xmlelement, "reported", [], - [?LFIELD("Jabber ID", "jid")] ++ + [?TLFIELD("text-single", "Jabber ID", "jid")] ++ lists:map( - fun({Name, Value}) -> ?LFIELD(Name, Value) end, + fun({Name, Value}) -> ?TLFIELD("text-single", Name, Value) end, SearchReported) }], case search(State, Data) of diff --git a/src/mod_vcard_odbc.erl b/src/mod_vcard_odbc.erl index 9c8d7d4e7..d0f2b1218 100644 --- a/src/mod_vcard_odbc.erl +++ b/src/mod_vcard_odbc.erl @@ -435,18 +435,18 @@ search_result(Lang, JID, ServerHost, Data) -> [{xmlcdata, translate:translate(Lang, "Search Results for ") ++ jlib:jid_to_string(JID)}]}, {xmlelement, "reported", [], - [?LFIELD("Jabber ID", "jid"), - ?LFIELD("Full Name", "fn"), - ?LFIELD("Name", "first"), - ?LFIELD("Middle Name", "middle"), - ?LFIELD("Family Name", "last"), - ?LFIELD("Nickname", "nick"), - ?LFIELD("Birthday", "bday"), - ?LFIELD("Country", "ctry"), - ?LFIELD("City", "locality"), - ?LFIELD("Email", "email"), - ?LFIELD("Organization Name", "orgname"), - ?LFIELD("Organization Unit", "orgunit") + [?TLFIELD("text-single", "Jabber ID", "jid"), + ?TLFIELD("text-single", "Full Name", "fn"), + ?TLFIELD("text-single", "Name", "first"), + ?TLFIELD("text-single", "Middle Name", "middle"), + ?TLFIELD("text-single", "Family Name", "last"), + ?TLFIELD("text-single", "Nickname", "nick"), + ?TLFIELD("text-single", "Birthday", "bday"), + ?TLFIELD("text-single", "Country", "ctry"), + ?TLFIELD("text-single", "City", "locality"), + ?TLFIELD("text-single", "Email", "email"), + ?TLFIELD("text-single", "Organization Name", "orgname"), + ?TLFIELD("text-single", "Organization Unit", "orgunit") ]}] ++ lists:map(fun(R) -> record_to_item(ServerHost, R) end, search(ServerHost, Data)). |