X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_timedbans.cpp;h=83488a9546dbf5b893c440e29de777830a7b0d2c;hb=ac0d5abaace6521643b213423bf57625abe9dd41;hp=058028f61aa96997da25da5ae3f19778164e4472;hpb=b2ac8cc0a6405946a388b80df3be21bc276a61f3;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp
index 058028f61..83488a954 100644
--- a/src/modules/m_timedbans.cpp
+++ b/src/modules/m_timedbans.cpp
@@ -84,13 +84,13 @@ class CommandTban : public Command
 		}
 
 		TimedBan T;
-		unsigned long duration = InspIRCd::Duration(parameters[1]);
-		unsigned long expire = duration + ServerInstance->Time();
-		if (duration < 1)
+		unsigned long duration;
+		if (!InspIRCd::Duration(parameters[1], duration))
 		{
 			user->WriteNotice("Invalid ban time");
 			return CMD_FAILURE;
 		}
+		unsigned long expire = duration + ServerInstance->Time();
 		std::string mask = parameters[2];
 		bool isextban = ((mask.size() > 2) && (mask[1] == ':'));
 		if (!isextban && !InspIRCd::IsValidMask(mask))
@@ -118,7 +118,7 @@ class CommandTban : public Command
 		T.chan = channel;
 		TimedBanList.push_back(T);
 
-		const std::string addban = user->nick + " added a timed ban on " + mask + " lasting for " + ConvToStr(duration) + " seconds.";
+		const std::string addban = user->nick + " added a timed ban on " + mask + " lasting for " + InspIRCd::DurationString(duration) + ".";
 		// If halfop is loaded, send notice to halfops and above, otherwise send to ops and above
 		PrefixMode* mh = ServerInstance->Modes->FindPrefixMode('h');
 		char pfxchar = (mh && mh->name == "halfop") ? mh->GetPrefix() : '@';