summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Powell <petpow@saberuk.com>2013-07-10 14:50:26 +0100
committerPeter Powell <petpow@saberuk.com>2013-08-10 14:04:09 +0100
commit4509cbcc0b57f9f397af26f5e8dbe629499c2b24 (patch)
tree556c99242d21eec590fe8f8fb7d8315f0cd21aea
parent86f650e6b8c969b31fae65ea1143644723279b82 (diff)
Rename <options:moronbanner> to <options:xlinemessage>.
This name is more descriptive of what is actually is used for.
-rw-r--r--docs/conf/inspircd.conf.example4
-rw-r--r--include/configreader.h4
-rw-r--r--src/configreader.cpp2
-rw-r--r--src/usermanager.cpp4
-rw-r--r--src/xline.cpp4
5 files changed, 9 insertions, 9 deletions
diff --git a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf.example
index 60527ce75..ee268dcd2 100644
--- 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 09a00daeb..0d514e41d 100644
--- 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 e697113e2..d7d448bc4 100644
--- 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 605bc1f69..538feaade 100644
--- 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 44ae1e98e..bc8e596bd 100644
--- 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());