From 330d6f7b6e208d69d378bc6f08cfa743f5259313 Mon Sep 17 00:00:00 2001
From: Christophe Romain <christophe.romain@process-one.net>
Date: Wed, 23 Sep 2009 21:54:58 +0000
Subject: [PATCH] rename pep_sendlast_offline option to ignore_pep_from_offline
 (EJAB-1047)

SVN Revision: 2621
---
 doc/guide.tex                      | 4 ++--
 src/mod_pubsub/mod_pubsub.erl      | 8 ++++----
 src/mod_pubsub/mod_pubsub_odbc.erl | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/doc/guide.tex b/doc/guide.tex
index 3aff973ec..0b43fa135 100644
--- a/doc/guide.tex
+++ b/doc/guide.tex
@@ -3566,10 +3566,10 @@ Options:
   The "dag" nodetree provides experimental support for PubSub Collection Nodes (\xepref{0248}).
   In that case you should also add "dag" node plugin as default, for example:
   \term{\{plugins, ["dag","flat","hometree","pep"]\}}
-\titem{\{pep\_sendlast\_offline, false|true\}} \ind{options!pep\_sendlast\_offline}
+\titem{\{ignore\_pep\_from\_offline, false|true\}} \ind{options!ignore\_pep\_from\_offline}
   To specify whether or not we should get last published PEP items
   from users in our roster which are offline when we connect. Value is true or false.
-  If not defined, pubsub assumes false so we only get last items of online contacts.
+  If not defined, pubsub assumes true so we only get last items of online contacts.
 \titem{\{last\_item\_cache, false|true\}} \ind{options!last\_item\_cache}
   To specify whether or not pubsub should cache last items. Value is true
   or false. If not defined, pubsub do not cache last items. On systems with not so many nodes,
diff --git a/src/mod_pubsub/mod_pubsub.erl b/src/mod_pubsub/mod_pubsub.erl
index 31ffd278e..794c44e6e 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 6b731f5ed..b95f6ea4b 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 ->