mirror of
https://github.com/processone/ejabberd.git
synced 2024-09-27 14:30:55 +02:00
* src/ejabberd_c2s.erl: Bugfix
* src/ejabberd_auth_odbc.erl: Bugfix SVN Revision: 515
This commit is contained in:
parent
804c32c100
commit
d837cb9e8d
@ -1,3 +1,9 @@
|
|||||||
|
2006-03-05 Alexey Shchepin <alexey@sevcom.net>
|
||||||
|
|
||||||
|
* src/ejabberd_c2s.erl: Bugfix
|
||||||
|
|
||||||
|
* src/ejabberd_auth_odbc.erl: Bugfix
|
||||||
|
|
||||||
2006-03-04 Mickael Remond <mickael.remond@process-one.net>
|
2006-03-04 Mickael Remond <mickael.remond@process-one.net>
|
||||||
|
|
||||||
* src/ejabberd_logger_h.erl: reopen-log function now rename the log
|
* src/ejabberd_logger_h.erl: reopen-log function now rename the log
|
||||||
|
@ -35,7 +35,7 @@
|
|||||||
%%%----------------------------------------------------------------------
|
%%%----------------------------------------------------------------------
|
||||||
start(Host) ->
|
start(Host) ->
|
||||||
ChildSpec =
|
ChildSpec =
|
||||||
{ejabberd_odbc_sup,
|
{gen_mod:get_module_proc(Host, ejabberd_odbc_sup),
|
||||||
{ejabberd_odbc_sup, start_link, [Host]},
|
{ejabberd_odbc_sup, start_link, [Host]},
|
||||||
temporary,
|
temporary,
|
||||||
infinity,
|
infinity,
|
||||||
|
@ -1306,28 +1306,28 @@ presence_track(From, To, Packet, StateData) ->
|
|||||||
StateData#state{pres_i = I,
|
StateData#state{pres_i = I,
|
||||||
pres_a = A};
|
pres_a = A};
|
||||||
"subscribe" ->
|
"subscribe" ->
|
||||||
ejabberd_router:route(jlib:jid_remove_resource(From), To, Packet),
|
|
||||||
ejabberd_hooks:run(roster_out_subscription,
|
ejabberd_hooks:run(roster_out_subscription,
|
||||||
Server,
|
Server,
|
||||||
[User, Server, To, subscribe]),
|
[User, Server, To, subscribe]),
|
||||||
|
ejabberd_router:route(jlib:jid_remove_resource(From), To, Packet),
|
||||||
StateData;
|
StateData;
|
||||||
"subscribed" ->
|
"subscribed" ->
|
||||||
ejabberd_router:route(jlib:jid_remove_resource(From), To, Packet),
|
|
||||||
ejabberd_hooks:run(roster_out_subscription,
|
ejabberd_hooks:run(roster_out_subscription,
|
||||||
Server,
|
Server,
|
||||||
[User, Server, To, subscribed]),
|
[User, Server, To, subscribed]),
|
||||||
|
ejabberd_router:route(jlib:jid_remove_resource(From), To, Packet),
|
||||||
StateData;
|
StateData;
|
||||||
"unsubscribe" ->
|
"unsubscribe" ->
|
||||||
ejabberd_router:route(jlib:jid_remove_resource(From), To, Packet),
|
|
||||||
ejabberd_hooks:run(roster_out_subscription,
|
ejabberd_hooks:run(roster_out_subscription,
|
||||||
Server,
|
Server,
|
||||||
[User, Server, To, unsubscribe]),
|
[User, Server, To, unsubscribe]),
|
||||||
|
ejabberd_router:route(jlib:jid_remove_resource(From), To, Packet),
|
||||||
StateData;
|
StateData;
|
||||||
"unsubscribed" ->
|
"unsubscribed" ->
|
||||||
ejabberd_router:route(jlib:jid_remove_resource(From), To, Packet),
|
|
||||||
ejabberd_hooks:run(roster_out_subscription,
|
ejabberd_hooks:run(roster_out_subscription,
|
||||||
Server,
|
Server,
|
||||||
[User, Server, To, unsubscribed]),
|
[User, Server, To, unsubscribed]),
|
||||||
|
ejabberd_router:route(jlib:jid_remove_resource(From), To, Packet),
|
||||||
StateData;
|
StateData;
|
||||||
"error" ->
|
"error" ->
|
||||||
ejabberd_router:route(From, To, Packet),
|
ejabberd_router:route(From, To, Packet),
|
||||||
|
Loading…
Reference in New Issue
Block a user