mirror of
https://github.com/processone/ejabberd.git
synced 2024-11-20 16:15:59 +01:00
* src/tls/Makefile.win32: Added (thanks to Sergei Golovan)
* src/win32/: Updated (thanks to Sergei Golovan) SVN Revision: 281
This commit is contained in:
Alexey Shchepin
parent
e852a3c868
commit
e9f6529ead
10
ChangeLog
10
ChangeLog
@ -1,5 +1,15 @@
|
||||
2004-10-10 Alexey Shchepin <alexey@sevcom.net>
|
||||
|
||||
* (all): ejabberd-0.7.5 released
|
||||
|
||||
* src/tls/Makefile.win32: Added (thanks to Sergei Golovan)
|
||||
|
||||
* src/win32/: Updated (thanks to Sergei Golovan)
|
||||
|
||||
2004-10-09 Alexey Shchepin <alexey@sevcom.net>
|
||||
|
||||
* src/web/ejabberd_web_admin.erl: Fixed user listing
|
||||
|
||||
* src/msgs/uk.msg: Updated (thanks to Sergei Golovan)
|
||||
|
||||
* src/msgs/nl.msg: Updated (thanks to Sander Devrieze)
|
||||
|
||||
37
src/tls/Makefile.win32
Normal file
37
src/tls/Makefile.win32
Normal file
@ -0,0 +1,37 @@
|
||||
|
||||
include ..\Makefile.inc
|
||||
|
||||
OUTDIR = ..
|
||||
EFLAGS = -I .. -pz ..
|
||||
|
||||
OBJS = \
|
||||
$(OUTDIR)\tls.beam
|
||||
|
||||
SOURCE = tls_drv.c
|
||||
OBJECT = tls_drv.o
|
||||
DLL = $(OUTDIR)\tls_drv.dll
|
||||
|
||||
ALL : $(DLL) $(OBJS)
|
||||
|
||||
CLEAN :
|
||||
-@erase $(DLL)
|
||||
-@erase $(OUTDIR)\tls_drv.exp
|
||||
-@erase $(OUTDIR)\tls_drv.lib
|
||||
-@erase $(OBJECT)
|
||||
-@erase $(OBJS)
|
||||
|
||||
$(OUTDIR)\tls.beam : tls.erl
|
||||
erlc -W $(EFLAGS) -o $(OUTDIR) tls.erl
|
||||
|
||||
CC=cl.exe
|
||||
CC_FLAGS=-nologo -D__WIN32__ -DWIN32 -DWINDOWS -D_WIN32 -DNT -MD -Ox -I"$(ERLANG_DIR)\usr\include" -I"$(EI_DIR)\include" -I"$(OPENSSL_DIR)\include"
|
||||
|
||||
LD=link.exe
|
||||
LD_FLAGS=-release -nologo -incremental:no -dll "$(EI_DIR)\lib\ei_md.lib" "$(EI_DIR)\lib\erl_interface_md.lib" "$(OPENSSL_DIR)\lib\VC\ssleay32.lib" "$(OPENSSL_DIR)\lib\VC\libeay32.lib" MSVCRT.LIB kernel32.lib advapi32.lib gdi32.lib user32.lib comctl32.lib comdlg32.lib shell32.lib
|
||||
|
||||
$(DLL) : $(OBJECT)
|
||||
$(LD) $(LD_FLAGS) -out:$(DLL) $(OBJECT)
|
||||
|
||||
$(OBJECT) : $(SOURCE)
|
||||
$(CC) $(CC_FLAGS) -c -Fo$(OBJECT) $(SOURCE)
|
||||
|
||||
@ -1069,7 +1069,7 @@ list_users(Query, Lang) ->
|
||||
FUsers =
|
||||
case length(SUsers) of
|
||||
N when N =< 100 ->
|
||||
[list_given_users(SUsers, Lang)];
|
||||
[list_given_users(SUsers, "../", Lang)];
|
||||
N ->
|
||||
NParts = trunc(math:sqrt(N * 0.618)) + 1,
|
||||
M = trunc(N / NParts) + 1,
|
||||
@ -1136,9 +1136,9 @@ list_users_in_diapason(Diap, Lang) ->
|
||||
N1 = list_to_integer(S1),
|
||||
N2 = list_to_integer(S2),
|
||||
Sub = lists:sublist(SUsers, N1, N2 - N1 + 1),
|
||||
[list_given_users(Sub, Lang)].
|
||||
[list_given_users(Sub, "../../", Lang)].
|
||||
|
||||
list_given_users(Users, Lang) ->
|
||||
list_given_users(Users, Prefix, Lang) ->
|
||||
?XE("table",
|
||||
[?XE("thead",
|
||||
[?XE("tr",
|
||||
@ -1149,7 +1149,7 @@ list_given_users(Users, Lang) ->
|
||||
lists:map(
|
||||
fun(User) ->
|
||||
QueueLen = length(mnesia:dirty_read({offline_msg, User})),
|
||||
FQueueLen = [?AC("../../user/" ++ User ++ "/queue/",
|
||||
FQueueLen = [?AC(Prefix ++ "user/" ++ User ++ "/queue/",
|
||||
integer_to_list(QueueLen))],
|
||||
FLast =
|
||||
case ejabberd_sm:get_user_resources(User) of
|
||||
@ -1173,7 +1173,7 @@ list_given_users(Users, Lang) ->
|
||||
?T("Online")
|
||||
end,
|
||||
?XE("tr",
|
||||
[?XE("td", [?AC("../../user/" ++ User ++ "/",
|
||||
[?XE("td", [?AC(Prefix ++ "user/" ++ User ++ "/",
|
||||
User)]),
|
||||
?XE("td", FQueueLen),
|
||||
?XC("td", FLast)])
|
||||
|
||||
@ -75,12 +75,16 @@
|
||||
% this line:
|
||||
{auth_method, internal}.
|
||||
|
||||
% For LDAP uthentification use these lines instead of above one:
|
||||
% For LDAP authentification use these lines instead of above one:
|
||||
%{auth_method, ldap}.
|
||||
%{ldap_servers, ["localhost"]}. % List of LDAP servers
|
||||
%{ldap_uidattr, "uid"}. % LDAP attribute that holds user ID
|
||||
%{ldap_base, "dc=example,dc=com"}. % Base of LDAP directory
|
||||
|
||||
% For authentification via external script use the following:
|
||||
%{auth_method, external}.
|
||||
%{extauth_program, "/path/to/authentification/script"}.
|
||||
|
||||
|
||||
% Host name:
|
||||
{host, "localhost"}.
|
||||
|
||||
@ -36,6 +36,7 @@
|
||||
ReserveFile "CheckReqs1.ini"
|
||||
!endif
|
||||
ReserveFile "CheckReqs.ini"
|
||||
ReserveFile "CheckService.ini"
|
||||
!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
|
||||
|
||||
;--------------------------------
|
||||
@ -44,6 +45,7 @@
|
||||
Var MUI_TEMP
|
||||
Var STARTMENU_FOLDER
|
||||
Var ADMIN
|
||||
Var ENABLE_SERVICE
|
||||
Var ERLANG_PATH
|
||||
Var ERLANG_VERSION
|
||||
Var REQUIRED_ERLANG_VERSION
|
||||
@ -82,6 +84,7 @@ Function .onInit
|
||||
!insertmacro MUI_INSTALLOPTIONS_EXTRACT "CheckReqs1.ini"
|
||||
!endif
|
||||
!insertmacro MUI_INSTALLOPTIONS_EXTRACT "CheckReqs.ini"
|
||||
!insertmacro MUI_INSTALLOPTIONS_EXTRACT "CheckService.ini"
|
||||
|
||||
ClearErrors
|
||||
UserInfo::GetName
|
||||
@ -112,6 +115,7 @@ FunctionEnd
|
||||
|
||||
!insertmacro MUI_PAGE_WELCOME
|
||||
Page custom CheckUser LeaveCheckUser
|
||||
Page custom CheckService LeaveCheckService
|
||||
!insertmacro MUI_PAGE_LICENSE "..\..\COPYING"
|
||||
Page custom CheckReqs LeaveCheckReqs
|
||||
Page custom CheckReqs1 LeaveCheckReqs1
|
||||
@ -200,7 +204,7 @@ SectionIn 1 RO
|
||||
|
||||
installsrv:
|
||||
nsExec::ExecToLog '"$ERLSRV" add ejabberd -stopaction "init:stop()." \
|
||||
-onfail reboot -workdir "$INSTDIR" \
|
||||
-onfail restart -workdir "$INSTDIR" \
|
||||
-args "-s ejabberd -pa ebin \
|
||||
-ejabberd config \\\"ejabberd.cfg\\\" \
|
||||
-env EJABBERD_SO_PATH priv/lib -env EJABBERD_MSGS_PATH msgs \
|
||||
@ -208,8 +212,10 @@ SectionIn 1 RO
|
||||
-sasl sasl_error_logger {file,\\\"log/sasl.log\\\"} \
|
||||
-mnesia dir \\\"spool\\\"" -d'
|
||||
Pop $0
|
||||
;nsExec::ExecToLog '"$ERLSRV" disable ejabberd'
|
||||
;Pop $0
|
||||
|
||||
StrCmp $ENABLE_SERVICE 0 0 skipservice
|
||||
nsExec::ExecToLog '"$ERLSRV" disable ejabberd'
|
||||
Pop $0
|
||||
|
||||
skipservice:
|
||||
|
||||
@ -369,6 +375,37 @@ Function LeaveCheckUser
|
||||
|
||||
FunctionEnd
|
||||
|
||||
LangString TEXT_CU_TITLE ${LANG_ENGLISH} "Configuring Ejabberd Service"
|
||||
LangString TEXT_CU_SUBTITLE ${LANG_ENGLISH} "Configuring Ejabberd Service."
|
||||
|
||||
Function CheckService
|
||||
|
||||
StrCmp $ADMIN 0 0 showpage
|
||||
Abort
|
||||
|
||||
showpage:
|
||||
!insertmacro MUI_HEADER_TEXT $(TEXT_CU_TITLE) $(TEXT_CU_SUBTITLE)
|
||||
|
||||
!insertmacro MUI_INSTALLOPTIONS_INITDIALOG "CheckService.ini"
|
||||
|
||||
!insertmacro MUI_INSTALLOPTIONS_SHOW
|
||||
|
||||
FunctionEnd
|
||||
|
||||
Function LeaveCheckService
|
||||
|
||||
!insertmacro MUI_INSTALLOPTIONS_READ $0 "CheckService.ini" "Field 2" "State"
|
||||
StrCmp $0 0 0 autostart
|
||||
StrCpy $ENABLE_SERVICE 0
|
||||
Goto endfun
|
||||
|
||||
autostart:
|
||||
StrCpy $ENABLE_SERVICE 1
|
||||
|
||||
endfun:
|
||||
|
||||
FunctionEnd
|
||||
|
||||
LangString TEXT_CR_TITLE ${LANG_ENGLISH} "Unsatisfied Requirements"
|
||||
LangString TEXT_CR_SUBTITLE ${LANG_ENGLISH} "Unsatisfied Ejabberd requirements found."
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user