Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-22 16:20:52 +01:00
Code Releases Activity

Workaround to compile with exmpp

Browse Source 
SVN Revision: 2324
This commit is contained in:
Badlop 2009-06-16 18:28:06 +00:00
parent 08ebf50480
commit 13c76c12f8
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mod_offline.erl
View File

@ -127,7 +127,7 @@ loop(AccessMaxOfflineMsgs) ->
%% Function copied from ejabberd_sm.erl: %% Function copied from ejabberd_sm.erl:
get_max_user_messages(AccessRule, LUser, Host) -> get_max_user_messages(AccessRule, LUser, Host) ->
case acl:match_rule( case acl:match_rule(
Host, AccessRule, jlib:make_jid(LUser, Host, "")) of Host, AccessRule, exmpp_jid:make(LUser, Host, "")) of
Max when is_integer(Max) -> Max; Max when is_integer(Max) -> Max;
infinity -> infinity; infinity -> infinity;
_ -> ?MAX_USER_MESSAGES _ -> ?MAX_USER_MESSAGES

2
src/mod_offline_odbc.erl
View File

@ -134,7 +134,7 @@ loop(Host, AccessMaxOfflineMsgs) ->
%% Function copied from ejabberd_sm.erl: %% Function copied from ejabberd_sm.erl:
get_max_user_messages(AccessRule, LUser, Host) -> get_max_user_messages(AccessRule, LUser, Host) ->
case acl:match_rule( case acl:match_rule(
Host, AccessRule, jlib:make_jid(LUser, Host, "")) of Host, AccessRule, exmpp_jid:make(LUser, Host, "")) of
Max when is_integer(Max) -> Max; Max when is_integer(Max) -> Max;
infinity -> infinity; infinity -> infinity;
_ -> ?MAX_USER_MESSAGES _ -> ?MAX_USER_MESSAGES

3
src/web/ejabberd_http_bind.erl
View File

@ -52,6 +52,9 @@
-include("jlib.hrl"). -include("jlib.hrl").
-include("ejabberd_http.hrl"). -include("ejabberd_http.hrl").
%% TODO: Use exmpp library instead of including this
-define(NS_STREAM, "http://etherx.jabber.org/streams").
-record(http_bind, {id, pid, to, hold, wait, version}). -record(http_bind, {id, pid, to, hold, wait, version}).
-define(NULL_PEER, {{0, 0, 0, 0}, 0}). -define(NULL_PEER, {{0, 0, 0, 0}, 0}).