Remove "servermode" parameter, replace with IS_FAKE() which is more reliable

[user/henk/code/inspircd.git] / src / modules / m_kicknorejoin.cpp

diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp
index cd027f089b9c56f1ec05cbc1826c9d324ddf188a..5327c0592e67e821036aa49388e5330e3c498ede 100644 (file)
--- a/src/modules/m_kicknorejoin.cpp
+++ b/src/modules/m_kicknorejoin.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 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.
@@ -30,7 +30,7 @@ typedef std::map<User*, time_t> delaylist;
 class KickRejoin : public ModeHandler
 {
  public:
-       KickRejoin(InspIRCd* Instance) : ModeHandler(Instance, 'J', 1, 0, false, MODETYPE_CHANNEL, false) { }
+       KickRejoin(InspIRCd* Instance, Module* Creator) : ModeHandler(Instance, Creator, 'J', 1, 0, false, MODETYPE_CHANNEL, false) { }
 
        ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
        {
@@ -40,13 +40,7 @@ class KickRejoin : public ModeHandler
                        return std::make_pair(false, parameter);
        }
 
-       bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, Channel* channel)
-       {
-               /* When TS is equal, the alphabetically later one wins */
-               return (their_param < our_param);
-       }
-
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
                if (!adding)
                {
@@ -65,7 +59,7 @@ class KickRejoin : public ModeHandler
                        }
                        else
                        {
-                               channel->SetMode('J', false);
+                               channel->SetModeParam('J', "");
                                return MODEACTION_ALLOW;
                        }
                }
@@ -74,8 +68,7 @@ class KickRejoin : public ModeHandler
                        if (!channel->IsModeSet('J'))
                        {
                                parameter = ConvToStr(atoi(parameter.c_str()));
-                               channel->SetModeParam('J', parameter.c_str(), adding);
-                               channel->SetMode('J', adding);
+                               channel->SetModeParam('J', parameter);
                                return MODEACTION_ALLOW;
                        }
                        else
@@ -90,11 +83,9 @@ class KickRejoin : public ModeHandler
                                {
                                        // new mode param, replace old with new
                                        parameter = ConvToStr(atoi(parameter.c_str()));
-                                       cur_param = ConvToStr(atoi(cur_param.c_str()));
                                        if (parameter != "0")
                                        {
-                                               channel->SetModeParam('J', cur_param.c_str(), false);
-                                               channel->SetModeParam('J', parameter.c_str(), adding);
+                                               channel->SetModeParam('J', parameter);
                                                return MODEACTION_ALLOW;
                                        }
                                        else
@@ -115,16 +106,14 @@ class KickRejoin : public ModeHandler
 class ModuleKickNoRejoin : public Module
 {
 
-       KickRejoin* kr;
+       KickRejoin kr;
 
 public:
 
        ModuleKickNoRejoin(InspIRCd* Me)
-               : Module(Me)
+               : Module(Me), kr(Me, this)
        {
-
-               kr = new KickRejoin(ServerInstance);
-               if (!ServerInstance->Modes->AddMode(kr))
+               if (!ServerInstance->Modes->AddMode(&kr))
                        throw ModuleException("Could not add new modes!");
                Implementation eventlist[] = { I_OnCleanup, I_OnChannelDelete, I_OnUserPreJoin, I_OnUserKick };
                ServerInstance->Modules->Attach(eventlist, this, 4);
@@ -141,7 +130,7 @@ public:
 
                                for (delaylist::iterator iter = dl->begin(); iter != dl->end(); iter++)
                                {
-                                       if (iter->second > time(NULL))
+                                       if (iter->second > ServerInstance->Time())
                                        {
                                                if (iter->first == user)
                                                {
@@ -180,7 +169,7 @@ public:
                                dl = new delaylist;
                                chan->Extend("norejoinusers", dl);
                        }
-                       (*dl)[user] = time(NULL) + strtoint(chan->GetModeParameter('J'));
+                       (*dl)[user] = ServerInstance->Time() + strtoint(chan->GetModeParameter('J'));
                }
        }
 
@@ -204,8 +193,7 @@ public:
 
        virtual ~ModuleKickNoRejoin()
        {
-               ServerInstance->Modes->DelMode(kr);
-               delete kr;
+               ServerInstance->Modes->DelMode(&kr);
        }
 
        virtual Version GetVersion()