Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-28 16:34:13 +01:00
Code Releases Activity

* src/mod_vcard.erl: Add type of x:data field to search

Browse Source 
results (thanks to Robin Redeker) (EJAB-327)
* src/mod_vcard_ldap.erl: 
* src/mod_vcard_odbc.erl:

SVN Revision: 1002
This commit is contained in:
Badlop 2007-11-29 18:24:31 +00:00
parent dbdcadb6b3
commit 02db5aa005
4 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,5 +1,10 @@
2007-11-29 Badlop <badlop@process-one.net> 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 * src/aclocal.m4: Fix autoconf caching for SSL libraries (thanks
to Michael Shields) (EJAB-439) to Michael Shields) (EJAB-439)

24
src/mod_vcard.erl
View File

@ -438,18 +438,18 @@ search_result(Lang, JID, ServerHost, Data) ->
[{xmlcdata, translate:translate(Lang, "Search Results for ") ++ [{xmlcdata, translate:translate(Lang, "Search Results for ") ++
jlib:jid_to_string(JID)}]}, jlib:jid_to_string(JID)}]},
{xmlelement, "reported", [], {xmlelement, "reported", [],
[?LFIELD("Jabber ID", "jid"), [?TLFIELD("text-single", "Jabber ID", "jid"),
?LFIELD("Full Name", "fn"), ?TLFIELD("text-single", "Full Name", "fn"),
?LFIELD("Name", "first"), ?TLFIELD("text-single", "Name", "first"),
?LFIELD("Middle Name", "middle"), ?TLFIELD("text-single", "Middle Name", "middle"),
?LFIELD("Family Name", "last"), ?TLFIELD("text-single", "Family Name", "last"),
?LFIELD("Nickname", "nick"), ?TLFIELD("text-single", "Nickname", "nick"),
?LFIELD("Birthday", "bday"), ?TLFIELD("text-single", "Birthday", "bday"),
?LFIELD("Country", "ctry"), ?TLFIELD("text-single", "Country", "ctry"),
?LFIELD("City", "locality"), ?TLFIELD("text-single", "City", "locality"),
?LFIELD("Email", "email"), ?TLFIELD("text-single", "Email", "email"),
?LFIELD("Organization Name", "orgname"), ?TLFIELD("text-single", "Organization Name", "orgname"),
?LFIELD("Organization Unit", "orgunit") ?TLFIELD("text-single", "Organization Unit", "orgunit")
]}] ++ lists:map(fun record_to_item/1, search(ServerHost, Data)). ]}] ++ lists:map(fun record_to_item/1, search(ServerHost, Data)).
-define(FIELD(Var, Val), -define(FIELD(Var, Val),

4
src/mod_vcard_ldap.erl
View File

@ -522,9 +522,9 @@ search_result(Lang, JID, State, Data) ->
[{xmlcdata, translate:translate(Lang, "Search Results for ") ++ [{xmlcdata, translate:translate(Lang, "Search Results for ") ++
jlib:jid_to_string(JID)}]}, jlib:jid_to_string(JID)}]},
{xmlelement, "reported", [], {xmlelement, "reported", [],
[?LFIELD("Jabber ID", "jid")] ++ [?TLFIELD("text-single", "Jabber ID", "jid")] ++
lists:map( lists:map(
fun({Name, Value}) -> ?LFIELD(Name, Value) end, fun({Name, Value}) -> ?TLFIELD("text-single", Name, Value) end,
SearchReported) SearchReported)
}], }],
case search(State, Data) of case search(State, Data) of

24
src/mod_vcard_odbc.erl
View File

@ -435,18 +435,18 @@ search_result(Lang, JID, ServerHost, Data) ->
[{xmlcdata, translate:translate(Lang, "Search Results for ") ++ [{xmlcdata, translate:translate(Lang, "Search Results for ") ++
jlib:jid_to_string(JID)}]}, jlib:jid_to_string(JID)}]},
{xmlelement, "reported", [], {xmlelement, "reported", [],
[?LFIELD("Jabber ID", "jid"), [?TLFIELD("text-single", "Jabber ID", "jid"),
?LFIELD("Full Name", "fn"), ?TLFIELD("text-single", "Full Name", "fn"),
?LFIELD("Name", "first"), ?TLFIELD("text-single", "Name", "first"),
?LFIELD("Middle Name", "middle"), ?TLFIELD("text-single", "Middle Name", "middle"),
?LFIELD("Family Name", "last"), ?TLFIELD("text-single", "Family Name", "last"),
?LFIELD("Nickname", "nick"), ?TLFIELD("text-single", "Nickname", "nick"),
?LFIELD("Birthday", "bday"), ?TLFIELD("text-single", "Birthday", "bday"),
?LFIELD("Country", "ctry"), ?TLFIELD("text-single", "Country", "ctry"),
?LFIELD("City", "locality"), ?TLFIELD("text-single", "City", "locality"),
?LFIELD("Email", "email"), ?TLFIELD("text-single", "Email", "email"),
?LFIELD("Organization Name", "orgname"), ?TLFIELD("text-single", "Organization Name", "orgname"),
?LFIELD("Organization Unit", "orgunit") ?TLFIELD("text-single", "Organization Unit", "orgunit")
]}] ++ lists:map(fun(R) -> record_to_item(ServerHost, R) end, ]}] ++ lists:map(fun(R) -> record_to_item(ServerHost, R) end,
search(ServerHost, Data)). search(ServerHost, Data)).