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

diff --git a/src/modes/cmode_l.cpp b/src/modes/cmode_l.cpp
index a5fa5329b..1aea53a61 100644
--- a/src/modes/cmode_l.cpp
+++ b/src/modes/cmode_l.cpp
@@ -1,18 +1,32 @@
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
 #include "inspircd.h"
 #include "mode.h"
 #include "channels.h"
 #include "users.h"
 #include "modes/cmode_l.h"
 
-ModeChannelLimit::ModeChannelLimit() : ModeHandler('l', 1, 0, false, MODETYPE_CHANNEL, false)
+ModeChannelLimit::ModeChannelLimit(InspIRCd* Instance) : ModeHandler(NULL, 'l', PARAM_SETONLY, MODETYPE_CHANNEL)
 {
 }
 
-std::pair<bool,std::string> ModeChannelLimit::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+ModePair ModeChannelLimit::ModeSet(User*, User*, Channel* channel, const std::string &parameter)
 {
-	if (channel->limit)
+	std::string climit = channel->GetModeParameter('l');
+	if (!climit.empty())
 	{
-		return std::make_pair(true, ConvToStr(channel->limit));
+		return std::make_pair(true, climit);
 	}
 	else
 	{
@@ -20,7 +34,13 @@ std::pair<bool,std::string> ModeChannelLimit::ModeSet(userrec* source, userrec*
 	}
 }
 
-ModeAction ModeChannelLimit::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+bool ModeChannelLimit::CheckTimeStamp(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)
 {
 	if (adding)
 	{
@@ -31,28 +51,10 @@ ModeAction ModeChannelLimit::OnModeChange(userrec* source, userrec* dest, chanre
 		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;
+		channel->SetModeParam('l', parameter);
 
 		return MODEACTION_ALLOW;
 	}
@@ -61,18 +63,14 @@ ModeAction ModeChannelLimit::OnModeChange(userrec* source, userrec* dest, chanre
 		/* Check if theres a limit here to remove.
 		 * If there isnt, dont allow the -l
 		 */
-		if (!channel->limit)
+		if (channel->GetModeParameter('l').empty())
 		{
 			parameter = "";
 			return MODEACTION_DENY;
 		}
 
 		/* Removing old limit, no checks here */
-		channel->limit = 0;
-		channel->modes[CM_LIMIT] = 0;
-
+		channel->SetModeParam('l', "");
 		return MODEACTION_ALLOW;
 	}
-
-	return MODEACTION_DENY;
 }