X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_repeat.cpp;h=a8dd49e2de1400280c2ccd882a68f68f492fafd7;hb=a032cd90ad5582914759e226085efee5aae1a1ef;hp=3e974c22194caf33db75b646fc293264306549c9;hpb=d5a6054948502625d7f0c235f6faaeea58734de5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_repeat.cpp b/src/modules/m_repeat.cpp
index 3e974c221..a8dd49e2d 100644
--- a/src/modules/m_repeat.cpp
+++ b/src/modules/m_repeat.cpp
@@ -34,7 +34,7 @@ class ChannelSettings
 	unsigned int Backlog;
 	unsigned int Lines;
 	unsigned int Diff;
-	unsigned int Seconds;
+	unsigned long Seconds;
 
 	void serialize(std::string& out) const
 	{
@@ -127,7 +127,7 @@ class RepeatMode : public ParamMode<RepeatMode, SimpleExtItem<ChannelSettings> >
 	{
 	}
 
-	void OnUnset(User* source, Channel* chan)
+	void OnUnset(User* source, Channel* chan) CXX11_OVERRIDE
 	{
 		// Unset the per-membership extension when the mode is removed
 		const Channel::MemberMap& users = chan->GetUsers();
@@ -233,15 +233,15 @@ class RepeatMode : public ParamMode<RepeatMode, SimpleExtItem<ChannelSettings> >
 	void ReadConfig()
 	{
 		ConfigTag* conf = ServerInstance->Config->ConfValue("repeat");
-		ms.MaxLines = conf->getInt("maxlines", 20);
-		ms.MaxBacklog = conf->getInt("maxbacklog", 20);
-		ms.MaxSecs = conf->getDuration("maxtime", conf->getInt("maxsecs", 0));
+		ms.MaxLines = conf->getUInt("maxlines", 20);
+		ms.MaxBacklog = conf->getUInt("maxbacklog", 20);
+		ms.MaxSecs = conf->getDuration("maxtime", conf->getDuration("maxsecs", 0));
 
-		ms.MaxDiff = conf->getInt("maxdistance", 50);
+		ms.MaxDiff = conf->getUInt("maxdistance", 50);
 		if (ms.MaxDiff > 100)
 			ms.MaxDiff = 100;
 
-		unsigned int newsize = conf->getInt("size", 512);
+		unsigned int newsize = conf->getUInt("size", 512);
 		if (newsize > ServerInstance->Config->Limits.MaxLine)
 			newsize = ServerInstance->Config->Limits.MaxLine;
 		Resize(newsize);
@@ -274,10 +274,13 @@ class RepeatMode : public ParamMode<RepeatMode, SimpleExtItem<ChannelSettings> >
 		else
 			settings.Action = ChannelSettings::ACT_KICK;
 
-		if ((settings.Lines = ConvToInt(item)) == 0)
+		if ((settings.Lines = ConvToNum<unsigned int>(item)) == 0)
 			return false;
 
-		if ((!stream.GetToken(item)) || ((settings.Seconds = InspIRCd::Duration(item)) == 0))
+		if (!InspIRCd::Duration(item, settings.Seconds))
+			return false;
+
+		if ((!stream.GetToken(item)) || (settings.Seconds == 0))
 			// Required parameter missing
 			return false;
 
@@ -286,13 +289,13 @@ class RepeatMode : public ParamMode<RepeatMode, SimpleExtItem<ChannelSettings> >
 		if (stream.GetToken(item))
 		{
 			// There is a diff parameter, see if it's valid (> 0)
-			if ((settings.Diff = ConvToInt(item)) == 0)
+			if ((settings.Diff = ConvToNum<unsigned int>(item)) == 0)
 				return false;
 
 			if (stream.GetToken(item))
 			{
 				// There is a backlog parameter, see if it's valid
-				if ((settings.Backlog = ConvToInt(item)) == 0)
+				if ((settings.Backlog = ConvToNum<unsigned int>(item)) == 0)
 					return false;
 
 				// If there are still tokens, then it's invalid because we allow only 4
@@ -306,39 +309,40 @@ class RepeatMode : public ParamMode<RepeatMode, SimpleExtItem<ChannelSettings> >
 
 	bool ValidateSettings(LocalUser* source, Channel* channel, const std::string& parameter, const ChannelSettings& settings)
 	{
-		if (settings.Backlog && !ms.MaxBacklog)
+		if (ms.MaxLines && settings.Lines > ms.MaxLines)
 		{
-			source->WriteNumeric(Numerics::InvalidModeParameter(channel, this, parameter,
-				"Invalid repeat parameter. The server administrator has disabled backlog matching."));
+			source->WriteNumeric(Numerics::InvalidModeParameter(channel, this, parameter, InspIRCd::Format(
+				"Invalid repeat parameter. The line number you specified is too great. Maximum allowed is %u.", ms.MaxLines)));
 			return false;
 		}
 
-		if (settings.Diff)
+		if (ms.MaxSecs && settings.Seconds > ms.MaxSecs)
 		{
-			if (settings.Diff > ms.MaxDiff)
-			{
-				if (ms.MaxDiff == 0)
-					source->WriteNumeric(Numerics::InvalidModeParameter(channel, this, parameter,
-						"Invalid repeat parameter. The server administrator has disabled matching on edit distance."));
-				else
-					source->WriteNumeric(Numerics::InvalidModeParameter(channel, this, parameter, InspIRCd::Format(
-						"Invalid repeat parameter. The distance you specified is too great. Maximum allowed is %u.", ms.MaxDiff)));
-				return false;
-			}
+			source->WriteNumeric(Numerics::InvalidModeParameter(channel, this, parameter, InspIRCd::Format(
+				"Invalid repeat parameter. The seconds you specified is too great. Maximum allowed is %u.", ms.MaxSecs)));
+			return false;
+		}
 
-			if (ms.MaxLines && settings.Lines > ms.MaxLines)
-			{
+		if (settings.Diff && settings.Diff > ms.MaxDiff)
+		{
+			if (ms.MaxDiff == 0)
+				source->WriteNumeric(Numerics::InvalidModeParameter(channel, this, parameter,
+					"Invalid repeat parameter. The server administrator has disabled matching on edit distance."));
+			else
 				source->WriteNumeric(Numerics::InvalidModeParameter(channel, this, parameter, InspIRCd::Format(
-					"Invalid repeat parameter. The line number you specified is too great. Maximum allowed is %u.", ms.MaxLines)));
-				return false;
-			}
+					"Invalid repeat parameter. The distance you specified is too great. Maximum allowed is %u.", ms.MaxDiff)));
+			return false;
+		}
 
-			if (ms.MaxSecs && settings.Seconds > ms.MaxSecs)
-			{
+		if (settings.Backlog && settings.Backlog > ms.MaxBacklog)
+		{
+			if (ms.MaxBacklog == 0)
+				source->WriteNumeric(Numerics::InvalidModeParameter(channel, this, parameter,
+					"Invalid repeat parameter. The server administrator has disabled backlog matching."));
+			else
 				source->WriteNumeric(Numerics::InvalidModeParameter(channel, this, parameter, InspIRCd::Format(
-					"Invalid repeat parameter. The seconds you specified is too great. Maximum allowed is %u.", ms.MaxSecs)));
-				return false;
-			}
+					"Invalid repeat paramter. The backlog you specified is too great. Maximum allowed is %u.", ms.MaxBacklog)));
+			return false;
 		}
 
 		return true;