diff options
| author | Alexey Shchepin <alexey@process-one.net> | 2003-10-17 19:15:38 +0000 |
|---|---|---|
| committer | Alexey Shchepin <alexey@process-one.net> | 2003-10-17 19:15:38 +0000 |
| commit | 392d64ee8bd137c75fc6187e49a4757533e77e3c (patch) | |
| tree | 9ac5a9eac735d08984c7ca0cbd47bc7ea6b90c95 /src/mod_roster.erl | |
| parent | * src/mod_configure.erl: Fixed some error codes (diff) | |
* src/configure.ac: Build system now done using autoconf (thanks
to Balabanov Dmitry)
* src/aclocal.m4: Likewise
* src/**/Makefile.in: Likewise
* src/mod_roster.erl (process_item_set_t): Slightly improved
performance
* src/jd2ejd.erl: Added missed closing of XML stream process,
removed timeout value from import_file/1
* src/ejabberd_auth.erl: Added checks for invalid user name
SVN Revision: 152
Diffstat (limited to 'src/mod_roster.erl')
| -rw-r--r-- | src/mod_roster.erl | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/mod_roster.erl b/src/mod_roster.erl index 47609feaa..00c4ce476 100644 --- a/src/mod_roster.erl +++ b/src/mod_roster.erl @@ -486,21 +486,20 @@ remove_user(User) -> set_items(User, SubEl) -> {xmlelement, Name, Attrs, Els} = SubEl, + LUser = jlib:nodeprep(User), F = fun() -> - lists:foreach(fun(El) -> process_item_set_t(User, El) end, Els) + lists:foreach(fun(El) -> process_item_set_t(LUser, El) end, Els) end, mnesia:transaction(F). -process_item_set_t(User, {xmlelement, Name, Attrs, Els} = XItem) -> +process_item_set_t(LUser, {xmlelement, Name, Attrs, Els} = XItem) -> JID1 = jlib:string_to_jid(xml:get_attr_s("jid", Attrs)), - LUser = jlib:nodeprep(User), case JID1 of error -> ok; _ -> JID = {JID1#jid.user, JID1#jid.server, JID1#jid.resource}, - LJID = jlib:jid_tolower(JID), - Res = mnesia:read({roster, {LUser, LJID}}), + LJID = {JID1#jid.luser, JID1#jid.lserver, JID1#jid.lresource}, Item = #roster{uj = {LUser, LJID}, user = LUser, jid = JID}, @@ -513,7 +512,7 @@ process_item_set_t(User, {xmlelement, Name, Attrs, Els} = XItem) -> mnesia:write(Item2) end end; -process_item_set_t(User, _) -> +process_item_set_t(LUser, _) -> ok. process_item_attrs_ws(Item, [{Attr, Val} | Attrs]) -> |