...because every now and again, i have to do a massive commit.

[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 1a57a440d30cb0cd3ba97cc097cd72a80a94f115..490bcb02a0e52351b0569dc1214b7b29e0c7c2d0 100644 (file)
--- a/src/modes/cmode_l.cpp
+++ b/src/modes/cmode_l.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -17,81 +17,23 @@
 #include "users.h"
 #include "modes/cmode_l.h"
 
-ModeChannelLimit::ModeChannelLimit(InspIRCd* Instance) : ModeHandler(Instance, 'l', 1, 0, false, MODETYPE_CHANNEL, false)
+ModeChannelLimit::ModeChannelLimit() : ParamChannelModeHandler(NULL, "limit", 'l')
 {
 }
 
-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)
+bool ModeChannelLimit::ParamValidate(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);
-
-               /* 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;
+       int limit = atoi(parameter.c_str());
 
-               return MODEACTION_ALLOW;
-       }
+       if (limit < 0)
+               return false;
 
-       return MODEACTION_DENY;
+       parameter = ConvToStr(limit);
+       return true;
 }