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

pubsub identity and database update bugfix

Browse Source 
SVN Revision: 1284
This commit is contained in:
Christophe Romain 2008-04-10 14:08:35 +00:00
parent 0623a04666
commit cfeb6f9c2b
3 changed files with 43 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,6 +1,12 @@
2008-04-10 Christophe Romain <christophe.romain@process-one.net>
* src/mod_pubsub/mod_pubsub.erl: fix identity and database update
bugfix
* src/mod_pubsub/nodetree_default.erl: Likewise
2008-04-10 Mickael Remond <mremond@process-one.net> 2008-04-10 Mickael Remond <mremond@process-one.net>
*src/ejabberd_c2s.erl: Uniform default value for empty privacy * src/ejabberd_c2s.erl: Uniform default value for empty privacy
list. Fixes (EJAB-603). list. Fixes (EJAB-603).
2008-04-08 Badlop <badlop@process-one.net> 2008-04-08 Badlop <badlop@process-one.net>

12
src/mod_pubsub/mod_pubsub.erl
View File

@ -230,7 +230,7 @@ init_nodes(Host, ServerHost, ServedHosts) ->
lists:foreach( lists:foreach(
fun(H) -> fun(H) ->
create_node(Host, ServerHost, ["home", H], service_jid(Host), ?STDNODE) create_node(Host, ServerHost, ["home", H], service_jid(Host), ?STDNODE)
end, [ServerHost | ServedHosts]), end, lists:usort([ServerHost | ServedHosts])),
ok. ok.
update_database(Host) -> update_database(Host) ->
@ -304,7 +304,7 @@ update_database(Host) ->
identity(Host) -> identity(Host) ->
Identity = case lists:member(?PEPNODE, plugins(Host)) of Identity = case lists:member(?PEPNODE, plugins(Host)) of
true -> [{"category", "pubsub"}, {"type", "pep"}]; true -> [{"category", "pubsub"}, {"type", "pep"}];
false -> [{"category", "pubsub"}] false -> [{"category", "pubsub"}, {"type", "service"}]
end, end,
{xmlelement, "identity", Identity, []}. {xmlelement, "identity", Identity, []}.
@ -2266,12 +2266,16 @@ broadcast_by_caps({LUser, LServer, LResource}, Node, _Type, Stanza) ->
[R|_] -> [R|_] ->
R; R;
[] -> [] ->
?ERROR_MSG("~p@~p is offline; can't deliver ~p to contacts", [LUser, LServer, Stanza]),
"" ""
end; end;
_ -> _ ->
LResource LResource
end, end,
case SenderResource of
"" ->
?DEBUG("~p@~p is offline; can't deliver ~p to contacts", [LUser, LServer, Stanza]),
ok;
_ ->
case ejabberd_sm:get_session_pid(LUser, LServer, SenderResource) of case ejabberd_sm:get_session_pid(LUser, LServer, SenderResource) of
C2SPid when is_pid(C2SPid) -> C2SPid when is_pid(C2SPid) ->
%% set the from address on the notification to the bare JID of the account owner %% set the from address on the notification to the bare JID of the account owner
@ -2297,7 +2301,9 @@ broadcast_by_caps({LUser, LServer, LResource}, Node, _Type, Stanza) ->
end, end,
ok; ok;
_ -> _ ->
?DEBUG("~p@~p has no session; can't deliver ~p to contacts", [LUser, LServer, Stanza]),
ok ok
end
end; end;
broadcast_by_caps(_, _, _, _) -> broadcast_by_caps(_, _, _, _) ->
ok. ok.

1
src/mod_pubsub/nodetree_default.erl
View File

@ -74,6 +74,7 @@ init(_Host, _ServerHost, _Opts) ->
{index, [type,parentid]}]), {index, [type,parentid]}]),
NodesFields = record_info(fields, pubsub_node), NodesFields = record_info(fields, pubsub_node),
case mnesia:table_info(pubsub_node, attributes) of case mnesia:table_info(pubsub_node, attributes) of
[host_node, host_parent, info] -> ok; % old schema, updated later by pubsub
NodesFields -> ok; NodesFields -> ok;
_ -> mnesia:transform_table(pubsub_node, ignore, NodesFields) _ -> mnesia:transform_table(pubsub_node, ignore, NodesFields)
end, end,