Improve X-line text consistency.

[user/henk/code/inspircd.git] / src / coremods / core_xline / cmd_kline.cpp

diff --git a/src/coremods/core_xline/cmd_kline.cpp b/src/coremods/core_xline/cmd_kline.cpp
index c6a8c7cad6b46483a5d5603ffe30f0cfaee1847d..813b9afa6ad4094927d806998c17d972a497afd4 100644 (file)
--- a/src/coremods/core_xline/cmd_kline.cpp
+++ b/src/coremods/core_xline/cmd_kline.cpp
@@ -20,29 +20,20 @@
 
 #include "inspircd.h"
 #include "xline.h"
+#include "core_xline.h"
 
-/** Handle /KLINE.
- */
-class CommandKline : public Command
+CommandKline::CommandKline(Module* parent)
+       : Command(parent, "KLINE", 1, 3)
 {
- public:
-       /** Constructor for kline.
-        */
-       CommandKline ( Module* parent) : Command(parent,"KLINE",1,3) { flags_needed = 'o'; Penalty = 0; syntax = "<ident@host> [<duration> :<reason>]"; }
-       /** Handle command.
-        * @param parameters The parameters to the command
-        * @param user The user issuing the command
-        * @return A value from CmdResult to indicate command success or failure.
-        */
-       CmdResult Handle(const std::vector<std::string>& parameters, User *user);
-};
-
+       flags_needed = 'o';
+       syntax = "<ident@host> [<duration> :<reason>]";
+}
 
 /** Handle /KLINE
  */
-CmdResult CommandKline::Handle (const std::vector<std::string>& parameters, User *user)
+CmdResult CommandKline::Handle(User* user, const Params& parameters)
 {
-    std::string target = parameters[0];
+       std::string target = parameters[0];
 
        if (parameters.size() >= 3)
        {
@@ -57,22 +48,28 @@ CmdResult CommandKline::Handle (const std::vector<std::string>& parameters, User
                else
                        ih = ServerInstance->XLines->IdentSplit(target);
 
-        if (ih.first.empty())
-        {
-            user->WriteNotice("*** Target not found");
-            return CMD_FAILURE;
-        }
+               if (ih.first.empty())
+               {
+                       user->WriteNotice("*** Target not found.");
+                       return CMD_FAILURE;
+               }
 
-               if (ServerInstance->HostMatchesEveryone(ih.first+"@"+ih.second,user))
+               InsaneBan::IPHostMatcher matcher;
+               if (InsaneBan::MatchesEveryone(ih.first+"@"+ih.second, matcher, user, "K", "hostmasks"))
                        return CMD_FAILURE;
 
                if (target.find('!') != std::string::npos)
                {
-                       user->WriteNotice("*** K-Line cannot operate on nick!user@host masks");
+                       user->WriteNotice("*** K-line cannot operate on nick!user@host masks.");
                        return CMD_FAILURE;
                }
 
-               unsigned long duration = InspIRCd::Duration(parameters[1]);
+               unsigned long duration;
+               if (!InspIRCd::Duration(parameters[1], duration))
+               {
+                       user->WriteNotice("*** Invalid duration for K-line.");
+                       return CMD_FAILURE;
+               }
                KLine* kl = new KLine(ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), ih.first.c_str(), ih.second.c_str());
                if (ServerInstance->XLines->AddLine(kl,user))
                {
@@ -93,7 +90,7 @@ CmdResult CommandKline::Handle (const std::vector<std::string>& parameters, User
                else
                {
                        delete kl;
-                       user->WriteNotice("*** K-Line for " + target + " already exists");
+                       user->WriteNotice("*** K-line for " + target + " already exists.");
                }
        }
        else
@@ -104,11 +101,9 @@ CmdResult CommandKline::Handle (const std::vector<std::string>& parameters, User
                }
                else
                {
-                       user->WriteNotice("*** K-Line " + target + " not found in list, try /stats k.");
+                       user->WriteNotice("*** K-line " + target + " not found in list, try /stats k.");
                }
        }
 
        return CMD_SUCCESS;
 }
-
-COMMAND_INIT(CommandKline)