aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBadlop <badlop@process-one.net>2012-06-06 12:55:35 +0200
committerBadlop <badlop@process-one.net>2012-06-06 12:55:35 +0200
commita99c1e7031e55bcc42c9cb96a6f8bc2d73928422 (patch)
tree52d615dce35b3df5291ecb6aaa92ed2619c45cd9 /src
parentUpdate Slovak translation (thanks to Marek Bečka) (diff)
Fix account registration
Diffstat (limited to 'src')
-rw-r--r--src/mod_offline.erl12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mod_offline.erl b/src/mod_offline.erl
index 75b1966b2..4095478c2 100644
--- a/src/mod_offline.erl
+++ b/src/mod_offline.erl
@@ -95,13 +95,13 @@ start(Host, Opts) ->
loop(Host, AccessMaxOfflineMsgs) ->
receive
- #offline_msg{us = User} = Msg ->
+ #offline_msg{us = UserServer} = Msg ->
DBType = gen_mod:db_type(Host, ?MODULE),
- Msgs = receive_all(User, [Msg], DBType),
+ Msgs = receive_all(UserServer, [Msg], DBType),
Len = length(Msgs),
MaxOfflineMsgs = get_max_user_messages(AccessMaxOfflineMsgs,
- User, Host),
- store_offline_msg(Host, User, Msgs, Len, MaxOfflineMsgs, DBType),
+ UserServer, Host),
+ store_offline_msg(Host, UserServer, Msgs, Len, MaxOfflineMsgs, DBType),
loop(Host, AccessMaxOfflineMsgs);
_ ->
loop(Host, AccessMaxOfflineMsgs)
@@ -176,9 +176,9 @@ store_offline_msg(Host, User, Msgs, Len, MaxOfflineMsgs, odbc) ->
end.
%% Function copied from ejabberd_sm.erl:
-get_max_user_messages(AccessRule, LUser, Host) ->
+get_max_user_messages(AccessRule, {User, Server}, Host) ->
case acl:match_rule(
- Host, AccessRule, jlib:make_jid(LUser, Host, "")) of
+ Host, AccessRule, jlib:make_jid(User, Server, "")) of
Max when is_integer(Max) -> Max;
infinity -> infinity;
_ -> ?MAX_USER_MESSAGES