...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 e0293de7297e83e95db65ce3f70c68f69ef6a0b2..490bcb02a0e52351b0569dc1214b7b29e0c7c2d0 100644 (file)
--- a/src/modes/cmode_l.cpp
+++ b/src/modes/cmode_l.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -17,60 +17,23 @@
 #include "users.h"
 #include "modes/cmode_l.h"
 
-ModeChannelLimit::ModeChannelLimit(InspIRCd* Instance) : ModeHandler(Instance, NULL, 'l', 1, 0, false, MODETYPE_CHANNEL, false)
+ModeChannelLimit::ModeChannelLimit() : ParamChannelModeHandler(NULL, "limit", 'l')
 {
 }
 
-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(std::string &their_param, const std::string &our_param, 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(User*, User*, Channel* channel, std::string &parameter, bool adding, bool servermode)
+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;
-
-               parameter = ConvToStr(limit);
-
-               /* Set new limit */
-               channel->SetModeParam('l', parameter);
+       int limit = atoi(parameter.c_str());
 
-               return MODEACTION_ALLOW;
-       }
-       else
-       {
-               /* Check if theres a limit here to remove.
-                * If there isnt, dont allow the -l
-                */
-               if (channel->GetModeParameter('l').empty())
-               {
-                       parameter = "";
-                       return MODEACTION_DENY;
-               }
+       if (limit < 0)
+               return false;
 
-               /* Removing old limit, no checks here */
-               channel->SetModeParam('l', "");
-               return MODEACTION_ALLOW;
-       }
+       parameter = ConvToStr(limit);
+       return true;
 }