diff options
| author | Christophe Romain <christophe.romain@process-one.net> | 2009-09-23 21:54:58 +0000 |
|---|---|---|
| committer | Christophe Romain <christophe.romain@process-one.net> | 2009-09-23 21:54:58 +0000 |
| commit | 330d6f7b6e208d69d378bc6f08cfa743f5259313 (patch) | |
| tree | be16e72650edf977fbfb6083446ba572ed85d84e /src | |
| parent | fix Makefile.win32 for including stun (thanks to neustradamus) (diff) | |
rename pep_sendlast_offline option to ignore_pep_from_offline (EJAB-1047)
SVN Revision: 2621
Diffstat (limited to 'src')
| -rw-r--r-- | src/mod_pubsub/mod_pubsub.erl | 8 | ||||
| -rw-r--r-- | src/mod_pubsub/mod_pubsub_odbc.erl | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/mod_pubsub/mod_pubsub.erl b/src/mod_pubsub/mod_pubsub.erl index 31ffd278..794c44e6 100644 --- a/src/mod_pubsub/mod_pubsub.erl +++ b/src/mod_pubsub/mod_pubsub.erl @@ -132,7 +132,7 @@ host, access, pep_mapping = [], - pep_sendlast_offline = false, + ignore_pep_from_offline = true, last_item_cache = false, max_items_node = ?MAXITEMS, nodetree = ?STDTREE, @@ -177,7 +177,7 @@ init([ServerHost, Opts]) -> ?DEBUG("pubsub init ~p ~p",[ServerHost,Opts]), Host = gen_mod:get_opt_host(ServerHost, Opts, "pubsub.@HOST@"), Access = gen_mod:get_opt(access_createnode, Opts, all), - PepOffline = gen_mod:get_opt(pep_sendlast_offline, Opts, false), + PepOffline = gen_mod:get_opt(ignore_pep_from_offline, Opts, true), IQDisc = gen_mod:get_opt(iqdisc, Opts, one_queue), LastItemCache = gen_mod:get_opt(last_item_cache, Opts, false), MaxItemsNode = gen_mod:get_opt(max_items_node, Opts, ?MAXITEMS), @@ -223,7 +223,7 @@ init([ServerHost, Opts]) -> server_host = ServerHost, access = Access, pep_mapping = PepMapping, - pep_sendlast_offline = PepOffline, + ignore_pep_from_offline = PepOffline, last_item_cache = LastItemCache, max_items_node = MaxItemsNode, nodetree = NodeTree, @@ -491,7 +491,7 @@ send_loop(State) -> %% this is a hack in a sense that PEP should only be based on presence %% and is not able to "store" events of remote users (via s2s) %% this makes that hack only work for local domain by now - if State#state.pep_sendlast_offline -> + if not State#state.ignore_pep_from_offline -> {User, Server, Resource} = jlib:jid_tolower(JID), case mod_caps:get_caps({User, Server, Resource}) of nothing -> diff --git a/src/mod_pubsub/mod_pubsub_odbc.erl b/src/mod_pubsub/mod_pubsub_odbc.erl index 6b731f5e..b95f6ea4 100644 --- a/src/mod_pubsub/mod_pubsub_odbc.erl +++ b/src/mod_pubsub/mod_pubsub_odbc.erl @@ -132,7 +132,7 @@ host, access, pep_mapping = [], - pep_sendlast_offline = false, + ignore_pep_from_offline = true, last_item_cache = false, max_items_node = ?MAXITEMS, nodetree = ?STDTREE, @@ -177,7 +177,7 @@ init([ServerHost, Opts]) -> ?DEBUG("pubsub init ~p ~p",[ServerHost,Opts]), Host = gen_mod:get_opt_host(ServerHost, Opts, "pubsub.@HOST@"), Access = gen_mod:get_opt(access_createnode, Opts, all), - PepOffline = gen_mod:get_opt(pep_sendlast_offline, Opts, false), + PepOffline = gen_mod:get_opt(ignore_pep_from_offline, Opts, true), IQDisc = gen_mod:get_opt(iqdisc, Opts, one_queue), LastItemCache = gen_mod:get_opt(last_item_cache, Opts, false), MaxItemsNode = gen_mod:get_opt(max_items_node, Opts, ?MAXITEMS), @@ -221,7 +221,7 @@ init([ServerHost, Opts]) -> server_host = ServerHost, access = Access, pep_mapping = PepMapping, - pep_sendlast_offline = PepOffline, + ignore_pep_from_offline = PepOffline, last_item_cache = LastItemCache, max_items_node = MaxItemsNode, nodetree = NodeTree, @@ -315,7 +315,7 @@ send_loop(State) -> %% this is a hack in a sense that PEP should only be based on presence %% and is not able to "store" events of remote users (via s2s) %% this makes that hack only work for local domain by now - if State#state.pep_sendlast_offline -> + if not State#state.ignore_pep_from_offline -> {User, Server, Resource} = jlib:jid_tolower(JID), case mod_caps:get_caps({User, Server, Resource}) of nothing -> |