X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodes%2Fcmode_l.cpp;h=53a06949dc003d45857ed119aa420b92a3ef5732;hb=8ab1381e8d277152d99a72f33f3d1c0564060fee;hp=f20256e875a1a9a0478974c6486379dddb995b63;hpb=d2a71fd3447c8bac65cc26077e2b9fc3fb0b28a7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modes/cmode_l.cpp b/src/modes/cmode_l.cpp
index f20256e87..53a06949d 100644
--- a/src/modes/cmode_l.cpp
+++ b/src/modes/cmode_l.cpp
@@ -17,60 +17,23 @@
 #include "users.h"
 #include "modes/cmode_l.h"
 
-ModeChannelLimit::ModeChannelLimit(InspIRCd* Instance) : ModeHandler(Instance, 'l', 1, 0, false, MODETYPE_CHANNEL, false)
+ModeChannelLimit::ModeChannelLimit() : ParamChannelModeHandler(NULL, "limit", 'l')
 {
 }
 
-ModePair ModeChannelLimit::ModeSet(User*, User*, Channel* channel, const std::string &parameter)
-{
-	std::string climit = channel->GetModeParameter('l');
-	if (!climit.empty())
-	{
-		return std::make_pair(true, climit);
-	}
-	else
-	{
-		return std::make_pair(false, parameter);
-	}
-}
-
-bool ModeChannelLimit::CheckTimeStamp(time_t, time_t, const std::string &their_param, const std::string &our_param, Channel*)
+bool ModeChannelLimit::ResolveModeConflict(std::string &their_param, const std::string &our_param, Channel*)
 {
 	/* When TS is equal, the higher channel limit wins */
 	return (atoi(their_param.c_str()) < atoi(our_param.c_str()));
 }
 
-ModeAction ModeChannelLimit::OnModeChange(User*, User*, Channel* channel, std::string &parameter, bool adding, bool servermode)
+bool ModeChannelLimit::ParamValidate(std::string &parameter)
 {
-	if (adding)
-	{
-		/* Setting a new limit, sanity check */
-		long limit = atoi(parameter.c_str());
-
-		/* Wrap low values at 32768 */
-		if (limit < 0)
-			limit = 0x7FFF;
-
-		parameter = ConvToStr(limit);
-
-		/* Set new limit */
-		channel->SetModeParam('l', parameter);
+	int limit = atoi(parameter.c_str());
 
-		return MODEACTION_ALLOW;
-	}
-	else
-	{
-		/* Check if theres a limit here to remove.
-		 * If there isnt, dont allow the -l
-		 */
-		if (channel->GetModeParameter('l').empty())
-		{
-			parameter = "";
-			return MODEACTION_DENY;
-		}
+	if (limit < 0)
+		return false;
 
-		/* Removing old limit, no checks here */
-		channel->SetModeParam('l', "");
-		return MODEACTION_ALLOW;
-	}
+	parameter = ConvToStr(limit);
+	return true;
 }