Rename <options:moronbanner> to <options:xlinemessage>.

This name is more descriptive of what is actually is used for.

diff --git a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf.example
index 60527ce75cea7560f189a3d97c94ead8a38edcd6..ee268dcd217e0be315c351bdfb5119fcc2961fbb 100644 (file)
--- a/docs/conf/inspircd.conf.example
+++ b/docs/conf/inspircd.conf.example
@@ -619,9 +619,9 @@
          # autochanmodes.
          defaultmodes="nt"
 
-         # moronbanner: This is the text that is sent to a user when they are
+         # xlinemessage: This is the text that is sent to a user when they are
          # banned from the server.
-         moronbanner="You're banned! Email haha@abuse.com with the ERROR line below for help."
+         xlinemessage="You're banned! Email irc@example.com with the ERROR line below for help."
 
          # exemptchanops: exemptions for channel access restrictions based on prefix.
          exemptchanops="nonick:v flood:o"

diff --git a/include/configreader.h b/include/configreader.h
index 09a00daeb4c4dfc60ed0b2a8af59ad050e23bdb0..0d514e41d3d12a37013bf8e5d07d5d41fd17f834 100644 (file)
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -239,9 +239,9 @@ class CoreExport ServerConfig
         */
        std::string ServerName;
 
-       /** Notice to give to users when they are Xlined
+       /** Notice to give to users when they are banned by an XLine
         */
-       std::string MoronBanner;
+       std::string XLineMessage;
 
        /* Holds the network name the local server
         * belongs to. This is an arbitary field defined

diff --git a/src/configreader.cpp b/src/configreader.cpp
index e697113e238c35052455e2ac06aa9b08f32599c0..d7d448bc4e4f303562e57c3d149485432677a9d9 100644 (file)
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -377,7 +377,7 @@ void ServerConfig::Fill()
        SoftLimit = ConfValue("performance")->getInt("softlimit", ServerInstance->SE->GetMaxFds(), 10, ServerInstance->SE->GetMaxFds());
        CCOnConnect = ConfValue("performance")->getBool("clonesonconnect", true);
        MaxConn = ConfValue("performance")->getInt("somaxconn", SOMAXCONN);
-       MoronBanner = options->getString("moronbanner", "You're banned!");
+       XLineMessage = options->getString("xlinemessage", options->getString("moronbanner", "You're banned!"));
        ServerDesc = ConfValue("server")->getString("description", "Configure Me");
        Network = ConfValue("server")->getString("network", "Network");
        AdminName = ConfValue("admin")->getString("name", "");

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index 605bc1f698657e032d15cf979ebbefc45bc44d83..538feaade093e2d1bc2cb36e3eb3c6002b7c97ea 100644 (file)
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -129,8 +129,8 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
                {
                        /* user banned */
                        ServerInstance->Logs->Log("BANCACHE", LOG_DEBUG, "BanCache: Positive hit for " + New->GetIPString());
-                       if (!ServerInstance->Config->MoronBanner.empty())
-                               New->WriteNotice("*** " +  ServerInstance->Config->MoronBanner);
+                       if (!ServerInstance->Config->XLineMessage.empty())
+                               New->WriteNotice("*** " +  ServerInstance->Config->XLineMessage);
                        this->QuitUser(New, b->Reason);
                        return;
                }

diff --git a/src/xline.cpp b/src/xline.cpp
index 44ae1e98ecbf980ba12e415bdf77bfdbe4705591..bc8e596bd376a6cbf38ca647e82f378aafcf69ab 100644 (file)
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -533,8 +533,8 @@ void XLine::DefaultApply(User* u, const std::string &line, bool bancache)
 {
        const std::string banReason = line + "-Lined: " + reason;
 
-       if (!ServerInstance->Config->MoronBanner.empty())
-               u->WriteNotice("*** " + ServerInstance->Config->MoronBanner);
+       if (!ServerInstance->Config->XLineMessage.empty())
+               u->WriteNotice("*** " + ServerInstance->Config->XLineMessage);
 
        if (ServerInstance->Config->HideBans)
                ServerInstance->Users->QuitUser(u, line + "-Lined", banReason.c_str());