25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-12-26 17:38:45 +01:00

Fixed "sender" log field

This commit is contained in:
Alexey Shchepin 2010-09-14 18:00:01 +03:00
parent 191cd2af3c
commit a5813b798f
2 changed files with 5 additions and 2 deletions

View File

@ -215,6 +215,7 @@ receive_offline_packet(From, To, Packet) ->
end, end,
Badge = integer_to_list(Offline + 1), Badge = integer_to_list(Offline + 1),
DeviceID = erlang:integer_to_list(ID, 16), DeviceID = erlang:integer_to_list(ID, 16),
STo = jlib:jid_to_string(To),
Packet1 = Packet1 =
{xmlelement, "message", [], {xmlelement, "message", [],
[{xmlelement, "push", [{"xmlns", ?NS_P1_PUSH}], [{xmlelement, "push", [{"xmlns", ?NS_P1_PUSH}],
@ -227,7 +228,9 @@ receive_offline_packet(From, To, Packet) ->
{xmlelement, "sound", [], {xmlelement, "sound", [],
[{xmlcdata, SSound}]}, [{xmlcdata, SSound}]},
{xmlelement, "from", [], {xmlelement, "from", [],
[{xmlcdata, SFrom}]}]}]}, [{xmlcdata, SFrom}]},
{xmlelement, "to", [],
[{xmlcdata, STo}]}]}]},
ejabberd_router:route(To, ServiceJID, Packet1) ejabberd_router:route(To, ServiceJID, Packet1)
end end
end; end;

View File

@ -370,7 +370,7 @@ handle_message(From, To, Packet, State) ->
"Device ID: ~s~n", "Device ID: ~s~n",
[State#state.host, erlang:integer_to_list(ID, 16), [State#state.host, erlang:integer_to_list(ID, 16),
Notification, Payload, Notification, Payload,
jlib:jid_to_string(From), Sender,
Receiver, DeviceID]), Receiver, DeviceID]),
case ssl:send(State#state.socket, Notification) of case ssl:send(State#state.socket, Notification) of
ok -> ok ->