Apply CAP ACK/NAK stuff from nenolod, thanks :)

[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 07b26d8e7e66bdab5f6bbdba546cd30138b6bce5..0692048f16c5d14c4c4d4131adf69b1c15237072 100644 (file)
--- a/src/modules/m_nokicks.cpp
+++ b/src/modules/m_nokicks.cpp
@@ -1,32 +1,74 @@
-#include <stdio.h>
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style channel mode +Q */
 
+class NoKicks : public ModeHandler
+{
+ public:
+       NoKicks(InspIRCd* Instance) : ModeHandler(Instance, 'Q', 0, 0, false, MODETYPE_CHANNEL, false) { }
+
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
+       {
+               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;
+       }
+};
+
 class ModuleNoKicks : public Module
 {
-       Server *Srv;
-       bool NoisyNoKicks;
-       ConfigReader *Conf;
+       
+       NoKicks* nk;
        
  public:
  
-       ModuleNoKicks()
+       ModuleNoKicks(InspIRCd* Me)
+               : Module(Me)
        {
-               Srv = new Server;
-               Srv->AddExtendedMode('Q',MT_CHANNEL,false,0,0);
+               
+               nk = new NoKicks(ServerInstance);
+               if (!ServerInstance->Modes->AddMode(nk))
+                       throw ModuleException("Could not add new modes!");
+               Implementation eventlist[] = { I_OnAccessCheck };
+               ServerInstance->Modules->Attach(eventlist, this, 1);
        }
-       
-       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->IsCustomModeSet('Q'))
+                       if (channel->IsModeSet('Q'))
                        {
-                               if ((Srv->IsUlined(source->nick)) || (Srv->IsUlined(source->server)) || (!strcmp(source->server,"")))
+                               if ((ServerInstance->ULine(source->nick)) || (ServerInstance->ULine(source->server)) || (!*source->server))
                                {
                                        // ulines can still kick with +Q in place
                                        return ACR_ALLOW;
@@ -34,46 +76,25 @@ 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);
                                        return ACR_DENY;
                                }
                        }
                }
                return ACR_DEFAULT;
        }
-       
+
        virtual ~ModuleNoKicks()
        {
-               delete Srv;
+               ServerInstance->Modes->DelMode(nk);
+               delete nk;
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0);
+               return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
        }
 };
 
 
-class ModuleNoKicksFactory : public ModuleFactory
-{
- public:
-       ModuleNoKicksFactory()
-       {
-       }
-       
-       ~ModuleNoKicksFactory()
-       {
-       }
-       
-       virtual Module * CreateModule()
-       {
-               return new ModuleNoKicks;
-       }
-       
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleNoKicksFactory;
-}
-
+MODULE_INIT(ModuleNoKicks)