X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodes%2Fcmode_l.cpp;h=fce1952002bd0a21a71228030a2a570cde7964aa;hb=df37ab42f454e3a96d59a2a86eb76bcb4af0818a;hp=1e0caa39d86b6b6ed0ea45d23ea37240341f1215;hpb=b21e2d1c1665bcffb9c86fb3d170247f026737ad;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modes/cmode_l.cpp b/src/modes/cmode_l.cpp
index 1e0caa39d..fce195200 100644
--- a/src/modes/cmode_l.cpp
+++ b/src/modes/cmode_l.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -17,30 +17,17 @@
 #include "users.h"
 #include "modes/cmode_l.h"
 
-ModeChannelLimit::ModeChannelLimit(InspIRCd* Instance) : ModeHandler(Instance, 'l', 1, 0, false, MODETYPE_CHANNEL, false)
+ModeChannelLimit::ModeChannelLimit() : ModeHandler(NULL, "limit", 'l', PARAM_SETONLY, MODETYPE_CHANNEL)
 {
 }
 
-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)
+ModeAction ModeChannelLimit::OnModeChange(User*, User*, Channel* channel, std::string &parameter, bool adding)
 {
 	if (adding)
 	{
@@ -51,20 +38,10 @@ ModeAction ModeChannelLimit::OnModeChange(User*, User*, Channel* channel, std::s
 		if (limit < 0)
 			limit = 0x7FFF;
 
-		/* If the new limit is the same as the old limit,
-		 * and the old limit isnt 0, disallow */
-		std::string oldlimit = channel->GetModeParameter('l');
-		if (limit == atoi(oldlimit.c_str()) && oldlimit != "0")
-		{
-			parameter = "";
-			return MODEACTION_DENY;
-		}
-
 		parameter = ConvToStr(limit);
 
 		/* Set new limit */
-		channel->SetModeParam('l', parameter.c_str(), true);
-		channel->modes[CM_LIMIT] = 1;
+		channel->SetModeParam('l', parameter);
 
 		return MODEACTION_ALLOW;
 	}
@@ -80,9 +57,7 @@ ModeAction ModeChannelLimit::OnModeChange(User*, User*, Channel* channel, std::s
 		}
 
 		/* Removing old limit, no checks here */
-		channel->SetModeParam('l', "", false);
-		channel->modes[CM_LIMIT] = 0;
-
+		channel->SetModeParam('l', "");
 		return MODEACTION_ALLOW;
 	}
 }