X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcoremods%2Fcore_xline%2Fcmd_eline.cpp;h=3010e0f61eed7f85102fd99810848bda20fd0df3;hb=f2e3fd5952b23209b084bde4f464e6643c8a00ff;hp=26b49894b708ef36ff166b7a303e4e42bdec7d7f;hpb=3a3ff949670c61a4a8856e1391222e156eb1cd17;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/coremods/core_xline/cmd_eline.cpp b/src/coremods/core_xline/cmd_eline.cpp
index 26b49894b..3010e0f61 100644
--- a/src/coremods/core_xline/cmd_eline.cpp
+++ b/src/coremods/core_xline/cmd_eline.cpp
@@ -31,7 +31,7 @@ CommandEline::CommandEline(Module* parent)
 
 /** Handle /ELINE
  */
-CmdResult CommandEline::Handle (const std::vector<std::string>& parameters, User *user)
+CmdResult CommandEline::Handle(User* user, const Params& parameters)
 {
 	std::string target = parameters[0];
 
@@ -50,7 +50,7 @@ CmdResult CommandEline::Handle (const std::vector<std::string>& parameters, User
 
 		if (ih.first.empty())
 		{
-			user->WriteNotice("*** Target not found");
+			user->WriteNotice("*** Target not found.");
 			return CMD_FAILURE;
 		}
 
@@ -58,7 +58,12 @@ CmdResult CommandEline::Handle (const std::vector<std::string>& parameters, User
 		if (InsaneBan::MatchesEveryone(ih.first+"@"+ih.second, matcher, user, "E", "hostmasks"))
 			return CMD_FAILURE;
 
-		unsigned long duration = InspIRCd::Duration(parameters[1]);
+		unsigned long duration;
+		if (!InspIRCd::Duration(parameters[1], duration))
+		{
+			user->WriteNotice("*** Invalid duration for E-line.");
+			return CMD_FAILURE;
+		}
 		ELine* el = new ELine(ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), ih.first.c_str(), ih.second.c_str());
 		if (ServerInstance->XLines->AddLine(el, user))
 		{
@@ -77,7 +82,7 @@ CmdResult CommandEline::Handle (const std::vector<std::string>& parameters, User
 		else
 		{
 			delete el;
-			user->WriteNotice("*** E-Line for " + target + " already exists");
+			user->WriteNotice("*** E-line for " + target + " already exists.");
 		}
 	}
 	else
@@ -88,7 +93,7 @@ CmdResult CommandEline::Handle (const std::vector<std::string>& parameters, User
 		}
 		else
 		{
-			user->WriteNotice("*** E-Line " + target + " not found in list, try /stats e");
+			user->WriteNotice("*** E-line " + target + " not found in list, try /stats e.");
 		}
 	}