Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

Replace Jabber->XMPP and Ejabberd (thanks to Neustradamus)(#3469)

This commit is contained in:
Badlop 2021-01-11 20:18:28 +01:00
parent 446cb485ac
commit 50f74c932b
12 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -53,7 +53,7 @@ Key Features
- Support for IDNA. - Support for IDNA.
- **Open Standards** - **Open Standards**
ejabberd is the first Open Source Jabber server claiming to fully comply to ejabberd is the first Open Source XMPP server claiming to fully comply to
the XMPP standard. the XMPP standard.
- Fully XMPP-compliant. - Fully XMPP-compliant.
- XML-based protocol. - XML-based protocol.

2
config/ejabberd.exs
View File

@ -129,7 +129,7 @@ defmodule Ejabberd.ConfigFile do
module :mod_register do module :mod_register do
@opts [welcome_message: [ @opts [welcome_message: [
subject: "Welcome!", subject: "Welcome!",
body: "Hi.\nWelcome to this XMPP Server" body: "Hi.\nWelcome to this XMPP server"
], ],
ip_access: :trusted_network, ip_access: :trusted_network,
access: :register] access: :register]

4
ejabberd.init.template
View File

@ -6,8 +6,8 @@
# Required-Stop: $remote_fs $network $named $time # Required-Stop: $remote_fs $network $named $time
# Default-Start: 2 3 4 5 # Default-Start: 2 3 4 5
# Default-Stop: 0 1 6 # Default-Stop: 0 1 6
# Short-Description: Starts ejabberd jabber server # Short-Description: Starts ejabberd XMPP server
# Description: Starts ejabberd jabber server, an XMPP # Description: Starts ejabberd XMPP server, an XMPP
# compliant server written in Erlang. # compliant server written in Erlang.
### END INIT INFO ### END INIT INFO

4
ejabberdctl.cfg.example
View File

@ -30,7 +30,7 @@
#' ERL_MAX_PORTS: Maximum number of simultaneously open Erlang ports #' ERL_MAX_PORTS: Maximum number of simultaneously open Erlang ports
# #
# ejabberd consumes two or three ports for every connection, either # ejabberd consumes two or three ports for every connection, either
# from a client or from another Jabber server. So take this into # from a client or from another XMPP server. So take this into
# account when setting this limit. # account when setting this limit.
# #
# Default: 65536 (or 8196 on Windows) # Default: 65536 (or 8196 on Windows)
@ -41,7 +41,7 @@
#. #.
#' FIREWALL_WINDOW: Range of allowed ports to pass through a firewall #' FIREWALL_WINDOW: Range of allowed ports to pass through a firewall
# #
# If Ejabberd is configured to run in cluster, and a firewall is blocking ports, # If ejabberd is configured to run in cluster, and a firewall is blocking ports,
# it's possible to make Erlang use a defined range of port (instead of dynamic # it's possible to make Erlang use a defined range of port (instead of dynamic
# ports) for node communication. # ports) for node communication.
# #

2
src/ejabberd_cluster_mnesia.erl
View File

@ -1,7 +1,7 @@
%%%---------------------------------------------------------------------- %%%----------------------------------------------------------------------
%%% File : ejabberd_cluster_mnesia.erl %%% File : ejabberd_cluster_mnesia.erl
%%% Author : Christophe Romain <christophe.romain@process-one.net> %%% Author : Christophe Romain <christophe.romain@process-one.net>
%%% Purpose : Ejabberd clustering management via Mnesia %%% Purpose : ejabberd clustering management via Mnesia
%%% Created : 7 Oct 2015 by Christophe Romain <christophe.romain@process-one.net> %%% Created : 7 Oct 2015 by Christophe Romain <christophe.romain@process-one.net>
%%% %%%
%%% %%%

2
src/ejabberd_options_doc.erl
View File

@ -770,7 +770,7 @@ doc() ->
?T("An LDAP filter as defined in " ?T("An LDAP filter as defined in "
"https://tools.ietf.org/html/rfc4515[RFC4515]. " "https://tools.ietf.org/html/rfc4515[RFC4515]. "
"There is no default value. Example: " "There is no default value. Example: "
"\"(&(objectClass=shadowAccount)(memberOf=Jabber Users))\". " "\"(&(objectClass=shadowAccount)(memberOf=XMPP Users))\". "
"NOTE: don't forget to close brackets and don't use superfluous " "NOTE: don't forget to close brackets and don't use superfluous "
"whitespaces. Also you must not use \"uid\" attribute in the " "whitespaces. Also you must not use \"uid\" attribute in the "
"filter because this attribute will be appended to the filter " "filter because this attribute will be appended to the filter "

4
src/ejabberd_piefxis.erl
View File

@ -584,8 +584,8 @@ make_main_basefilename(Dir, FnT) ->
filename:join([Dir, Filename2]). filename:join([Dir, Filename2]).
%% @doc Make the filename for the host. %% @doc Make the filename for the host.
%% Example: ``(<<"20080804-231550">>, <<"jabber.example.org">>) -> %% Example: ``(<<"20080804-231550">>, <<"xmpp.domain.tld">>) ->
%% <<"20080804-231550_jabber_example_org.xml">>'' %% <<"20080804-231550_xmpp_domain_tld.xml">>''
make_host_filename(FnT, Host) -> make_host_filename(FnT, Host) ->
Host2 = str:join(str:tokens(Host, <<".">>), <<"_">>), Host2 = str:join(str:tokens(Host, <<".">>), <<"_">>),
<<FnT/binary, "_", Host2/binary, ".xml">>. <<FnT/binary, "_", Host2/binary, ".xml">>.

2
src/ejabberd_system_monitor.erl
View File

@ -1,7 +1,7 @@
%%%------------------------------------------------------------------- %%%-------------------------------------------------------------------
%%% File : ejabberd_system_monitor.erl %%% File : ejabberd_system_monitor.erl
%%% Author : Alexey Shchepin <alexey@process-one.net> %%% Author : Alexey Shchepin <alexey@process-one.net>
%%% Description : Ejabberd watchdog %%% Description : ejabberd watchdog
%%% Created : 21 Mar 2007 by Alexey Shchepin <alexey@process-one.net> %%% Created : 21 Mar 2007 by Alexey Shchepin <alexey@process-one.net>
%%% %%%
%%% %%%

2
src/mod_admin_extra.erl
View File

@ -1478,7 +1478,7 @@ srg_user_del(User, Host, Group, GroupHost) ->
%%% Stanza %%% Stanza
%%% %%%
%% @doc Send a message to a Jabber account. %% @doc Send a message to an XMPP account.
%% @spec (Type::binary(), From::binary(), To::binary(), Subject::binary(), Body::binary()) -> ok %% @spec (Type::binary(), From::binary(), To::binary(), Subject::binary(), Body::binary()) -> ok
send_message(Type, From, To, Subject, Body) -> send_message(Type, From, To, Subject, Body) ->
CodecOpts = ejabberd_config:codec_options(), CodecOpts = ejabberd_config:codec_options(),

2
src/mod_register.erl
View File

@ -623,7 +623,7 @@ mod_doc() ->
#{desc => #{desc =>
[?T("This module adds support for https://xmpp.org/extensions/xep-0077.html" [?T("This module adds support for https://xmpp.org/extensions/xep-0077.html"
"[XEP-0077: In-Band Registration]. " "[XEP-0077: In-Band Registration]. "
"This protocol enables end users to use a XMPP client to:"), "", "This protocol enables end users to use an XMPP client to:"), "",
?T("* Register a new account on the server."), "", ?T("* Register a new account on the server."), "",
?T("* Change the password from an existing account on the server."), "", ?T("* Change the password from an existing account on the server."), "",
?T("* Delete an existing account on the server."), "", ?T("* Delete an existing account on the server."), "",

38
src/mod_register_web.erl
View File

@ -115,7 +115,7 @@ process([<<"new">>],
{success, ok, {Username, Host, _Password}} -> {success, ok, {Username, Host, _Password}} ->
Jid = jid:make(Username, Host), Jid = jid:make(Username, Host),
mod_register:send_registration_notifications(?MODULE, Jid, Ip), mod_register:send_registration_notifications(?MODULE, Jid, Ip),
Text = translate:translate(Lang, ?T("Your Jabber account was successfully created.")), Text = translate:translate(Lang, ?T("Your XMPP account was successfully created.")),
{200, [], Text}; {200, [], Text};
Error -> Error ->
ErrorText = ErrorText =
@ -128,7 +128,7 @@ process([<<"delete">>],
host = _HTTPHost}) -> host = _HTTPHost}) ->
case form_del_post(Q) of case form_del_post(Q) of
{atomic, ok} -> {atomic, ok} ->
Text = translate:translate(Lang, ?T("Your Jabber account was successfully deleted.")), Text = translate:translate(Lang, ?T("Your XMPP account was successfully deleted.")),
{200, [], Text}; {200, [], Text};
Error -> Error ->
ErrorText = ErrorText =
@ -143,7 +143,7 @@ process([<<"change_password">>],
host = _HTTPHost}) -> host = _HTTPHost}) ->
case form_changepass_post(Q) of case form_changepass_post(Q) of
{atomic, ok} -> {atomic, ok} ->
Text = translate:translate(Lang, ?T("The password of your Jabber account was successfully changed.")), Text = translate:translate(Lang, ?T("The password of your XMPP account was successfully changed.")),
{200, [], Text}; {200, [], Text};
Error -> Error ->
ErrorText = ErrorText =
@ -200,7 +200,7 @@ meta() ->
index_page(Lang) -> index_page(Lang) ->
HeadEls = [meta(), HeadEls = [meta(),
?XCT(<<"title">>, ?XCT(<<"title">>,
?T("Jabber Account Registration")), ?T("XMPP Account Registration")),
?XA(<<"link">>, ?XA(<<"link">>,
[{<<"href">>, <<"register.css">>}, [{<<"href">>, <<"register.css">>},
{<<"type">>, <<"text/css">>}, {<<"type">>, <<"text/css">>},
@ -208,15 +208,15 @@ index_page(Lang) ->
Els = [?XACT(<<"h1">>, Els = [?XACT(<<"h1">>,
[{<<"class">>, <<"title">>}, [{<<"class">>, <<"title">>},
{<<"style">>, <<"text-align:center;">>}], {<<"style">>, <<"text-align:center;">>}],
?T("Jabber Account Registration")), ?T("XMPP Account Registration")),
?XE(<<"ul">>, ?XE(<<"ul">>,
[?XE(<<"li">>, [?XE(<<"li">>,
[?ACT(<<"new/">>, ?T("Register a Jabber account"))]), [?ACT(<<"new/">>, ?T("Register an XMPP account"))]),
?XE(<<"li">>, ?XE(<<"li">>,
[?ACT(<<"change_password/">>, ?T("Change Password"))]), [?ACT(<<"change_password/">>, ?T("Change Password"))]),
?XE(<<"li">>, ?XE(<<"li">>,
[?ACT(<<"delete/">>, [?ACT(<<"delete/">>,
?T("Unregister a Jabber account"))])])], ?T("Unregister an XMPP account"))])])],
{200, {200,
[{<<"Server">>, <<"ejabberd">>}, [{<<"Server">>, <<"ejabberd">>},
{<<"Content-Type">>, <<"text/html">>}], {<<"Content-Type">>, <<"text/html">>}],
@ -239,7 +239,7 @@ form_new_get(Host, Lang, IP) ->
form_new_get2(Host, Lang, CaptchaEls) -> form_new_get2(Host, Lang, CaptchaEls) ->
HeadEls = [meta(), HeadEls = [meta(),
?XCT(<<"title">>, ?XCT(<<"title">>,
?T("Register a Jabber account")), ?T("Register an XMPP account")),
?XA(<<"link">>, ?XA(<<"link">>,
[{<<"href">>, <<"../register.css">>}, [{<<"href">>, <<"../register.css">>},
{<<"type">>, <<"text/css">>}, {<<"type">>, <<"text/css">>},
@ -247,10 +247,10 @@ form_new_get2(Host, Lang, CaptchaEls) ->
Els = [?XACT(<<"h1">>, Els = [?XACT(<<"h1">>,
[{<<"class">>, <<"title">>}, [{<<"class">>, <<"title">>},
{<<"style">>, <<"text-align:center;">>}], {<<"style">>, <<"text-align:center;">>}],
?T("Register a Jabber account")), ?T("Register an XMPP account")),
?XCT(<<"p">>, ?XCT(<<"p">>,
?T("This page allows to create a Jabber " ?T("This page allows to create an XMPP "
"account in this Jabber server. Your " "account in this XMPP server. Your "
"JID (Jabber IDentifier) will be of the " "JID (Jabber IDentifier) will be of the "
"form: username@server. Please read carefully " "form: username@server. Please read carefully "
"the instructions to fill correctly the " "the instructions to fill correctly the "
@ -281,19 +281,19 @@ form_new_get2(Host, Lang, CaptchaEls) ->
?XE(<<"ul">>, ?XE(<<"ul">>,
[?XCT(<<"li">>, [?XCT(<<"li">>,
?T("Don't tell your password to anybody, " ?T("Don't tell your password to anybody, "
"not even the administrators of the Jabber " "not even the administrators of the XMPP "
"server.")), "server.")),
?XCT(<<"li">>, ?XCT(<<"li">>,
?T("You can later change your password using " ?T("You can later change your password using "
"a Jabber client.")), "an XMPP client.")),
?XCT(<<"li">>, ?XCT(<<"li">>,
?T("Some Jabber clients can store your password " ?T("Some XMPP clients can store your password "
"in the computer, but you should do this only " "in the computer, but you should do this only "
"in your personal computer for safety reasons.")), "in your personal computer for safety reasons.")),
?XCT(<<"li">>, ?XCT(<<"li">>,
?T("Memorize your password, or write it " ?T("Memorize your password, or write it "
"in a paper placed in a safe place. In " "in a paper placed in a safe place. In "
"Jabber there isn't an automated way " "XMPP there isn't an automated way "
"to recover your password if you forget " "to recover your password if you forget "
"it."))])]), "it."))])]),
?XE(<<"li">>, ?XE(<<"li">>,
@ -494,7 +494,7 @@ check_password(Username, Host, Password) ->
form_del_get(Host, Lang) -> form_del_get(Host, Lang) ->
HeadEls = [meta(), HeadEls = [meta(),
?XCT(<<"title">>, ?XCT(<<"title">>,
?T("Unregister a Jabber account")), ?T("Unregister an XMPP account")),
?XA(<<"link">>, ?XA(<<"link">>,
[{<<"href">>, <<"../register.css">>}, [{<<"href">>, <<"../register.css">>},
{<<"type">>, <<"text/css">>}, {<<"type">>, <<"text/css">>},
@ -502,10 +502,10 @@ form_del_get(Host, Lang) ->
Els = [?XACT(<<"h1">>, Els = [?XACT(<<"h1">>,
[{<<"class">>, <<"title">>}, [{<<"class">>, <<"title">>},
{<<"style">>, <<"text-align:center;">>}], {<<"style">>, <<"text-align:center;">>}],
?T("Unregister a Jabber account")), ?T("Unregister an XMPP account")),
?XCT(<<"p">>, ?XCT(<<"p">>,
?T("This page allows to unregister a Jabber " ?T("This page allows to unregister an XMPP "
"account in this Jabber server.")), "account in this XMPP server.")),
?XAE(<<"form">>, ?XAE(<<"form">>,
[{<<"action">>, <<"">>}, {<<"method">>, <<"post">>}], [{<<"action">>, <<"">>}, {<<"method">>, <<"post">>}],
[?XE(<<"ol">>, [?XE(<<"ol">>,

4
src/mod_vcard.erl
View File

@ -210,7 +210,7 @@ process_local_iq(#iq{type = get, to = To, lang = Lang} = IQ) ->
undefined -> undefined ->
#vcard_temp{fn = <<"ejabberd">>, #vcard_temp{fn = <<"ejabberd">>,
url = ejabberd_config:get_uri(), url = ejabberd_config:get_uri(),
desc = misc:get_descr(Lang, ?T("Erlang Jabber Server")), desc = misc:get_descr(Lang, ?T("Erlang XMPP Server")),
bday = <<"2002-11-16">>}; bday = <<"2002-11-16">>};
V -> V ->
V V
@ -456,7 +456,7 @@ make_instructions(Mod, Lang) ->
Fill = translate:translate( Fill = translate:translate(
Lang, Lang,
?T("Fill in the form to search for any matching " ?T("Fill in the form to search for any matching "
"Jabber User")), "XMPP User")),
Add = translate:translate( Add = translate:translate(
Lang, Lang,
?T(" (Add * to the end of field to match substring)")), ?T(" (Add * to the end of field to match substring)")),