AMD64 warning 'fix' which tested fine when I added it seems to now...stop things...

[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 bd8597a0fc650f9fb14fe2ca3c111aa7ffdac8c7..18fd995ad201ad6870eedbf0eec5315c74f49861 100644 (file)
--- a/src/modules/m_kicknorejoin.cpp
+++ b/src/modules/m_kicknorejoin.cpp
@@ -37,43 +37,44 @@ public:
        {
                if ((modechar == 'J') && (type == MT_CHANNEL))
                {
-                       if(!mode_on)
+                       if (!mode_on)
                        {
                                // Taking the mode off, we need to clean up.
                                chanrec* c = (chanrec*)target;
                                
                                delaylist* dl = (delaylist*)c->GetExt("norejoinusers");
                                
-                               if(dl)
+                               if (dl)
                                {
                                        delete dl;
                                        c->Shrink("norejoinusers");
                                }
                        }
-                       return 1;
+                       /* Don't allow negative or 0 +J value */
+                       return ((!mode_on) || (atoi(params[0].c_str()) > 0));
                }
                return 0;
        }
 
        virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
        {
-               if(chan)
+               if (chan)
                {
                        delaylist* dl = (delaylist*)chan->GetExt("norejoinusers");
                        log(DEBUG, "m_kicknorejoin.so: tried to grab delay list");
                        
-                       if(dl)
+                       if (dl)
                        {
                                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++)
+                               for (delaylist::iterator iter = dl->begin(); iter != dl->end(); iter++)
                                {
                                        log(DEBUG, "m_kicknorejoin.so:\t[%s] => %d", iter->first->nick, iter->second);
-                                       if(iter->second > time(NULL))
+                                       if (iter->second > time(NULL))
                                        {
                                                log(DEBUG, "m_kicknorejoin.so: still inside time slot");
-                                               if(iter->first == user)                                 
+                                               if (iter->first == user)                                        
                                                {
                                                        log(DEBUG, "m_kicknorejoin.so: and we have the right user");
                                                        WriteServ(user->fd, "495 %s %s :You cannot rejoin this channel yet after being kicked (+J)", user->nick, chan->name);
@@ -88,10 +89,10 @@ public:
                                        }
                                }
                                
-                               for(unsigned int i = 0; i < itemstoremove.size(); i++)
+                               for (unsigned int i = 0; i < itemstoremove.size(); i++)
                                        dl->erase(itemstoremove[i]);
                                                                                                                                        
-                               if(!dl->size())
+                               if (!dl->size())
                                {
                                        // Now it's empty..
                                        delete dl;
@@ -102,13 +103,13 @@ public:
                return 0;
        }
        
-       virtual void OnUserKick(userrec* source, userrec* user, chanrec* chan, std::string reason)
+       virtual void OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason)
        {
-               if(chan->IsCustomModeSet('J'))
+               if (chan->IsModeSet('J') && (source != user))
                {
                        delaylist* dl = (delaylist*)chan->GetExt("norejoinusers");
                        
-                       if(!dl)
+                       if (!dl)
                        {
                                dl = new delaylist;
                                chan->Extend("norejoinusers", (char*)dl);
@@ -123,16 +124,22 @@ public:
        {
                delaylist* dl = (delaylist*)chan->GetExt("norejoinusers");
                
-               if(dl)
+               if (dl)
                {
                        delete dl;
                        chan->Shrink("norejoinusers");
                }
        }
+       
+       virtual void OnCleanup(int target_type, void* item)
+       {
+               if(target_type == TYPE_CHANNEL)
+                       OnChannelDelete((chanrec*)item);
+       }
 
        virtual void Implements(char* List)
        {
-               List[I_On005Numeric] = List[I_OnExtendedMode] = List[I_OnChannelDelete] = List[I_OnUserPreJoin] = List[I_OnUserKick] = 1;
+               List[I_OnCleanup] = List[I_On005Numeric] = List[I_OnExtendedMode] = List[I_OnChannelDelete] = List[I_OnUserPreJoin] = List[I_OnUserKick] = 1;
        }
 
        virtual void On005Numeric(std::string &output)