X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcoremods%2Fcore_xline%2Fcmd_kline.cpp;h=813b9afa6ad4094927d806998c17d972a497afd4;hb=f2e3fd5952b23209b084bde4f464e6643c8a00ff;hp=50ab883984d98dad2591fba89c634495aa493938;hpb=8f5efbc7aa33b792e02d01e3288f553e6e98ccaa;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/coremods/core_xline/cmd_kline.cpp b/src/coremods/core_xline/cmd_kline.cpp
index 50ab88398..813b9afa6 100644
--- a/src/coremods/core_xline/cmd_kline.cpp
+++ b/src/coremods/core_xline/cmd_kline.cpp
@@ -26,15 +26,14 @@ CommandKline::CommandKline(Module* parent)
 	: Command(parent, "KLINE", 1, 3)
 {
 	flags_needed = 'o';
-	Penalty = 0;
 	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)
 	{
@@ -49,11 +48,11 @@ 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;
+		}
 
 		InsaneBan::IPHostMatcher matcher;
 		if (InsaneBan::MatchesEveryone(ih.first+"@"+ih.second, matcher, user, "K", "hostmasks"))
@@ -61,11 +60,16 @@ CmdResult CommandKline::Handle (const std::vector<std::string>& parameters, User
 
 		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))
 		{
@@ -86,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
@@ -97,7 +101,7 @@ 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.");
 		}
 	}