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

diff --git a/src/modes/cmode_l.cpp b/src/modes/cmode_l.cpp
index 10ff3135a..1e0caa39d 100644
--- a/src/modes/cmode_l.cpp
+++ b/src/modes/cmode_l.cpp
@@ -1,14 +1,46 @@
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/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(Instance, 'l', 1, 0, false, MODETYPE_CHANNEL, false)
 {
 }
 
-ModeAction ModeChannelLimit::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+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*)
+{
+	/* 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)
 {
 	if (adding)
 	{
@@ -21,16 +53,8 @@ ModeAction ModeChannelLimit::OnModeChange(userrec* source, userrec* dest, chanre
 
 		/* 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)
+		std::string oldlimit = channel->GetModeParameter('l');
+		if (limit == atoi(oldlimit.c_str()) && oldlimit != "0")
 		{
 			parameter = "";
 			return MODEACTION_DENY;
@@ -39,7 +63,7 @@ ModeAction ModeChannelLimit::OnModeChange(userrec* source, userrec* dest, chanre
 		parameter = ConvToStr(limit);
 
 		/* Set new limit */
-		channel->limit = limit;
+		channel->SetModeParam('l', parameter.c_str(), true);
 		channel->modes[CM_LIMIT] = 1;
 
 		return MODEACTION_ALLOW;
@@ -49,18 +73,16 @@ 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->SetModeParam('l', "", false);
 		channel->modes[CM_LIMIT] = 0;
 
 		return MODEACTION_ALLOW;
 	}
-
-	return MODEACTION_DENY;
 }