Strip SUPPORT_IP6LINKS #define

[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 265f96efc5f7d0ec620e784e62f234b75924c41e..9e12b4e185949382df1d24dcfdc067104449d7de 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.
@@ -65,7 +65,7 @@ class KickRejoin : public ModeHandler
                        }
                        else
                        {
-                               channel->SetMode('J', false);
+                               channel->SetModeParam('J', "");
                                return MODEACTION_ALLOW;
                        }
                }
@@ -74,8 +74,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 +89,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
@@ -141,7 +138,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 +177,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'));
                }
        }
 
@@ -210,7 +207,7 @@ public:
 
        virtual Version GetVersion()
        {
-               return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
        }
 };