Simplify ModeHandler constructor

[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 50ee2868385a4d54b3211549480970b2eceb8562..1aea53a612c84a48cad423d5de399e727270aeee 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-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -17,15 +17,16 @@
 #include "users.h"
 #include "modes/cmode_l.h"
 
-ModeChannelLimit::ModeChannelLimit(InspIRCd* Instance) : ModeHandler(Instance, 'l', 1, 0, false, MODETYPE_CHANNEL, false)
+ModeChannelLimit::ModeChannelLimit(InspIRCd* Instance) : ModeHandler(NULL, 'l', PARAM_SETONLY, MODETYPE_CHANNEL)
 {
 }
 
-ModePair ModeChannelLimit::ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
+ModePair ModeChannelLimit::ModeSet(User*, User*, Channel* channel, const std::string &parameter)
 {
-       if (channel->limit)
+       std::string climit = channel->GetModeParameter('l');
+       if (!climit.empty())
        {
-               return std::make_pair(true, ConvToStr(channel->limit));
+               return std::make_pair(true, climit);
        }
        else
        {
@@ -33,13 +34,13 @@ ModePair ModeChannelLimit::ModeSet(User* source, User* dest, Channel* channel, c
        }
 }
 
-bool ModeChannelLimit::CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, Channel* channel)
+bool ModeChannelLimit::CheckTimeStamp(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* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+ModeAction ModeChannelLimit::OnModeChange(User*, User*, Channel* channel, std::string &parameter, bool adding)
 {
        if (adding)
        {
@@ -50,28 +51,10 @@ ModeAction ModeChannelLimit::OnModeChange(User* source, User* dest, Channel* cha
                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;
+               channel->SetModeParam('l', parameter);
 
                return MODEACTION_ALLOW;
        }
@@ -80,18 +63,14 @@ ModeAction ModeChannelLimit::OnModeChange(User* source, User* dest, Channel* cha
                /* 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->modes[CM_LIMIT] = 0;
-
+               channel->SetModeParam('l', "");
                return MODEACTION_ALLOW;
        }
-
-       return MODEACTION_DENY;
 }