diff options
| -rw-r--r-- | src/commands/cmd_eline.cpp | 6 | ||||
| -rw-r--r-- | src/commands/cmd_gline.cpp | 7 | ||||
| -rw-r--r-- | src/commands/cmd_kline.cpp | 9 | ||||
| -rw-r--r-- | src/snomasks.cpp | 2 |
4 files changed, 4 insertions, 20 deletions
diff --git a/src/commands/cmd_eline.cpp b/src/commands/cmd_eline.cpp index 6a43193b2..2fdb29679 100644 --- a/src/commands/cmd_eline.cpp +++ b/src/commands/cmd_eline.cpp @@ -39,12 +39,6 @@ CmdResult CommandEline::Handle (const char** parameters, int pcnt, User *user) if (ServerInstance->HostMatchesEveryone(ih.first+"@"+ih.second,user)) return CMD_FAILURE; - if (!strchr(parameters[0],'@')) - { - user->WriteServ("NOTICE %s :*** E-Line must contain a username, e.g. *@%s",user->nick,parameters[0]); - return CMD_FAILURE; - } - long duration = ServerInstance->Duration(parameters[1]); ELine* el = new ELine(ServerInstance, ServerInstance->Time(), duration, user->nick, parameters[2], ih.first.c_str(), ih.second.c_str()); diff --git a/src/commands/cmd_gline.cpp b/src/commands/cmd_gline.cpp index 929bccf9f..37a15c210 100644 --- a/src/commands/cmd_gline.cpp +++ b/src/commands/cmd_gline.cpp @@ -39,14 +39,9 @@ CmdResult CommandGline::Handle (const char** parameters, int pcnt, User *user) if (ServerInstance->HostMatchesEveryone(ih.first+"@"+ih.second,user)) return CMD_FAILURE; - if (!strchr(parameters[0],'@')) - { - user->WriteServ("NOTICE %s :*** G-Line must contain a username, e.g. *@%s",user->nick,parameters[0]); - return CMD_FAILURE; - } else if (strchr(parameters[0],'!')) { - user->WriteServ("NOTICE %s :*** G-Line cannot contain a nickname!",user->nick); + user->WriteServ("NOTICE %s :*** G-Line cannot operate on nick!user@host masks",user->nick); return CMD_FAILURE; } diff --git a/src/commands/cmd_kline.cpp b/src/commands/cmd_kline.cpp index 5efd6e2e4..50f9ebf08 100644 --- a/src/commands/cmd_kline.cpp +++ b/src/commands/cmd_kline.cpp @@ -39,14 +39,9 @@ CmdResult CommandKline::Handle (const char** parameters, int pcnt, User *user) if (ServerInstance->HostMatchesEveryone(ih.first+"@"+ih.second,user)) return CMD_FAILURE; - if (!strchr(parameters[0],'@')) - { - user->WriteServ("NOTICE %s :*** K-Line must contain a username, e.g. *@%s",user->nick,parameters[0]); - return CMD_FAILURE; - } - else if (strchr(parameters[0],'!')) + if (strchr(parameters[0],'!')) { - user->WriteServ("NOTICE %s :*** K-Line cannot contain a nickname!",user->nick); + user->WriteServ("NOTICE %s :*** K-Line cannot operate on nick!user@host masks",user->nick); return CMD_FAILURE; } diff --git a/src/snomasks.cpp b/src/snomasks.cpp index 32c77e99f..6385af9c0 100644 --- a/src/snomasks.cpp +++ b/src/snomasks.cpp @@ -122,7 +122,7 @@ void Snomask::Flush() if (this->LastMessage.empty()) return; - ServerInstance->Log(DEBUG, "Flusing snomask %s", this->Description.c_str()); + ServerInstance->Logs->Log("SNOMASK", DEBUG, "Flushing snomask %s", this->Description.c_str()); /* Only opers can receive snotices, so we iterate the oper list */ for (std::list<User*>::iterator i = ServerInstance->Users->all_opers.begin(); i != ServerInstance->Users->all_opers.end(); i++) |