Add Module* creator to Command and ModeHandler

[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 ee3d574e07e9b1ca70385f79250935772e005e41..e0293de7297e83e95db65ce3f70c68f69ef6a0b2 100644 (file)
--- a/src/modes/cmode_l.cpp
+++ b/src/modes/cmode_l.cpp
@@ -17,7 +17,7 @@
 #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(Instance, NULL, 'l', 1, 0, false, MODETYPE_CHANNEL, false)
 {
 }
 
@@ -34,7 +34,7 @@ ModePair ModeChannelLimit::ModeSet(User*, User*, Channel* channel, const std::st
        }
 }
 
-bool ModeChannelLimit::CheckTimeStamp(time_t, time_t, const std::string &their_param, const std::string &our_param, 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()));
@@ -51,20 +51,10 @@ ModeAction ModeChannelLimit::OnModeChange(User*, User*, Channel* channel, std::s
                if (limit < 0)
                        limit = 0x7FFF;
 
-               /* If the new limit is the same as the old limit,
-                * and the old limit isnt 0, disallow */
-               std::string oldlimit = channel->GetModeParameter('l');
-               if (limit == atoi(oldlimit.c_str()) && oldlimit != "0")
-               {
-                       parameter = "";
-                       return MODEACTION_DENY;
-               }
-
                parameter = ConvToStr(limit);
 
                /* Set new limit */
-               channel->SetModeParam('l', parameter.c_str(), true);
-               channel->modes[CM_LIMIT] = 1;
+               channel->SetModeParam('l', parameter);
 
                return MODEACTION_ALLOW;
        }
@@ -80,9 +70,7 @@ ModeAction ModeChannelLimit::OnModeChange(User*, User*, Channel* channel, std::s
                }
 
                /* Removing old limit, no checks here */
-               channel->SetModeParam('l', "", false);
-               channel->modes[CM_LIMIT] = 0;
-
+               channel->SetModeParam('l', "");
                return MODEACTION_ALLOW;
        }
 }