aboutsummaryrefslogtreecommitdiff
path: root/src/mod_admin_extra.erl
diff options
context:
space:
mode:
authorPaweł Chmielowski <pawel@process-one.net>2015-04-01 15:44:49 +0200
committerPaweł Chmielowski <pawel@process-one.net>2015-04-01 15:44:49 +0200
commitcf3b4dbc7b08ec838857b352cc0ca9dd038322b2 (patch)
tree8026637e11f078f47035e1c7f8dd1a66d7e89651 /src/mod_admin_extra.erl
parentMerge pull request #493 from weiss/rfc-6121-routing (diff)
Drop exmpp usage from mod_admin_extra
Diffstat (limited to 'src/mod_admin_extra.erl')
-rw-r--r--src/mod_admin_extra.erl15
1 files changed, 1 insertions, 14 deletions
diff --git a/src/mod_admin_extra.erl b/src/mod_admin_extra.erl
index dbea77e7d..982b24e8a 100644
--- a/src/mod_admin_extra.erl
+++ b/src/mod_admin_extra.erl
@@ -333,7 +333,7 @@ commands() ->
args = [{user, binary}, {host, binary}, {name, binary}, {subname, binary}],
result = {content, string}},
#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",
longdesc = Vcard2FieldsString ++ "\n\n" ++ Vcard1FieldsString ++ "\n" ++ VcardXEP,
module = ?MODULE, function = get_vcard_multi,
args = [{user, binary}, {host, binary}, {name, binary}, {subname, binary}],
@@ -997,21 +997,8 @@ get_vcard([Data], A1) ->
get_subtag(A1, Data).
get_subtag(Xmlelement, Name) ->
- case code:ensure_loaded(exmpp_xml) of
- {error, _} ->
- [get_subtag_xml(Xmlelement, Name)];
- {module, exmpp_xml} ->
- get_subtag_exmpp(Xmlelement, Name)
- end.
-
-get_subtag_xml(Xmlelement, Name) ->
xml:get_subtag(Xmlelement, Name).
-get_subtag_exmpp(Xmlelement, Name) ->
- Xmlel = exmpp_xml:xmlelement_to_xmlel(Xmlelement),
- XmlelList = exmpp_xml:get_elements(Xmlel, Name),
- [exmpp_xml:xmlel_to_xmlelement(Xmlel2) || Xmlel2 <- XmlelList].
-
set_vcard_content(User, Server, Data, SomeContent) ->
ContentList = case SomeContent of
[Bin | _] when is_binary(Bin) -> SomeContent;