summaryrefslogtreecommitdiff
path: root/src/coremods
diff options
context:
space:
mode:
Diffstat (limited to 'src/coremods')
-rw-r--r--src/coremods/core_channel/core_channel.cpp6
-rw-r--r--src/coremods/core_dns.cpp2
-rw-r--r--src/coremods/core_info/cmd_admin.cpp6
-rw-r--r--src/coremods/core_info/cmd_info.cpp16
-rw-r--r--src/coremods/core_oper/cmd_die.cpp2
-rw-r--r--src/coremods/core_oper/cmd_restart.cpp2
-rw-r--r--src/coremods/core_whois.cpp4
-rw-r--r--src/coremods/core_xline/cmd_eline.cpp2
-rw-r--r--src/coremods/core_xline/cmd_gline.cpp2
-rw-r--r--src/coremods/core_xline/cmd_kline.cpp2
-rw-r--r--src/coremods/core_xline/cmd_qline.cpp2
-rw-r--r--src/coremods/core_xline/cmd_zline.cpp2
-rw-r--r--src/coremods/core_xline/core_xline.cpp2
13 files changed, 25 insertions, 25 deletions
diff --git a/src/coremods/core_channel/core_channel.cpp b/src/coremods/core_channel/core_channel.cpp
index b3319cba1..e95736ccc 100644
--- a/src/coremods/core_channel/core_channel.cpp
+++ b/src/coremods/core_channel/core_channel.cpp
@@ -244,7 +244,7 @@ class CoreModChannel : public Module, public CheckExemption::EventListener
if (!MOD_RESULT.check(InspIRCd::TimingSafeCompare(ckey, keygiven)))
{
// If no key provided, or key is not the right one, and can't bypass +k (not invited or option not enabled)
- user->WriteNumeric(ERR_BADCHANNELKEY, chan->name, "Cannot join channel (Incorrect channel key)");
+ user->WriteNumeric(ERR_BADCHANNELKEY, chan->name, "Cannot join channel (incorrect channel key)");
return MOD_RES_DENY;
}
}
@@ -256,7 +256,7 @@ class CoreModChannel : public Module, public CheckExemption::EventListener
FIRST_MOD_RESULT(OnCheckInvite, MOD_RESULT, (user, chan));
if (MOD_RESULT != MOD_RES_ALLOW)
{
- user->WriteNumeric(ERR_INVITEONLYCHAN, chan->name, "Cannot join channel (Invite only)");
+ user->WriteNumeric(ERR_INVITEONLYCHAN, chan->name, "Cannot join channel (invite only)");
return MOD_RES_DENY;
}
}
@@ -268,7 +268,7 @@ class CoreModChannel : public Module, public CheckExemption::EventListener
FIRST_MOD_RESULT(OnCheckLimit, MOD_RESULT, (user, chan));
if (!MOD_RESULT.check(chan->GetUserCounter() < static_cast<size_t>(limitmode.ext.get(chan))))
{
- user->WriteNumeric(ERR_CHANNELISFULL, chan->name, "Cannot join channel (Channel is full)");
+ user->WriteNumeric(ERR_CHANNELISFULL, chan->name, "Cannot join channel (channel is full)");
return MOD_RES_DENY;
}
}
diff --git a/src/coremods/core_dns.cpp b/src/coremods/core_dns.cpp
index 0e21ff5b4..8532179fb 100644
--- a/src/coremods/core_dns.cpp
+++ b/src/coremods/core_dns.cpp
@@ -36,7 +36,7 @@ namespace DNS
using namespace DNS;
-/** A full packet sent or recieved to/from the nameserver
+/** A full packet sent or received to/from the nameserver
*/
class Packet : public Query
{
diff --git a/src/coremods/core_info/cmd_admin.cpp b/src/coremods/core_info/cmd_admin.cpp
index 8ef68749a..233c7f2c7 100644
--- a/src/coremods/core_info/cmd_admin.cpp
+++ b/src/coremods/core_info/cmd_admin.cpp
@@ -36,8 +36,8 @@ CmdResult CommandAdmin::Handle(User* user, const Params& parameters)
return CMD_SUCCESS;
user->WriteRemoteNumeric(RPL_ADMINME, ServerInstance->Config->ServerName, "Administrative info");
if (!AdminName.empty())
- user->WriteRemoteNumeric(RPL_ADMINLOC1, InspIRCd::Format("Name - %s", AdminName.c_str()));
- user->WriteRemoteNumeric(RPL_ADMINLOC2, InspIRCd::Format("Nickname - %s", AdminNick.c_str()));
- user->WriteRemoteNumeric(RPL_ADMINEMAIL, InspIRCd::Format("E-Mail - %s", AdminEmail.c_str()));
+ user->WriteRemoteNumeric(RPL_ADMINLOC1, InspIRCd::Format("Name: %s", AdminName.c_str()));
+ user->WriteRemoteNumeric(RPL_ADMINLOC2, InspIRCd::Format("Nickname: %s", AdminNick.c_str()));
+ user->WriteRemoteNumeric(RPL_ADMINEMAIL, InspIRCd::Format("Email: %s", AdminEmail.c_str()));
return CMD_SUCCESS;
}
diff --git a/src/coremods/core_info/cmd_info.cpp b/src/coremods/core_info/cmd_info.cpp
index 431175f7a..29518e376 100644
--- a/src/coremods/core_info/cmd_info.cpp
+++ b/src/coremods/core_info/cmd_info.cpp
@@ -31,14 +31,14 @@ CommandInfo::CommandInfo(Module* parent)
}
static const char* const lines[] = {
- " -/\\- \2InspIRCd\2 -\\/-",
+ " -/\\- \002InspIRCd\002 -\\/-",
" November 2002 - Present",
" ",
- "\2Core Developers\2:",
+ "\002Core Developers\002:",
" Attila Molnar, Attila, <attilamolnar@hush.com>",
" Peter Powell, SaberUK, <petpow@saberuk.com>",
" ",
- "\2Former Developers\2:",
+ "\002Former Developers\002:",
" Oliver Lupton, Om, <om@inspircd.org>",
" John Brooks, Special, <special@inspircd.org>",
" Dennis Friis, peavey, <peavey@inspircd.org>",
@@ -47,15 +47,15 @@ static const char* const lines[] = {
" Matt Smith, dz, <dz@inspircd.org>",
" Daniel De Graaf, danieldg, <danieldg@inspircd.org>",
" ",
- "\2Founding Developers\2:",
+ "\002Founding Developers\002:",
" Craig Edwards, Brain, <brain@inspircd.org>",
" Craig McLure, Craig, <craig@inspircd.org>",
" Robin Burchell, w00t, <w00t@inspircd.org>",
" ",
- "\2Active Contributors\2:",
+ "\002Active Contributors\002:",
" Adam linuxdaemon Sheogorath",
" ",
- "\2Former Contributors\2:",
+ "\002Former Contributors\002:",
" dmb Zaba skenmy GreenReaper",
" Dan Jason satmd owine",
" Adremelech John2 jilles HiroP",
@@ -67,10 +67,10 @@ static const char* const lines[] = {
" Namegduf Ankit Phoenix Taros",
" jackmcbarn ChrisTX Shawn Shutter",
" ",
- "\2Thanks To\2:",
+ "\002Thanks To\002:",
" Asmo Brik fraggeln genius3000",
" ",
- " Best experienced with: \2An IRC client\2",
+ " Best experienced with: \002An IRC client\002",
NULL
};
diff --git a/src/coremods/core_oper/cmd_die.cpp b/src/coremods/core_oper/cmd_die.cpp
index 73c590711..48b18bb35 100644
--- a/src/coremods/core_oper/cmd_die.cpp
+++ b/src/coremods/core_oper/cmd_die.cpp
@@ -67,7 +67,7 @@ CmdResult CommandDie::Handle(User* user, const Params& parameters)
else
{
ServerInstance->Logs->Log(MODNAME, LOG_SPARSE, "Failed /DIE command from %s", user->GetFullRealHost().c_str());
- ServerInstance->SNO->WriteGlobalSno('a', "Failed DIE Command from %s.", user->GetFullRealHost().c_str());
+ ServerInstance->SNO->WriteGlobalSno('a', "Failed DIE command from %s.", user->GetFullRealHost().c_str());
return CMD_FAILURE;
}
return CMD_SUCCESS;
diff --git a/src/coremods/core_oper/cmd_restart.cpp b/src/coremods/core_oper/cmd_restart.cpp
index a96993e7e..0ddea5c27 100644
--- a/src/coremods/core_oper/cmd_restart.cpp
+++ b/src/coremods/core_oper/cmd_restart.cpp
@@ -59,7 +59,7 @@ CmdResult CommandRestart::Handle(User* user, const Params& parameters)
}
else
{
- ServerInstance->SNO->WriteGlobalSno('a', "Failed RESTART Command from %s.", user->GetFullRealHost().c_str());
+ ServerInstance->SNO->WriteGlobalSno('a', "Failed RESTART command from %s.", user->GetFullRealHost().c_str());
}
return CMD_FAILURE;
}
diff --git a/src/coremods/core_whois.cpp b/src/coremods/core_whois.cpp
index 199c9e2ac..0755f66f7 100644
--- a/src/coremods/core_whois.cpp
+++ b/src/coremods/core_whois.cpp
@@ -88,7 +88,7 @@ class CommandWhois : public SplitCommand
void SendChanList(WhoisContextImpl& whois);
public:
- /** If true then all opers are shown with a generic 'is an IRC operator' line rather than the oper type. */
+ /** If true then all opers are shown with a generic 'is a server operator' line rather than the oper type. */
bool genericoper;
/** How to handle private/secret channels in the WHOIS response. */
@@ -242,7 +242,7 @@ void CommandWhois::DoWhois(LocalUser* user, User* dest, time_t signon, unsigned
if (dest->IsOper())
{
if (genericoper)
- whois.SendLine(RPL_WHOISOPERATOR, "is an IRC operator");
+ whois.SendLine(RPL_WHOISOPERATOR, "is a server operator");
else
whois.SendLine(RPL_WHOISOPERATOR, InspIRCd::Format("is %s %s on %s", (strchr("AEIOUaeiou",dest->oper->name[0]) ? "an" : "a"), dest->oper->name.c_str(), ServerInstance->Config->Network.c_str()));
}
diff --git a/src/coremods/core_xline/cmd_eline.cpp b/src/coremods/core_xline/cmd_eline.cpp
index 4a56ba7ea..2a9f192ba 100644
--- a/src/coremods/core_xline/cmd_eline.cpp
+++ b/src/coremods/core_xline/cmd_eline.cpp
@@ -94,7 +94,7 @@ CmdResult CommandEline::Handle(User* user, const Params& parameters)
}
else
{
- user->WriteNotice("*** E-line " + target + " not found in list, try /stats e.");
+ user->WriteNotice("*** E-line " + target + " not found on the list.");
}
}
diff --git a/src/coremods/core_xline/cmd_gline.cpp b/src/coremods/core_xline/cmd_gline.cpp
index 3e710978d..05068362f 100644
--- a/src/coremods/core_xline/cmd_gline.cpp
+++ b/src/coremods/core_xline/cmd_gline.cpp
@@ -103,7 +103,7 @@ CmdResult CommandGline::Handle(User* user, const Params& parameters)
}
else
{
- user->WriteNotice("*** G-line " + target + " not found in list, try /stats g.");
+ user->WriteNotice("*** G-line " + target + " not found on the list.");
}
}
diff --git a/src/coremods/core_xline/cmd_kline.cpp b/src/coremods/core_xline/cmd_kline.cpp
index 1ec10aebb..391a70c1d 100644
--- a/src/coremods/core_xline/cmd_kline.cpp
+++ b/src/coremods/core_xline/cmd_kline.cpp
@@ -102,7 +102,7 @@ CmdResult CommandKline::Handle(User* user, const Params& parameters)
}
else
{
- user->WriteNotice("*** K-line " + target + " not found in list, try /stats k.");
+ user->WriteNotice("*** K-line " + target + " not found on the list.");
}
}
diff --git a/src/coremods/core_xline/cmd_qline.cpp b/src/coremods/core_xline/cmd_qline.cpp
index afdc0431e..66ab405ff 100644
--- a/src/coremods/core_xline/cmd_qline.cpp
+++ b/src/coremods/core_xline/cmd_qline.cpp
@@ -81,7 +81,7 @@ CmdResult CommandQline::Handle(User* user, const Params& parameters)
}
else
{
- user->WriteNotice("*** Q-line " + parameters[0] + " not found in list, try /stats q.");
+ user->WriteNotice("*** Q-line " + parameters[0] + " not found on the list.");
return CMD_FAILURE;
}
}
diff --git a/src/coremods/core_xline/cmd_zline.cpp b/src/coremods/core_xline/cmd_zline.cpp
index d32cde295..095f763cc 100644
--- a/src/coremods/core_xline/cmd_zline.cpp
+++ b/src/coremods/core_xline/cmd_zline.cpp
@@ -99,7 +99,7 @@ CmdResult CommandZline::Handle(User* user, const Params& parameters)
}
else
{
- user->WriteNotice("*** Z-line " + target + " not found in list, try /stats Z.");
+ user->WriteNotice("*** Z-line " + target + " not found on the list.");
return CMD_FAILURE;
}
}
diff --git a/src/coremods/core_xline/core_xline.cpp b/src/coremods/core_xline/core_xline.cpp
index c53834fc0..e8f045c58 100644
--- a/src/coremods/core_xline/core_xline.cpp
+++ b/src/coremods/core_xline/core_xline.cpp
@@ -38,7 +38,7 @@ bool InsaneBan::MatchesEveryone(const std::string& mask, MatcherBase& test, User
float percent = ((float)matches / (float)ServerInstance->Users->GetUsers().size()) * 100;
if (percent > itrigger)
{
- ServerInstance->SNO->WriteToSnoMask('a', "\2WARNING\2: %s tried to set a %s-line mask of %s, which covers %.2f%% of the network!", user->nick.c_str(), bantype, mask.c_str(), percent);
+ ServerInstance->SNO->WriteToSnoMask('a', "\002WARNING\002: %s tried to set a %s-line mask of %s, which covers %.2f%% of the network!", user->nick.c_str(), bantype, mask.c_str(), percent);
return true;
}
return false;