X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodes%2Fcmode_l.cpp;h=490bcb02a0e52351b0569dc1214b7b29e0c7c2d0;hb=cd712c40e1b352c05e7ae0f72e0a5e84cdf64323;hp=50ee2868385a4d54b3211549480970b2eceb8562;hpb=b57c7f4e466f72fdd2ac3deca42caa1ea7748338;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modes/cmode_l.cpp b/src/modes/cmode_l.cpp
index 50ee28683..490bcb02a 100644
--- a/src/modes/cmode_l.cpp
+++ b/src/modes/cmode_l.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -17,81 +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* source, User* dest, Channel* channel, const std::string &parameter)
-{
-	if (channel->limit)
-	{
-		return std::make_pair(true, ConvToStr(channel->limit));
-	}
-	else
-	{
-		return std::make_pair(false, parameter);
-	}
-}
-
-bool ModeChannelLimit::CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, Channel* 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* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+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;
-
-		/* If the new limit is the same as the old limit,
-		 * and the old limit isnt 0, disallow */
-		if ((limit == channel->limit) && (channel->limit > 0))
-		{
-			parameter = "";
-			return MODEACTION_DENY;
-		}
-
-		/* They must have specified an invalid number.
-		 * Dont allow +l 0.
-		 */
-		if (!limit)
-		{
-			parameter = "";
-			return MODEACTION_DENY;
-		}
-
-		parameter = ConvToStr(limit);
-
-		/* Set new limit */
-		channel->limit = limit;
-		channel->modes[CM_LIMIT] = 1;
-
-		return MODEACTION_ALLOW;
-	}
-	else
-	{
-		/* Check if theres a limit here to remove.
-		 * If there isnt, dont allow the -l
-		 */
-		if (!channel->limit)
-		{
-			parameter = "";
-			return MODEACTION_DENY;
-		}
-
-		/* Removing old limit, no checks here */
-		channel->limit = 0;
-		channel->modes[CM_LIMIT] = 0;
+	int limit = atoi(parameter.c_str());
 
-		return MODEACTION_ALLOW;
-	}
+	if (limit < 0)
+		return false;
 
-	return MODEACTION_DENY;
+	parameter = ConvToStr(limit);
+	return true;
 }