diff options
| -rw-r--r-- | src/commands/cmd_server.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_delayjoin.cpp | 4 | ||||
| -rw-r--r-- | src/modules/m_mlock.cpp | 3 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/fjoin.cpp | 4 | ||||
| -rw-r--r-- | src/modules/m_sqlauth.cpp | 4 | ||||
| -rw-r--r-- | src/modules/m_swhois.cpp | 4 | ||||
| -rw-r--r-- | src/modules/m_xline_db.cpp | 2 |
7 files changed, 12 insertions, 11 deletions
diff --git a/src/commands/cmd_server.cpp b/src/commands/cmd_server.cpp index cac1b77f1..d54eca392 100644 --- a/src/commands/cmd_server.cpp +++ b/src/commands/cmd_server.cpp @@ -48,7 +48,7 @@ CmdResult CommandServer::Handle (const std::vector<std::string>&, User *user) } else { - user->WriteNumeric(ERR_NOTREGISTERED, "%s :You may not register as a server (servers have seperate ports from clients, change your config)",name.c_str()); + user->WriteNumeric(ERR_NOTREGISTERED, "%s :You may not register as a server (servers have separate ports from clients, change your config)",name.c_str()); } return CMD_FAILURE; } diff --git a/src/modules/m_delayjoin.cpp b/src/modules/m_delayjoin.cpp index 7212b7b84..3a574d485 100644 --- a/src/modules/m_delayjoin.cpp +++ b/src/modules/m_delayjoin.cpp @@ -60,7 +60,7 @@ class ModuleDelayJoin : public Module ModResult OnRawMode(User* user, Channel* channel, const char mode, const std::string ¶m, bool adding, int pcnt); }; -/* $ModDesc: Allows for delay-join channels (+D) where users dont appear to join until they speak */ +/* $ModDesc: Allows for delay-join channels (+D) where users don't appear to join until they speak */ ModeAction DelayJoinMode::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { @@ -88,7 +88,7 @@ ModuleDelayJoin::~ModuleDelayJoin() Version ModuleDelayJoin::GetVersion() { - return Version("Allows for delay-join channels (+D) where users dont appear to join until they speak", VF_VENDOR); + return Version("Allows for delay-join channels (+D) where users don't appear to join until they speak", VF_VENDOR); } void ModuleDelayJoin::OnNamesListItem(User* issuer, Membership* memb, std::string &prefixes, std::string &nick) diff --git a/src/modules/m_mlock.cpp b/src/modules/m_mlock.cpp index 17deb17bd..b5f34c936 100644 --- a/src/modules/m_mlock.cpp +++ b/src/modules/m_mlock.cpp @@ -29,6 +29,7 @@ public: void init() { ServerInstance->Modules->Attach(I_OnPreMode, this); + ServerInstance->Extensions.Register(&this->mlock); } Version GetVersion() @@ -55,7 +56,7 @@ public: for (const char *modes = parameters[1].c_str(); *modes; modes++) { - if (mlock_str->find(*modes)) + if (mlock_str->find(*modes) != std::string::npos) { source->WriteNumeric(742, "%s %c %s :MODE cannot be set due to channel having an active MLOCK restriction policy", channel->name.c_str(), *modes, mlock_str->c_str()); diff --git a/src/modules/m_spanningtree/fjoin.cpp b/src/modules/m_spanningtree/fjoin.cpp index f6adc7620..50775be1d 100644 --- a/src/modules/m_spanningtree/fjoin.cpp +++ b/src/modules/m_spanningtree/fjoin.cpp @@ -80,14 +80,14 @@ CmdResult CommandFJoin::Handle(const std::vector<std::string>& params, User *src if (created) { chan = new Channel(channel, TS); - ServerInstance->SNO->WriteToSnoMask('d', "Creation FJOIN recieved for %s, timestamp: %lu", chan->name.c_str(), (unsigned long)TS); + ServerInstance->SNO->WriteToSnoMask('d', "Creation FJOIN received for %s, timestamp: %lu", chan->name.c_str(), (unsigned long)TS); } else { time_t ourTS = chan->age; if (TS != ourTS) - ServerInstance->SNO->WriteToSnoMask('d', "Merge FJOIN recieved for %s, ourTS: %lu, TS: %lu, difference: %lu", + ServerInstance->SNO->WriteToSnoMask('d', "Merge FJOIN received for %s, ourTS: %lu, TS: %lu, difference: %lu", chan->name.c_str(), (unsigned long)ourTS, (unsigned long)TS, (unsigned long)(ourTS - TS)); /* If our TS is less than theirs, we dont accept their modes */ if (ourTS < TS) diff --git a/src/modules/m_sqlauth.cpp b/src/modules/m_sqlauth.cpp index 98e1c45b6..417d5a4b5 100644 --- a/src/modules/m_sqlauth.cpp +++ b/src/modules/m_sqlauth.cpp @@ -21,7 +21,7 @@ #include "sql.h" #include "hash.h" -/* $ModDesc: Allow/Deny connections based upon an arbitary SQL table */ +/* $ModDesc: Allow/Deny connections based upon an arbitrary SQL table */ enum AuthState { AUTH_STATE_NONE = 0, @@ -162,7 +162,7 @@ class ModuleSQLAuth : public Module Version GetVersion() { - return Version("Allow/Deny connections based upon an arbitary SQL table", VF_VENDOR); + return Version("Allow/Deny connections based upon an arbitrary SQL table", VF_VENDOR); } }; diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp index 7a2963281..dc53f2f0c 100644 --- a/src/modules/m_swhois.cpp +++ b/src/modules/m_swhois.cpp @@ -25,7 +25,7 @@ #include "inspircd.h" -/* $ModDesc: Provides the SWHOIS command which allows setting of arbitary WHOIS lines */ +/* $ModDesc: Provides the SWHOIS command which allows setting of arbitrary WHOIS lines */ /** Handle /SWHOIS */ @@ -133,7 +133,7 @@ class ModuleSWhois : public Module Version GetVersion() { - return Version("Provides the SWHOIS command which allows setting of arbitary WHOIS lines", VF_OPTCOMMON | VF_VENDOR); + return Version("Provides the SWHOIS command which allows setting of arbitrary WHOIS lines", VF_OPTCOMMON | VF_VENDOR); } }; diff --git a/src/modules/m_xline_db.cpp b/src/modules/m_xline_db.cpp index 18f1e2ce2..365602b7e 100644 --- a/src/modules/m_xline_db.cpp +++ b/src/modules/m_xline_db.cpp @@ -246,7 +246,7 @@ class ModuleXLineDB : public Module virtual Version GetVersion() { - return Version("Keeps a dynamic log of all XLines created, and stores them in a seperate conf file (xline.db).", VF_VENDOR); + return Version("Keeps a dynamic log of all XLines created, and stores them in a separate conf file (xline.db).", VF_VENDOR); } }; |