Fix iteration of ServerInstance->Users->local_users now that QuitUser can modify...

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

diff --git a/src/modules/m_nokicks.cpp b/src/modules/m_nokicks.cpp
index 911b181aba8ccb9b1595a3e45dbb41e8b3501679..1324a7c0357000cc5357efd899ad4d8f3ece207b 100644 (file)
--- a/src/modules/m_nokicks.cpp
+++ b/src/modules/m_nokicks.cpp
@@ -31,43 +31,40 @@ class ModuleNoKicks : public Module
        {
                if (!ServerInstance->Modes->AddMode(&nk))
                        throw ModuleException("Could not add new modes!");
-               Implementation eventlist[] = { I_OnAccessCheck, I_On005Numeric };
+               Implementation eventlist[] = { I_OnUserPreKick, I_On005Numeric };
                ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
-       virtual void On005Numeric(std::string &output)
+       void On005Numeric(std::string &output)
        {
                ServerInstance->AddExtBanChar('Q');
        }
 
-       virtual int OnAccessCheck(User* source,User* dest,Channel* channel,int access_type)
+       ModResult OnUserPreKick(User* source, Membership* memb, const std::string &reason)
        {
-               if (access_type == AC_KICK)
+               if (!memb->chan->GetExtBanStatus(source, 'Q').check(!memb->chan->IsModeSet('Q')))
                {
-                       if (channel->IsModeSet('Q') || channel->GetExtBanStatus(source, 'Q') < 0)
+                       if ((ServerInstance->ULine(source->nick.c_str())) || (ServerInstance->ULine(source->server)) || (!*source->server))
                        {
-                               if ((ServerInstance->ULine(source->nick.c_str())) || (ServerInstance->ULine(source->server)) || (!*source->server))
-                               {
-                                       // ulines can still kick with +Q in place
-                                       return ACR_ALLOW;
-                               }
-                               else
-                               {
-                                       // nobody else can (not even opers with override, and founders)
-                                       source->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :Can't kick user %s from channel (+Q set)",source->nick.c_str(), channel->name.c_str(), dest->nick.c_str());
-                                       return ACR_DENY;
-                               }
+                               // ulines can still kick with +Q in place
+                               return MOD_RES_PASSTHRU;
+                       }
+                       else
+                       {
+                               // nobody else can (not even opers with override, and founders)
+                               source->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :Can't kick user %s from channel (+Q set)",source->nick.c_str(), memb->chan->name.c_str(), memb->user->nick.c_str());
+                               return MOD_RES_DENY;
                        }
                }
-               return ACR_DEFAULT;
+               return MOD_RES_PASSTHRU;
        }
 
-       virtual ~ModuleNoKicks()
+       ~ModuleNoKicks()
        {
                ServerInstance->Modes->DelMode(&nk);
        }
 
-       virtual Version GetVersion()
+       Version GetVersion()
        {
                return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
        }