Merge tag 'v2.0.25' into master.

[user/henk/code/inspircd.git] / src / modes / cmode_l.cpp

diff --git a/src/modes/cmode_l.cpp b/src/modes/cmode_l.cpp
index a5fa5329be77bce38de8aaca8bb46e4c45d46c1d..d61b2597b40444da2574c176796293ee784c0402 100644 (file)
--- a/src/modes/cmode_l.cpp
+++ b/src/modes/cmode_l.cpp
@@ -1,78 +1,49 @@
+/*
+ * 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"
+#include "builtinmodes.h"
 
-ModeChannelLimit::ModeChannelLimit() : ModeHandler('l', 1, 0, false, MODETYPE_CHANNEL, false)
+ModeChannelLimit::ModeChannelLimit()
+       : ParamMode<ModeChannelLimit, LocalIntExt>(NULL, "limit", 'l')
 {
 }
 
-std::pair<bool,std::string> ModeChannelLimit::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+bool ModeChannelLimit::ResolveModeConflict(std::string &their_param, const std::string &our_param, Channel*)
 {
-       if (channel->limit)
-       {
-               return std::make_pair(true, ConvToStr(channel->limit));
-       }
-       else
-       {
-               return std::make_pair(false, parameter);
-       }
+       /* 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::OnSet(User* user, Channel* chan, std::string& parameter)
 {
-       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;
-               }
-
-               parameter = ConvToStr(limit);
+       int limit = ConvToInt(parameter);
+       if (limit < 0)
+               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;
-               }
-
-               /* Removing old limit, no checks here */
-               channel->limit = 0;
-               channel->modes[CM_LIMIT] = 0;
-
-               return MODEACTION_ALLOW;
-       }
+       ext.set(chan, limit);
+       return MODEACTION_ALLOW;
+}
 
-       return MODEACTION_DENY;
+void ModeChannelLimit::SerializeParam(Channel* chan, intptr_t n, std::string& out)
+{
+       out += ConvToStr(n);
 }