X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodes%2Fcmode_l.cpp;h=001d058bbfab9c6b2132f2e90706a63a2b19284e;hb=748b3a0d89e7ecc9a766471b79fb78f63a5ca2bb;hp=185cbdedb93c0ff040e1bfd85659e35deb73d453;hpb=4260fd62272dbd0de84f51bedbd5dd4a088afb1a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modes/cmode_l.cpp b/src/modes/cmode_l.cpp
index 185cbdedb..001d058bb 100644
--- a/src/modes/cmode_l.cpp
+++ b/src/modes/cmode_l.cpp
@@ -1,64 +1,47 @@
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006 Craig Edwards <craigedwards@brainbox.cc>
+ *
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
 #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() : ParamChannelModeHandler(NULL, "limit", 'l')
 {
 }
 
-ModeAction ModeChannelLimit::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+bool ModeChannelLimit::ResolveModeConflict(std::string &their_param, const std::string &our_param, Channel*)
 {
-	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;
-		}
-
-		/* 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;
-		}
+	/* When TS is equal, the higher channel limit wins */
+	return (atoi(their_param.c_str()) < atoi(our_param.c_str()));
+}
 
-		/* Removing old limit, no checks here */
-		channel->limit = 0;
-		channel->modes[CM_LIMIT] = 0;
+bool ModeChannelLimit::ParamValidate(std::string &parameter)
+{
+	int limit = atoi(parameter.c_str());
 
-		return MODEACTION_ALLOW;
-	}
+	if (limit < 0)
+		return false;
 
-	return MODEACTION_DENY;
+	parameter = ConvToStr(limit);
+	return true;
 }