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

diff --git a/src/modes/cmode_l.cpp b/src/modes/cmode_l.cpp
index cdbf0f58f..fce195200 100644
--- a/src/modes/cmode_l.cpp
+++ b/src/modes/cmode_l.cpp
@@ -1,32 +1,33 @@
+/*       +------------------------------------+
+ *       | 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() : ModeHandler(NULL, "limit", 'l', PARAM_SETONLY, MODETYPE_CHANNEL)
 {
 }
 
-ModePair ModeChannelLimit::ModeSet(userrec* source, userrec* dest, chanrec* 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, chanrec* 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(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+ModeAction ModeChannelLimit::OnModeChange(User*, User*, Channel* channel, std::string &parameter, bool adding)
 {
 	if (adding)
 	{
@@ -37,28 +38,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;
 	}
@@ -67,18 +50,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;
 }