Remove unneeded headers from spanningtree. This was done to the rest of the source...

[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 9bbb5f4569bc0b14c4d48034912be092536209a8..6a684206f2bede7928c32a90d82527e4b1347201 100644 (file)
--- a/src/modules/m_kicknorejoin.cpp
+++ b/src/modules/m_kicknorejoin.cpp
@@ -11,19 +11,10 @@
  * ---------------------------------------------------
  */
 
-#include <time.h>
-#include <map>
-#include <vector>
-#include <sstream>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides channel mode +J (delay rejoin after kick) */
 
-
-
 inline int strtoint(const std::string &str)
 {
        std::istringstream ss(str);
@@ -41,15 +32,15 @@ class KickRejoin : public ModeHandler
  public:
        KickRejoin(InspIRCd* Instance) : ModeHandler(Instance, 'J', 1, 0, false, MODETYPE_CHANNEL, false) { }
 
-        ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
-        {
-                if (channel->IsModeSet('J'))
-                        return std::make_pair(true, channel->GetModeParameter('J'));
-                else
-                        return std::make_pair(false, parameter);
-        } 
+       ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+       {
+               if (channel->IsModeSet('J'))
+                       return std::make_pair(true, channel->GetModeParameter('J'));
+               else
+                       return std::make_pair(false, parameter);
+       } 
 
-        bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel)
+       bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel)
        {
                /* When TS is equal, the alphabetically later one wins */
                return (their_param < our_param);
@@ -61,17 +52,25 @@ class KickRejoin : public ModeHandler
                {
                        // Taking the mode off, we need to clean up.
                        delaylist* dl;
-
+                       
                        if (channel->GetExt("norejoinusers", dl))
                        {
                                DELETE(dl);
                                channel->Shrink("norejoinusers");
                        }
+                       
+                       if (!channel->IsModeSet('J'))
+                       {
+                               return MODEACTION_DENY;
+                       }
+                       else
+                       {
+                               channel->SetMode('J', false);
+                               return MODEACTION_ALLOW;
+                       }
                }
-               if ((!adding) || (atoi(parameter.c_str()) > 0))
+               else if (atoi(parameter.c_str()) > 0)
                {
-                       ServerInstance->Log(DEBUG,"Got parameter: '%s'",parameter.c_str());
-
                        if (!channel->IsModeSet('J'))
                        {
                                parameter = ConvToStr(atoi(parameter.c_str()));
@@ -81,12 +80,6 @@ class KickRejoin : public ModeHandler
                        }
                        else
                        {
-                               if (!adding)
-                               {
-                                       channel->SetModeParam('J', parameter.c_str(), adding);
-                                       return MODEACTION_ALLOW;
-                               }
-
                                std::string cur_param = channel->GetModeParameter('J');
                                if (cur_param == parameter)
                                {
@@ -127,11 +120,12 @@ class ModuleKickNoRejoin : public Module
 public:
  
        ModuleKickNoRejoin(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                
                kr = new KickRejoin(ServerInstance);
-               ServerInstance->AddMode(kr, 'J');
+               if (!ServerInstance->AddMode(kr, 'J'))
+                       throw ModuleException("Could not add new modes!");
        }
 
        virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
@@ -141,18 +135,14 @@ public:
                        delaylist* dl;
                        if (chan->GetExt("norejoinusers", dl))
                        {
-                               ServerInstance->Log(DEBUG, "m_kicknorejoin.so: got delay list, iterating over it");
                                std::vector<userrec*> itemstoremove;
                        
                                for (delaylist::iterator iter = dl->begin(); iter != dl->end(); iter++)
                                {
-                                       ServerInstance->Log(DEBUG, "m_kicknorejoin.so:\t[%s] => %d", iter->first->nick, iter->second);
                                        if (iter->second > time(NULL))
                                        {
-                                               ServerInstance->Log(DEBUG, "m_kicknorejoin.so: still inside time slot");
                                                if (iter->first == user)                                        
                                                {
-                                                       ServerInstance->Log(DEBUG, "m_kicknorejoin.so: and we have the right user");
                                                        user->WriteServ( "495 %s %s :You cannot rejoin this channel yet after being kicked (+J)", user->nick, chan->name);
                                                        return 1;
                                                }
@@ -160,7 +150,6 @@ public:
                                        else
                                        {
                                                // Expired record, remove.
-                                               ServerInstance->Log(DEBUG, "m_kicknorejoin.so: record expired");
                                                itemstoremove.push_back(iter->first);
                                        }
                                }
@@ -179,7 +168,7 @@ public:
                return 0;
        }
                
-       virtual void OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason)
+       virtual void OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason, bool &silent)
        {
                if (chan->IsModeSet('J') && (source != user))
                {
@@ -189,8 +178,6 @@ public:
                                dl = new delaylist;
                                chan->Extend("norejoinusers", dl);
                        }
-                       
-                       ServerInstance->Log(DEBUG, "m_kicknorejoin.so: setting record for %s, %d second delay", user->nick, strtoint(chan->GetModeParameter('J')));
                        (*dl)[user] = time(NULL) + strtoint(chan->GetModeParameter('J'));
                }
        }
@@ -230,27 +217,4 @@ public:
 };
 
 
-class ModuleKickNoRejoinFactory : public ModuleFactory
-{
- public:
-       ModuleKickNoRejoinFactory()
-       {
-       }
-       
-       ~ModuleKickNoRejoinFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleKickNoRejoin(Me);
-       }
-       
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleKickNoRejoinFactory;
-}
-
+MODULE_INIT(ModuleKickNoRejoin)