jacob.eva
/
ejabberd-contrib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update get_vcard and set_vcard to ejabberd 13 (fixes issue #21)

This commit is contained in:
Badlop 2014-03-24 19:01:43 +01:00
parent 1ae6491e75
commit 911eb5b199
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
mod_admin_extra/src/mod_admin_extra.erl
View File

@ -320,38 +320,38 @@ commands() ->
desc = "Get content from a vCard field", desc = "Get content from a vCard field",
longdesc = Vcard1FieldsString ++ "\n" ++ Vcard2FieldsString ++ "\n\n" ++ VcardXEP, longdesc = Vcard1FieldsString ++ "\n" ++ Vcard2FieldsString ++ "\n\n" ++ VcardXEP,
module = ?MODULE, function = get_vcard, module = ?MODULE, function = get_vcard,
args = [{user, string}, {host, string}, {name, string}], args = [{user, binary}, {host, binary}, {name, binary}],
result = {content, string}}, result = {content, string}},
#ejabberd_commands{name = get_vcard2, tags = [vcard], #ejabberd_commands{name = get_vcard2, tags = [vcard],
desc = "Get content from a vCard field", desc = "Get content from a vCard field",
longdesc = Vcard2FieldsString ++ "\n\n" ++ Vcard1FieldsString ++ "\n" ++ VcardXEP, longdesc = Vcard2FieldsString ++ "\n\n" ++ Vcard1FieldsString ++ "\n" ++ VcardXEP,
module = ?MODULE, function = get_vcard, module = ?MODULE, function = get_vcard,
args = [{user, string}, {host, string}, {name, string}, {subname, string}], args = [{user, binary}, {host, binary}, {name, binary}, {subname, binary}],
result = {content, string}}, result = {content, string}},
#ejabberd_commands{name = get_vcard2_multi, tags = [vcard], #ejabberd_commands{name = get_vcard2_multi, tags = [vcard],
desc = "Get multiple contents from a vCard field (requires exmpp installed)", desc = "Get multiple contents from a vCard field (requires exmpp installed)",
longdesc = Vcard2FieldsString ++ "\n\n" ++ Vcard1FieldsString ++ "\n" ++ VcardXEP, longdesc = Vcard2FieldsString ++ "\n\n" ++ Vcard1FieldsString ++ "\n" ++ VcardXEP,
module = ?MODULE, function = get_vcard_multi, module = ?MODULE, function = get_vcard_multi,
args = [{user, string}, {host, string}, {name, string}, {subname, string}], args = [{user, binary}, {host, binary}, {name, binary}, {subname, binary}],
result = {contents, {list, string}}}, result = {contents, {list, string}}},
#ejabberd_commands{name = set_vcard, tags = [vcard], #ejabberd_commands{name = set_vcard, tags = [vcard],
desc = "Set content in a vCard field", desc = "Set content in a vCard field",
longdesc = Vcard1FieldsString ++ "\n" ++ Vcard2FieldsString ++ "\n\n" ++ VcardXEP, longdesc = Vcard1FieldsString ++ "\n" ++ Vcard2FieldsString ++ "\n\n" ++ VcardXEP,
module = ?MODULE, function = set_vcard, module = ?MODULE, function = set_vcard,
args = [{user, string}, {host, string}, {name, string}, {content, string}], args = [{user, binary}, {host, binary}, {name, binary}, {content, binary}],
result = {res, rescode}}, result = {res, rescode}},
#ejabberd_commands{name = set_vcard2, tags = [vcard], #ejabberd_commands{name = set_vcard2, tags = [vcard],
desc = "Set content in a vCard subfield", desc = "Set content in a vCard subfield",
longdesc = Vcard2FieldsString ++ "\n\n" ++ Vcard1FieldsString ++ "\n" ++ VcardXEP, longdesc = Vcard2FieldsString ++ "\n\n" ++ Vcard1FieldsString ++ "\n" ++ VcardXEP,
module = ?MODULE, function = set_vcard, module = ?MODULE, function = set_vcard,
args = [{user, string}, {host, string}, {name, string}, {subname, string}, {content, string}], args = [{user, binary}, {host, binary}, {name, binary}, {subname, binary}, {content, binary}],
result = {res, rescode}}, result = {res, rescode}},
#ejabberd_commands{name = set_vcard2_multi, tags = [vcard], #ejabberd_commands{name = set_vcard2_multi, tags = [vcard],
desc = "Set multiple contents in a vCard subfield", desc = "Set multiple contents in a vCard subfield",
longdesc = Vcard2FieldsString ++ "\n\n" ++ Vcard1FieldsString ++ "\n" ++ VcardXEP, longdesc = Vcard2FieldsString ++ "\n\n" ++ Vcard1FieldsString ++ "\n" ++ VcardXEP,
module = ?MODULE, function = set_vcard, module = ?MODULE, function = set_vcard,
args = [{user, string}, {host, string}, {name, string}, {subname, string}, {contents, {list, string}}], args = [{user, binary}, {host, binary}, {name, binary}, {subname, binary}, {contents, {list, binary}}],
result = {res, rescode}}, result = {res, rescode}},
#ejabberd_commands{name = add_rosteritem, tags = [roster], #ejabberd_commands{name = add_rosteritem, tags = [roster],
@ -966,8 +966,8 @@ set_vcard(User, Host, Name, Subname, SomeContent) ->
%% Internal vcard %% Internal vcard
get_module_resource(Server) -> get_module_resource(Server) ->
case gen_mod:get_module_opt(Server, ?MODULE, module_resource, none) of case gen_mod:get_module_opt(Server, ?MODULE, module_resource, fun(A) -> A end, none) of
none -> atom_to_list(?MODULE); none -> list_to_binary(atom_to_list(?MODULE));
R when is_list(R) -> R R when is_list(R) -> R
end. end.
@ -1013,8 +1013,8 @@ get_subtag_exmpp(Xmlelement, Name) ->
set_vcard_content(User, Server, Data, SomeContent) -> set_vcard_content(User, Server, Data, SomeContent) ->
ContentList = case SomeContent of ContentList = case SomeContent of
[Char | _] when not is_list(Char) -> [SomeContent]; [Bin | _] when is_binary(Bin) -> SomeContent;
[Char | _] when is_list(Char) -> SomeContent Bin when is_binary(Bin) -> [SomeContent]
end, end,
[{_, Module, Function, _Opts}] = ets:lookup(sm_iqtable, {?NS_VCARD, Server}), [{_, Module, Function, _Opts}] = ets:lookup(sm_iqtable, {?NS_VCARD, Server}),
JID = jlib:make_jid(User, Server, get_module_resource(Server)), JID = jlib:make_jid(User, Server, get_module_resource(Server)),
@ -1031,7 +1031,7 @@ set_vcard_content(User, Server, Data, SomeContent) ->
end, end,
%% Build new vcard %% Build new vcard
SubEl = {xmlelement, "vCard", [{"xmlns","vcard-temp"}], A4}, SubEl = {xmlel, <<"vCard">>, [{<<"xmlns">>,<<"vcard-temp">>}], A4},
IQ2 = #iq{type=set, sub_el = SubEl}, IQ2 = #iq{type=set, sub_el = SubEl},
Module:Function(JID, JID, IQ2), Module:Function(JID, JID, IQ2),
@ -1042,18 +1042,18 @@ update_vcard_els(Data, ContentList, Els1) ->
[Data1 | Data2] = Data, [Data1 | Data2] = Data,
NewEls = case Data2 of NewEls = case Data2 of
[] -> [] ->
[{xmlelement, Data1, [], [{xmlcdata,Content}]} || Content <- ContentList]; [{xmlel, Data1, [], [{xmlcdata,Content}]} || Content <- ContentList];
[D2] -> [D2] ->
OldEl = case lists:keysearch(Data1, 2, Els2) of OldEl = case lists:keysearch(Data1, 2, Els2) of
{value, A} -> A; {value, A} -> A;
false -> {xmlelement, Data1, [], []} false -> {xmlelement, Data1, [], []}
end, end,
{xmlelement, _, _, ContentOld1} = OldEl, {xmlel, _, _, ContentOld1} = OldEl,
Content2 = [{xmlelement, D2, [], [{xmlcdata,Content}]} || Content <- ContentList], Content2 = [{xmlel, D2, [], [{xmlcdata,Content}]} || Content <- ContentList],
ContentOld2 = [A || {_, X, _, _} = A <- ContentOld1, X/=D2], ContentOld2 = [A || {_, X, _, _} = A <- ContentOld1, X/=D2],
ContentOld3 = lists:keysort(2, ContentOld2), ContentOld3 = lists:keysort(2, ContentOld2),
ContentNew = lists:keymerge(2, Content2, ContentOld3), ContentNew = lists:keymerge(2, Content2, ContentOld3),
[{xmlelement, Data1, [], ContentNew}] [{xmlel, Data1, [], ContentNew}]
end, end,
Els3 = lists:keydelete(Data1, 2, Els2), Els3 = lists:keydelete(Data1, 2, Els2),
lists:keymerge(2, NewEls, Els3). lists:keymerge(2, NewEls, Els3).