Chapril/xmpp.chapril.org-ejabberd
24
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-06-02 21:17:12 +02:00
Code Releases Activity

* src/win32/ejabberd.cfg: Updated (thanks to Sergei Golovan)

Browse Source 
* src/odbc/Makefile.win32: Added (thanks to Sergei Golovan)

* src/Makefile.win32: Updated (thanks to Sergei Golovan)

* src/jd2ejd.erl: Fixed private xml setting

* src/mod_last.erl: Bugfix
* src/mod_last_odbc.erl: Likewise

* src/mod_pubsub/mod_pubsub.erl: Fixed service stopping

SVN Revision: 347
This commit is contained in:
Alexey Shchepin 2005-05-15 23:03:25 +00:00
parent a4507b8b6f
commit d7a6fcb712
8 changed files with 209 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ChangeLog
View File

@ -1,3 +1,20 @@
2005-05-16 Alexey Shchepin <alexey@sevcom.net>
* src/win32/ejabberd.cfg: Updated (thanks to Sergei Golovan)
* src/odbc/Makefile.win32: Added (thanks to Sergei Golovan)
* src/Makefile.win32: Updated (thanks to Sergei Golovan)
2005-05-15 Alexey Shchepin <alexey@sevcom.net>
* src/jd2ejd.erl: Fixed private xml setting
* src/mod_last.erl: Bugfix
* src/mod_last_odbc.erl: Likewise
* src/mod_pubsub/mod_pubsub.erl: Fixed service stopping
2005-05-09 Alexey Shchepin <alexey@sevcom.net>
* src/mod_muc/mod_muc_room.erl: Fixed bug with storing

6
src/Makefile.win32
View File

@ -68,6 +68,8 @@ release : build release_clean
copy tls\*.erl $(SRC_DIR)\tls
mkdir $(SRC_DIR)\web
copy web\*.erl $(SRC_DIR)\web
mkdir $(SRC_DIR)\odbc
copy odbc\*.erl $(SRC_DIR)\odbc
mkdir $(DOC_DIR)
copy ..\doc\*.html $(DOC_DIR)
copy ..\doc\*.png $(DOC_DIR)
@ -93,6 +95,8 @@ all-recursive :
nmake -nologo -f Makefile.win32
cd ..\web
nmake -nologo -f Makefile.win32
cd ..\odbc
nmake -nologo -f Makefile.win32
cd ..
compile-beam :
@ -122,6 +126,8 @@ clean-recursive :
nmake -nologo -f Makefile.win32 clean
cd ..\web
nmake -nologo -f Makefile.win32 clean
cd ..\odbc
nmake -nologo -f Makefile.win32 clean
cd ..
distclean : release_clean clean

2
src/jd2ejd.erl
View File

@ -111,7 +111,7 @@ xdb_data(User, Server, {xmlelement, _Name, Attrs, _Els} = El) ->
XMLNS ->
case xml:get_attr_s("j_private_flag", Attrs) of
"1" ->
catch mod_private:process_local_iq(
catch mod_private:process_sm_iq(
From,
jlib:make_jid("", ?MYNAME, ""),
#iq{type = set, xmlns = ?NS_PRIVATE,

2
src/mod_last.erl
View File

@ -74,7 +74,7 @@ process_sm_iq(From, To, #iq{type = Type, sub_el = SubEl} = IQ) ->
roster_get_jid_info, {none, []}, [User, Server, From]),
if
(Subscription == both) or (Subscription == from) ->
case catch mod_privacy:get_user_list(User) of
case catch mod_privacy:get_user_list(User, Server) of
{'EXIT', _Reason} ->
get_last(IQ, SubEl, User, Server);
List ->

3
src/mod_last_odbc.erl
View File

@ -62,12 +62,13 @@ process_sm_iq(From, To, #iq{type = Type, sub_el = SubEl} = IQ) ->
IQ#iq{type = error, sub_el = [SubEl, ?ERR_NOT_ALLOWED]};
get ->
User = To#jid.luser,
Server = To#jid.lserver,
{Subscription, _Groups} =
ejabberd_hooks:run_fold(
roster_get_jid_info, {none, []}, [User, From]),
if
(Subscription == both) or (Subscription == from) ->
case catch mod_privacy:get_user_list(User) of
case catch mod_privacy:get_user_list(User, Server) of
{'EXIT', _Reason} ->
get_last(IQ, SubEl, User);
List ->

2
src/mod_pubsub/mod_pubsub.erl
View File

@ -80,7 +80,7 @@ loop(Hosts, Parent) ->
ets:delete(muc_online_room, Room),
loop(Hosts, Parent);
stop ->
ejabberd_router:unregister_global_routes(Hosts),
ejabberd_router:unregister_routes(Hosts),
ok;
reload ->
?MODULE:loop(Hosts, Parent);

20
src/odbc/Makefile.win32 Normal file
View File

@ -0,0 +1,20 @@
include ..\Makefile.inc
OUTDIR = ..
EFLAGS = -I .. -pz ..
OBJS = \
$(OUTDIR)\ejabberd_odbc.beam \
$(OUTDIR)\ejabberd_odbc_sup.beam
ALL : $(OBJS)
CLEAN :
-@erase $(OBJS)
$(OUTDIR)\ejabberd_odbc.beam : ejabberd_odbc.erl
erlc -W $(EFLAGS) -o $(OUTDIR) ejabberd_odbc.erl
$(OUTDIR)\ejabberd_odbc_sup.beam : ejabberd_odbc_sup.erl
erlc -W $(EFLAGS) -o $(OUTDIR) ejabberd_odbc_sup.erl

5
src/win32/ejabberd.cfg
View File

@ -86,8 +86,8 @@
%{extauth_program, "/path/to/authentification/script"}.
% Host name:
{host, "localhost"}.
% Host name(s):
{hosts, ["localhost"]}.
% Default language:
{language, "en"}.
@ -131,6 +131,7 @@
[
{mod_register, [{access, register}]},
{mod_roster, []},
{mod_shared_roster, []},
{mod_privacy, []},
{mod_configure, []},
{mod_disco, []},