mirror of
https://github.com/processone/ejabberd.git
synced 2024-11-30 16:36:29 +01:00
Default pubsub messages to headline if nothing is configured (thanks to Brian Cully) (EJAB-1061)
SVN Revision: 2655
This commit is contained in:
parent
13a231f6fa
commit
2042ab090d
@ -3095,7 +3095,7 @@ get_options_for_subs(NodeID, Subs) ->
|
|||||||
% end
|
% end
|
||||||
|
|
||||||
broadcast_stanza(Host, Node, _NodeId, _Type, NodeOptions, SubsByDepth, NotifyType, BaseStanza) ->
|
broadcast_stanza(Host, Node, _NodeId, _Type, NodeOptions, SubsByDepth, NotifyType, BaseStanza) ->
|
||||||
NotificationType = get_option(NodeOptions, notification_type),
|
NotificationType = get_option(NodeOptions, notification_type, headline),
|
||||||
BroadcastAll = get_option(NodeOptions, broadcast_all_resources), %% XXX this is not standard, but usefull
|
BroadcastAll = get_option(NodeOptions, broadcast_all_resources), %% XXX this is not standard, but usefull
|
||||||
From = service_jid(Host),
|
From = service_jid(Host),
|
||||||
Stanza = case NotificationType of
|
Stanza = case NotificationType of
|
||||||
|
@ -2926,7 +2926,7 @@ get_options_for_subs(NodeID, Subs) ->
|
|||||||
% end
|
% end
|
||||||
|
|
||||||
broadcast_stanza(Host, Node, _NodeId, _Type, NodeOptions, SubsByDepth, NotifyType, BaseStanza) ->
|
broadcast_stanza(Host, Node, _NodeId, _Type, NodeOptions, SubsByDepth, NotifyType, BaseStanza) ->
|
||||||
NotificationType = get_option(NodeOptions, notification_type),
|
NotificationType = get_option(NodeOptions, notification_type, headline),
|
||||||
BroadcastAll = get_option(NodeOptions, broadcast_all_resources), %% XXX this is not standard, but usefull
|
BroadcastAll = get_option(NodeOptions, broadcast_all_resources), %% XXX this is not standard, but usefull
|
||||||
From = service_jid(Host),
|
From = service_jid(Host),
|
||||||
Stanza = case NotificationType of
|
Stanza = case NotificationType of
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
--- mod_pubsub.erl 2009-10-06 17:21:15.000000000 +0200
|
--- mod_pubsub.erl 2009-10-12 11:05:54.000000000 +0200
|
||||||
+++ mod_pubsub_odbc.erl 2009-10-06 17:21:35.000000000 +0200
|
+++ mod_pubsub_odbc.erl 2009-10-12 11:06:09.000000000 +0200
|
||||||
@@ -45,7 +45,7 @@
|
@@ -45,7 +45,7 @@
|
||||||
%%% TODO
|
%%% TODO
|
||||||
%%% plugin: generate Reply (do not use broadcast atom anymore)
|
%%% plugin: generate Reply (do not use broadcast atom anymore)
|
||||||
|
Loading…
Reference in New Issue
Block a user