From 50f74c932b5e0363e0a9d0c0561c6ac946774431 Mon Sep 17 00:00:00 2001 From: Badlop Date: Mon, 11 Jan 2021 20:18:28 +0100 Subject: [PATCH] Replace Jabber->XMPP and Ejabberd (thanks to Neustradamus)(#3469) --- README.md | 2 +- config/ejabberd.exs | 2 +- ejabberd.init.template | 4 ++-- ejabberdctl.cfg.example | 4 ++-- src/ejabberd_cluster_mnesia.erl | 2 +- src/ejabberd_options_doc.erl | 2 +- src/ejabberd_piefxis.erl | 4 ++-- src/ejabberd_system_monitor.erl | 2 +- src/mod_admin_extra.erl | 2 +- src/mod_register.erl | 2 +- src/mod_register_web.erl | 38 ++++++++++++++++----------------- src/mod_vcard.erl | 4 ++-- 12 files changed, 34 insertions(+), 34 deletions(-) diff --git a/README.md b/README.md index 4c750ab94..deb49105d 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ Key Features - Support for IDNA. - **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. - Fully XMPP-compliant. - XML-based protocol. diff --git a/config/ejabberd.exs b/config/ejabberd.exs index 462822183..296567f1c 100644 --- a/config/ejabberd.exs +++ b/config/ejabberd.exs @@ -129,7 +129,7 @@ defmodule Ejabberd.ConfigFile do module :mod_register do @opts [welcome_message: [ subject: "Welcome!", - body: "Hi.\nWelcome to this XMPP Server" + body: "Hi.\nWelcome to this XMPP server" ], ip_access: :trusted_network, access: :register] diff --git a/ejabberd.init.template b/ejabberd.init.template index 90d75404f..060d64317 100644 --- a/ejabberd.init.template +++ b/ejabberd.init.template @@ -6,8 +6,8 @@ # Required-Stop: $remote_fs $network $named $time # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 -# Short-Description: Starts ejabberd jabber server -# Description: Starts ejabberd jabber server, an XMPP +# Short-Description: Starts ejabberd XMPP server +# Description: Starts ejabberd XMPP server, an XMPP # compliant server written in Erlang. ### END INIT INFO diff --git a/ejabberdctl.cfg.example b/ejabberdctl.cfg.example index be29d607d..e88b32835 100644 --- a/ejabberdctl.cfg.example +++ b/ejabberdctl.cfg.example @@ -30,7 +30,7 @@ #' ERL_MAX_PORTS: Maximum number of simultaneously open Erlang ports # # 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. # # Default: 65536 (or 8196 on Windows) @@ -41,7 +41,7 @@ #. #' 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 # ports) for node communication. # diff --git a/src/ejabberd_cluster_mnesia.erl b/src/ejabberd_cluster_mnesia.erl index 726cd04e3..01e87c979 100644 --- a/src/ejabberd_cluster_mnesia.erl +++ b/src/ejabberd_cluster_mnesia.erl @@ -1,7 +1,7 @@ %%%---------------------------------------------------------------------- %%% File : ejabberd_cluster_mnesia.erl %%% Author : Christophe Romain -%%% Purpose : Ejabberd clustering management via Mnesia +%%% Purpose : ejabberd clustering management via Mnesia %%% Created : 7 Oct 2015 by Christophe Romain %%% %%% diff --git a/src/ejabberd_options_doc.erl b/src/ejabberd_options_doc.erl index 131168b18..298a43170 100644 --- a/src/ejabberd_options_doc.erl +++ b/src/ejabberd_options_doc.erl @@ -770,7 +770,7 @@ doc() -> ?T("An LDAP filter as defined in " "https://tools.ietf.org/html/rfc4515[RFC4515]. " "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 " "whitespaces. Also you must not use \"uid\" attribute in the " "filter because this attribute will be appended to the filter " diff --git a/src/ejabberd_piefxis.erl b/src/ejabberd_piefxis.erl index fb1525f71..ff94e168f 100644 --- a/src/ejabberd_piefxis.erl +++ b/src/ejabberd_piefxis.erl @@ -584,8 +584,8 @@ make_main_basefilename(Dir, FnT) -> filename:join([Dir, Filename2]). %% @doc Make the filename for the host. -%% Example: ``(<<"20080804-231550">>, <<"jabber.example.org">>) -> -%% <<"20080804-231550_jabber_example_org.xml">>'' +%% Example: ``(<<"20080804-231550">>, <<"xmpp.domain.tld">>) -> +%% <<"20080804-231550_xmpp_domain_tld.xml">>'' make_host_filename(FnT, Host) -> Host2 = str:join(str:tokens(Host, <<".">>), <<"_">>), <>. diff --git a/src/ejabberd_system_monitor.erl b/src/ejabberd_system_monitor.erl index 35ef48d49..ab52b0775 100644 --- a/src/ejabberd_system_monitor.erl +++ b/src/ejabberd_system_monitor.erl @@ -1,7 +1,7 @@ %%%------------------------------------------------------------------- %%% File : ejabberd_system_monitor.erl %%% Author : Alexey Shchepin -%%% Description : Ejabberd watchdog +%%% Description : ejabberd watchdog %%% Created : 21 Mar 2007 by Alexey Shchepin %%% %%% diff --git a/src/mod_admin_extra.erl b/src/mod_admin_extra.erl index 9a7c3560f..a90a22cea 100644 --- a/src/mod_admin_extra.erl +++ b/src/mod_admin_extra.erl @@ -1478,7 +1478,7 @@ srg_user_del(User, Host, Group, GroupHost) -> %%% 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 send_message(Type, From, To, Subject, Body) -> CodecOpts = ejabberd_config:codec_options(), diff --git a/src/mod_register.erl b/src/mod_register.erl index cf125db78..92df8b682 100644 --- a/src/mod_register.erl +++ b/src/mod_register.erl @@ -623,7 +623,7 @@ mod_doc() -> #{desc => [?T("This module adds support for https://xmpp.org/extensions/xep-0077.html" "[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("* Change the password from an existing account on the server."), "", ?T("* Delete an existing account on the server."), "", diff --git a/src/mod_register_web.erl b/src/mod_register_web.erl index 28198b0ef..c6a955802 100644 --- a/src/mod_register_web.erl +++ b/src/mod_register_web.erl @@ -115,7 +115,7 @@ process([<<"new">>], {success, ok, {Username, Host, _Password}} -> Jid = jid:make(Username, Host), 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}; Error -> ErrorText = @@ -128,7 +128,7 @@ process([<<"delete">>], host = _HTTPHost}) -> case form_del_post(Q) of {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}; Error -> ErrorText = @@ -143,7 +143,7 @@ process([<<"change_password">>], host = _HTTPHost}) -> case form_changepass_post(Q) of {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}; Error -> ErrorText = @@ -200,7 +200,7 @@ meta() -> index_page(Lang) -> HeadEls = [meta(), ?XCT(<<"title">>, - ?T("Jabber Account Registration")), + ?T("XMPP Account Registration")), ?XA(<<"link">>, [{<<"href">>, <<"register.css">>}, {<<"type">>, <<"text/css">>}, @@ -208,15 +208,15 @@ index_page(Lang) -> Els = [?XACT(<<"h1">>, [{<<"class">>, <<"title">>}, {<<"style">>, <<"text-align:center;">>}], - ?T("Jabber Account Registration")), + ?T("XMPP Account Registration")), ?XE(<<"ul">>, [?XE(<<"li">>, - [?ACT(<<"new/">>, ?T("Register a Jabber account"))]), + [?ACT(<<"new/">>, ?T("Register an XMPP account"))]), ?XE(<<"li">>, [?ACT(<<"change_password/">>, ?T("Change Password"))]), ?XE(<<"li">>, [?ACT(<<"delete/">>, - ?T("Unregister a Jabber account"))])])], + ?T("Unregister an XMPP account"))])])], {200, [{<<"Server">>, <<"ejabberd">>}, {<<"Content-Type">>, <<"text/html">>}], @@ -239,7 +239,7 @@ form_new_get(Host, Lang, IP) -> form_new_get2(Host, Lang, CaptchaEls) -> HeadEls = [meta(), ?XCT(<<"title">>, - ?T("Register a Jabber account")), + ?T("Register an XMPP account")), ?XA(<<"link">>, [{<<"href">>, <<"../register.css">>}, {<<"type">>, <<"text/css">>}, @@ -247,10 +247,10 @@ form_new_get2(Host, Lang, CaptchaEls) -> Els = [?XACT(<<"h1">>, [{<<"class">>, <<"title">>}, {<<"style">>, <<"text-align:center;">>}], - ?T("Register a Jabber account")), + ?T("Register an XMPP account")), ?XCT(<<"p">>, - ?T("This page allows to create a Jabber " - "account in this Jabber server. Your " + ?T("This page allows to create an XMPP " + "account in this XMPP server. Your " "JID (Jabber IDentifier) will be of the " "form: username@server. Please read carefully " "the instructions to fill correctly the " @@ -281,19 +281,19 @@ form_new_get2(Host, Lang, CaptchaEls) -> ?XE(<<"ul">>, [?XCT(<<"li">>, ?T("Don't tell your password to anybody, " - "not even the administrators of the Jabber " + "not even the administrators of the XMPP " "server.")), ?XCT(<<"li">>, ?T("You can later change your password using " - "a Jabber client.")), + "an XMPP client.")), ?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 your personal computer for safety reasons.")), ?XCT(<<"li">>, ?T("Memorize your password, or write it " "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 " "it."))])]), ?XE(<<"li">>, @@ -494,7 +494,7 @@ check_password(Username, Host, Password) -> form_del_get(Host, Lang) -> HeadEls = [meta(), ?XCT(<<"title">>, - ?T("Unregister a Jabber account")), + ?T("Unregister an XMPP account")), ?XA(<<"link">>, [{<<"href">>, <<"../register.css">>}, {<<"type">>, <<"text/css">>}, @@ -502,10 +502,10 @@ form_del_get(Host, Lang) -> Els = [?XACT(<<"h1">>, [{<<"class">>, <<"title">>}, {<<"style">>, <<"text-align:center;">>}], - ?T("Unregister a Jabber account")), + ?T("Unregister an XMPP account")), ?XCT(<<"p">>, - ?T("This page allows to unregister a Jabber " - "account in this Jabber server.")), + ?T("This page allows to unregister an XMPP " + "account in this XMPP server.")), ?XAE(<<"form">>, [{<<"action">>, <<"">>}, {<<"method">>, <<"post">>}], [?XE(<<"ol">>, diff --git a/src/mod_vcard.erl b/src/mod_vcard.erl index 997d3ef42..f8afdc04d 100644 --- a/src/mod_vcard.erl +++ b/src/mod_vcard.erl @@ -210,7 +210,7 @@ process_local_iq(#iq{type = get, to = To, lang = Lang} = IQ) -> undefined -> #vcard_temp{fn = <<"ejabberd">>, 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">>}; V -> V @@ -456,7 +456,7 @@ make_instructions(Mod, Lang) -> Fill = translate:translate( Lang, ?T("Fill in the form to search for any matching " - "Jabber User")), + "XMPP User")), Add = translate:translate( Lang, ?T(" (Add * to the end of field to match substring)")),