Fix excessive snomask sending on fitler add/removal

[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 216fa3ae21791a3114c709afa7c39ec6a118c39b..61ab868a5a08114d80202a84cc34960e90828fe0 100644 (file)
--- a/src/modules/m_nokicks.cpp
+++ b/src/modules/m_nokicks.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 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.
@@ -12,68 +12,42 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
 /* $ModDesc: Provides support for unreal-style channel mode +Q */
 
-class NoKicks : public ModeHandler
+class NoKicks : public SimpleChannelModeHandler
 {
  public:
-       NoKicks(InspIRCd* Instance) : ModeHandler(Instance, 'Q', 0, 0, false, MODETYPE_CHANNEL, false) { }
-
-       ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
-       {
-               if (adding)
-               {
-                       if (!channel->IsModeSet('Q'))
-                       {
-                               channel->SetMode('Q',true);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-               else
-               {
-                       if (channel->IsModeSet('Q'))
-                       {
-                               channel->SetMode('Q',false);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-
-               return MODEACTION_DENY;
-       }
+       NoKicks(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'Q') { }
 };
 
 class ModuleNoKicks : public Module
 {
-       
        NoKicks* nk;
-       
+
  public:
- 
        ModuleNoKicks(InspIRCd* Me)
                : Module(Me)
        {
-               
                nk = new NoKicks(ServerInstance);
-               if (!ServerInstance->AddMode(nk, 'Q'))
+               if (!ServerInstance->Modes->AddMode(nk))
                        throw ModuleException("Could not add new modes!");
+               Implementation eventlist[] = { I_OnAccessCheck, I_On005Numeric };
+               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
-       void Implements(char* List)
+       virtual void On005Numeric(std::string &output)
        {
-               List[I_OnAccessCheck] = 1;
+               ServerInstance->AddExtBanChar('Q');
        }
 
-       virtual int OnAccessCheck(userrec* source,userrec* dest,chanrec* channel,int access_type)
+       virtual int OnAccessCheck(User* source,User* dest,Channel* channel,int access_type)
        {
                if (access_type == AC_KICK)
                {
-                       if (channel->IsModeSet('Q'))
+                       if (channel->IsModeSet('Q') || channel->GetExtBanStatus(source, 'Q') < 0)
                        {
-                               if ((ServerInstance->ULine(source->nick)) || (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;
@@ -81,7 +55,7 @@ class ModuleNoKicks : public Module
                                else
                                {
                                        // nobody else can (not even opers with override, and founders)
-                                       source->WriteServ("484 %s %s :Can't kick user %s from channel (+Q set)",source->nick, channel->name,dest->nick);
+                                       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;
                                }
                        }
@@ -92,14 +66,14 @@ class ModuleNoKicks : public Module
        virtual ~ModuleNoKicks()
        {
                ServerInstance->Modes->DelMode(nk);
-               DELETE(nk);
+               delete nk;
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
        }
 };
 
 
-MODULE_INIT(ModuleNoKicks);
+MODULE_INIT(ModuleNoKicks)