diff options
Diffstat (limited to 'src/jd2ejd.erl')
| -rw-r--r-- | src/jd2ejd.erl | 46 |
1 files changed, 10 insertions, 36 deletions
diff --git a/src/jd2ejd.erl b/src/jd2ejd.erl index 0770e0794..15a467b1e 100644 --- a/src/jd2ejd.erl +++ b/src/jd2ejd.erl @@ -116,54 +116,28 @@ xdb_data(_User, _Server, {xmlcdata, _CData}) -> ok; xdb_data(User, Server, {xmlelement, _Name, Attrs, _Els} = El) -> From = jlib:make_jid(User, Server, ""), - LServer = jlib:nameprep(Server), case xml:get_attr_s("xmlns", Attrs) of ?NS_AUTH -> Password = xml:get_tag_cdata(El), ejabberd_auth:set_password(User, Server, Password), ok; ?NS_ROSTER -> - case lists:member(mod_roster_odbc, - gen_mod:loaded_modules(LServer)) of - true -> - catch mod_roster_odbc:set_items(User, Server, El); - false -> - catch mod_roster:set_items(User, Server, El) - end, + catch mod_roster:set_items(User, Server, El), ok; ?NS_LAST -> TimeStamp = xml:get_attr_s("last", Attrs), Status = xml:get_tag_cdata(El), - case lists:member(mod_last_odbc, - gen_mod:loaded_modules(LServer)) of - true -> - catch mod_last_odbc:store_last_info( - User, - Server, - list_to_integer(TimeStamp), - Status); - false -> - catch mod_last:store_last_info( - User, - Server, - list_to_integer(TimeStamp), - Status) - end, + catch mod_last:store_last_info( + User, + Server, + list_to_integer(TimeStamp), + Status), ok; ?NS_VCARD -> - case lists:member(mod_vcard_odbc, - gen_mod:loaded_modules(LServer)) of - true -> - catch mod_vcard_odbc:process_sm_iq( - From, - jlib:make_jid("", Server, ""), - #iq{type = set, xmlns = ?NS_VCARD, sub_el = El}); - false -> - catch mod_vcard:process_sm_iq( - From, - jlib:make_jid("", Server, ""), - #iq{type = set, xmlns = ?NS_VCARD, sub_el = El}) - end, + catch mod_vcard:process_sm_iq( + From, + jlib:make_jid("", Server, ""), + #iq{type = set, xmlns = ?NS_VCARD, sub_el = El}), ok; "jabber:x:offline" -> process_offline(Server, From, El), |