X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcoremods%2Fcore_xline%2Fcmd_zline.cpp;h=31030adce5ce715162e4dba3d9f53a8430b2b71a;hb=f2e3fd5952b23209b084bde4f464e6643c8a00ff;hp=859be1004857e905cb2b9ef14cb8510e9378df8c;hpb=7aab18ae35770fa38aee887a3696d779516c7cb0;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/coremods/core_xline/cmd_zline.cpp b/src/coremods/core_xline/cmd_zline.cpp
index 859be1004..31030adce 100644
--- a/src/coremods/core_xline/cmd_zline.cpp
+++ b/src/coremods/core_xline/cmd_zline.cpp
@@ -27,11 +27,10 @@ CommandZline::CommandZline(Module* parent)
 	: Command(parent, "ZLINE", 1, 3)
 {
 	flags_needed = 'o';
-	Penalty = 0;
 	syntax = "<ipmask> [<duration> :<reason>]";
 }
 
-CmdResult CommandZline::Handle (const std::vector<std::string>& parameters, User *user)
+CmdResult CommandZline::Handle(User* user, const Params& parameters)
 {
 	std::string target = parameters[0];
 
@@ -39,7 +38,7 @@ CmdResult CommandZline::Handle (const std::vector<std::string>& parameters, User
 	{
 		if (target.find('!') != std::string::npos)
 		{
-			user->WriteNotice("*** You cannot include a nickname in a zline, a zline must ban only an IP mask");
+			user->WriteNotice("*** You cannot include a nickname in a Z-line, a Z-line must ban only an IP mask.");
 			return CMD_FAILURE;
 		}
 
@@ -63,7 +62,12 @@ CmdResult CommandZline::Handle (const std::vector<std::string>& parameters, User
 		if (InsaneBan::MatchesEveryone(ipaddr, matcher, user, "Z", "ipmasks"))
 			return CMD_FAILURE;
 
-		unsigned long duration = InspIRCd::Duration(parameters[1]);
+		unsigned long duration;
+		if (!InspIRCd::Duration(parameters[1], duration))
+		{
+			user->WriteNotice("*** Invalid duration for Z-line.");
+			return CMD_FAILURE;
+		}
 		ZLine* zl = new ZLine(ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), ipaddr);
 		if (ServerInstance->XLines->AddLine(zl,user))
 		{
@@ -83,7 +87,7 @@ CmdResult CommandZline::Handle (const std::vector<std::string>& parameters, User
 		else
 		{
 			delete zl;
-			user->WriteNotice("*** Z-Line for " + std::string(ipaddr) + " already exists");
+			user->WriteNotice("*** Z-line for " + std::string(ipaddr) + " already exists.");
 		}
 	}
 	else
@@ -94,7 +98,7 @@ CmdResult CommandZline::Handle (const std::vector<std::string>& parameters, User
 		}
 		else
 		{
-			user->WriteNotice("*** Z-Line " + target + " not found in list, try /stats Z.");
+			user->WriteNotice("*** Z-line " + target + " not found in list, try /stats Z.");
 			return CMD_FAILURE;
 		}
 	}
@@ -104,5 +108,5 @@ CmdResult CommandZline::Handle (const std::vector<std::string>& parameters, User
 
 bool CommandZline::IPMatcher::Check(User* user, const std::string& ip) const
 {
-	return InspIRCd::Match(user->GetIPString(), ip, ascii_case_insensitive_map);
+	return InspIRCd::MatchCIDR(user->GetIPString(), ip, ascii_case_insensitive_map);
 }